linjiawei 3 weeks ago
parent
commit
665fd1578f

+ 6 - 6
zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/enforce/job/EnforceDeductRecordServiceImpl.java

@@ -156,10 +156,10 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                         JSONArray warray =  JSON.parseArray(w.getWTypeT());
                         for (int i = 0; i <= 8; i++) {
                             int v = ((JSONObject)warray.get(i)).getInteger("num" + (i+1));
-                            wrongCount += v;
                             if (Objects.equals("SUPERVISE", w.getClueResource()) || Objects.equals("REPORT", w.getClueResource())) {
                                 continue;
                             }
+                            wrongCount += v;
                             double vvalue = v * 0.1;
                             switch (i) {
                                 case 0:
@@ -199,10 +199,10 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                         JSONArray narray =  JSON.parseArray(w.getNTypeT());
                         for (int i = 0; i <= 11; i++) {
                             int v = ((JSONObject)narray.get(i)).getInteger("wlxNum" + (i+1));
-                            wrongCount += v;
                             if (Objects.equals("SUPERVISE", w.getClueResource()) || Objects.equals("REPORT", w.getClueResource())) {
                                 continue;
                             }
+                            wrongCount += v;
                             double vvalue = v * 0.1;
                             switch (i) {
                                 case 0:
@@ -251,10 +251,10 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                         JSONArray sarray =  JSON.parseArray(w.getSTypeT());
                         for (int i = 0; i <= 16; i++) {
                             int v = ((JSONObject)sarray.get(i)).getInteger("wflxNum" + (i+1));
-                            wrongCount += v;
                             if (Objects.equals("SUPERVISE", w.getClueResource()) || Objects.equals("REPORT", w.getClueResource())) {
                                 continue;
                             }
+                            wrongCount += v;
                             double vvalue = v * 0.1;
                             switch (i) {
                                 case 0:
@@ -391,10 +391,10 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                     JSONArray warray =  JSON.parseArray(w.getWTypeT());
                     for (int i = 0; i <= 8; i++) {
                         int v = ((JSONObject)warray.get(i)).getInteger("num" + (i+1));
-                        wrongCount += v;
                         if (Objects.equals("SUPERVISE", w.getClueResource()) || Objects.equals("REPORT", w.getClueResource())) {
                             continue;
                         }
+                        wrongCount += v;
                         double vvalue = v * 0.1;
                         switch (i) {
                             case 0:
@@ -434,10 +434,10 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                     JSONArray narray =  JSON.parseArray(w.getNTypeT());
                     for (int i = 0; i <= 11; i++) {
                         int v = ((JSONObject)narray.get(i)).getInteger("wlxNum" + (i+1));
-                        wrongCount += v;
                         if (Objects.equals("SUPERVISE", w.getClueResource()) || Objects.equals("REPORT", w.getClueResource())) {
                             continue;
                         }
+                        wrongCount += v;
                         double vvalue = v * 0.1;
                         switch (i) {
                             case 0:
@@ -486,10 +486,10 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                     JSONArray sarray =  JSON.parseArray(w.getSTypeT());
                     for (int i = 0; i <= 16; i++) {
                         int v = ((JSONObject)sarray.get(i)).getInteger("wflxNum" + (i+1));
-                        wrongCount += v;
                         if (Objects.equals("SUPERVISE", w.getClueResource()) || Objects.equals("REPORT", w.getClueResource())) {
                             continue;
                         }
+                        wrongCount += v;
                         double vvalue = v * 0.1;
                         switch (i) {
                             case 0: