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

@@ -157,9 +157,6 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                         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;
-                            }
                             double vvalue = v * 0.1;
                             switch (i) {
                                 case 0:
@@ -200,9 +197,6 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                         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;
-                            }
                             double vvalue = v * 0.1;
                             switch (i) {
                                 case 0:
@@ -251,10 +245,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:
@@ -392,9 +386,6 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                     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;
-                        }
                         double vvalue = v * 0.1;
                         switch (i) {
                             case 0:
@@ -435,9 +426,6 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                     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;
-                        }
                         double vvalue = v * 0.1;
                         switch (i) {
                             case 0:
@@ -487,9 +475,6 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                     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;
-                        }
                         double vvalue = v * 0.1;
                         switch (i) {
                             case 0:

zfjg-modules/zfjg-manage/src/main/resources/mapper/enforce/job/EnforceDeductRecordMapper.xml

@@ -149,27 +149,41 @@
 
 
     <select id="selectWreportList" resultType="com.zfjg.manage.api.vo.enforce.job.WReportDeductVo">
-        select id,user_id,org_id,org_name,w_user,w_type_c,w_type_t,n_type_c,n_type_t,s_type_c,s_type_t,clue_resource from w_report
-        <where>
-            <if test="pm.enforceOrgId  != null  and pm.enforceOrgId != ''">
-                and org_id = #{pm.enforceOrgId}
-            </if>
-            <if test="pm.enforceOrgIds !=null and pm.enforceOrgIds.size>0">
-                and org_id in
-                <foreach item="item" index="i" collection="pm.enforceOrgIds" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="pm.executorId  != null  and pm.executorId != ''">
-                and user_id = #{pm.executorId}
-            </if>
-            <if test="pm.startDate != null and pm.startDate !=''">
-                AND s_time <![CDATA[ >= ]]> #{pm.startDate}
-            </if>
-            <if test="pm.endDate != null and pm.endDate !=''">
-                AND s_time <![CDATA[ <= ]]> #{pm.endDate}
-            </if>
-        </where>
+        SELECT
+        id,
+        user_id,
+        org_id,
+        org_name,
+        w_user,
+        w_type_c,
+        w_type_t,
+        n_type_c,
+        n_type_t,
+        s_type_c,
+        s_type_t,
+        clue_resource
+        FROM
+        w_report
+        WHERE
+        ( clue_resource NOT IN ( 'SUPERVISE', 'REPORT' ) OR clue_resource IS NULL )
+        <if test="pm.enforceOrgId  != null  and pm.enforceOrgId != ''">
+            and org_id = #{pm.enforceOrgId}
+        </if>
+        <if test="pm.enforceOrgIds !=null and pm.enforceOrgIds.size>0">
+            and org_id in
+            <foreach item="item" index="i" collection="pm.enforceOrgIds" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="pm.executorId  != null  and pm.executorId != ''">
+            and user_id = #{pm.executorId}
+        </if>
+        <if test="pm.startDate != null and pm.startDate !=''">
+            AND s_time <![CDATA[ >= ]]> #{pm.startDate}
+        </if>
+        <if test="pm.endDate != null and pm.endDate !=''">
+            AND s_time <![CDATA[ <= ]]> #{pm.endDate}
+        </if>
     </select>