工时报表改查询异常单号为空

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java

@@ -378,11 +378,13 @@ public class ReportServiceImpl implements ReportService {
                 String abnormalNo = String.valueOf(map.get("SHOP_ORDER"));
                 if (abnormalNo.substring(0,1).equals("Q")){
                     Map<String, String> abnormalNoMap = reportMapper.findAbnormalDutyByAbnormalNo(site,abnormalNo);
+                    if (abnormalNoMap != null){
                     map.put("ABNORMAL_NO",abnormalNoMap.get("ABNORMAL_NO"));
                     map.put("DUTY_TYPE",abnormalNoMap.get("DUTY_TYPE"));
                     map.put("DUTY_DEPART",abnormalNoMap.get("DUTY_DEPART"));
                     map.put("PRINCIPAL_USER",abnormalNoMap.get("PRINCIPAL_USER"));
                     map.put("NC_CODE_DESCRIPTION",abnormalNoMap.get("NC_CODE_DESCRIPTION"));
+                    }
                 }
             }
         }
@@ -1695,6 +1697,12 @@ public class ReportServiceImpl implements ReportService {
     @Override
     public Map<String, Object> projectScheduleReportBoard(Map paramMap) {
         HashMap<String, Object> result = new HashMap<>();
+        if (paramMap.containsKey("item")){
+            List<Map<String, String>> maps = reportMapper.projectScheduleReportBoard(paramMap);
+            result.put("oldData", maps);
+            result.put("item", paramMap.get("item"));
+            return result;
+        }
         String user = null;
         if (paramMap.containsKey("career")){
             user = String.valueOf(paramMap.get("career"));
@@ -1721,10 +1729,6 @@ public class ReportServiceImpl implements ReportService {
             projectCircleList.add(objectObjectHashMap);
         }
         result.put("projectCircleList",projectCircleList);
-        if (paramMap.containsKey("item")){
-            List<Map<String, String>> maps = reportMapper.projectScheduleReportBoard(paramMap);
-            result.put("oldData", maps);
-        }
         return result;
     }
 

anomaly/src/main/resources/mapper/ReportMapper.xml

@@ -3199,7 +3199,7 @@ SELECT zab.CREATED_DATE_TIME,
         <where>
         1=1
         <if test="finishedSFC != null and finishedSFC == 'false'">
-            AND ZUP."shopOrderQTY" != WIP."doneQTY"
+            AND ZUP."shopOrderQTY" != ZUP."doneQTY"
         </if>
         <if test="item != null and item != ''">
             AND ZUP."item" like '%${item}%'