diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java index 45b3f4ee..13cfc2a6 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java +++ b/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 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 projectScheduleReportBoard(Map paramMap) { HashMap result = new HashMap<>(); + if (paramMap.containsKey("item")){ + List> 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> maps = reportMapper.projectScheduleReportBoard(paramMap); - result.put("oldData", maps); - } return result; } diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index aa7ce717..7a3b9c11 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -3199,7 +3199,7 @@ SELECT zab.CREATED_DATE_TIME, 1=1 - AND ZUP."shopOrderQTY" != WIP."doneQTY" + AND ZUP."shopOrderQTY" != ZUP."doneQTY" AND ZUP."item" like '%${item}%'