Merge remote-tracking branch 'origin/master'

common/src/main/resources/mapper/ReportDataMapper.xml

@@ -69,12 +69,12 @@
         FROM  RESRCE R
         LEFT JOIN WORK_CENTER_MEMBER WCMA ON  WCMA.WORK_CENTER_OR_RESOURCE_GBO = R.HANDLE
         LEFT JOIN WORK_CENTER WCA ON WCA.HANDLE = WCMA.WORK_CENTER_BO
-        LEFT JOIN WORK_CENTER_T WCTA ON WCTA.WORK_CENTER_BO = WCA.HANDLE AND WCTA.LOCALE = 'zh'
+        INNER JOIN WORK_CENTER_T WCTA ON WCTA.WORK_CENTER_BO = WCA.HANDLE AND WCTA.LOCALE = 'zh'
         LEFT JOIN WORK_CENTER_MEMBER WCMB ON WCMB.WORK_CENTER_OR_RESOURCE_GBO = WCMA.WORK_CENTER_BO
         LEFT JOIN WORK_CENTER WCB ON WCB.HANDLE = WCMB.WORK_CENTER_BO
-        LEFT JOIN WORK_CENTER_T WCTB ON WCTB.WORK_CENTER_BO = WCB.HANDLE AND WCTB.LOCALE = 'zh'
+        INNER JOIN WORK_CENTER_T WCTB ON WCTB.WORK_CENTER_BO = WCB.HANDLE AND WCTB.LOCALE = 'zh'
         LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = R.HANDLE AND CF."ATTRIBUTE" = 'CAPACITY_MAN_HOUR'
-        LEFT JOIN Z_REPORT_DATE_TIME  ON 1=1
+        LEFT JOIN Z_REPORT_DATE_TIME ZRDT  ON ZRDT.SITE = R.SITE
         LEFT JOIN RESOURCE_TYPE_RESOURCE RTR ON  RTR.RESOURCE_BO = R.HANDLE
         LEFT JOIN RESOURCE_TYPE RT ON RT.HANDLE = RTR.RESOURCE_TYPE_BO
         WHERE R.SITE = #{site}
@@ -180,12 +180,12 @@
         FROM  RESRCE R
         LEFT JOIN WORK_CENTER_MEMBER WCMA ON  WCMA.WORK_CENTER_OR_RESOURCE_GBO = R.HANDLE
         LEFT JOIN WORK_CENTER WCA ON WCA.HANDLE = WCMA.WORK_CENTER_BO
-        LEFT JOIN WORK_CENTER_T WCTA ON WCTA.WORK_CENTER_BO = WCA.HANDLE AND WCTA.LOCALE = 'zh'
+        INNER JOIN WORK_CENTER_T WCTA ON WCTA.WORK_CENTER_BO = WCA.HANDLE AND WCTA.LOCALE = 'zh'
         LEFT JOIN WORK_CENTER_MEMBER WCMB ON WCMB.WORK_CENTER_OR_RESOURCE_GBO = WCMA.WORK_CENTER_BO
         LEFT JOIN WORK_CENTER WCB ON WCB.HANDLE = WCMB.WORK_CENTER_BO
-        LEFT JOIN WORK_CENTER_T WCTB ON WCTB.WORK_CENTER_BO = WCB.HANDLE AND WCTB.LOCALE = 'zh'
+        INNER JOIN WORK_CENTER_T WCTB ON WCTB.WORK_CENTER_BO = WCB.HANDLE AND WCTB.LOCALE = 'zh'
         LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = R.HANDLE AND CF."ATTRIBUTE" = 'CAPACITY_MAN_HOUR'
-        LEFT JOIN Z_REPORT_DATE_TIME  ON 1=1
+        LEFT JOIN Z_REPORT_DATE_TIME ZRDT  ON ZRDT.SITE = R.SITE
         LEFT JOIN RESOURCE_TYPE_RESOURCE RTR ON  RTR.RESOURCE_BO = R.HANDLE
         LEFT JOIN RESOURCE_TYPE RT ON RT.HANDLE = RTR.RESOURCE_TYPE_BO
         WHERE R.SITE = #{site}
@@ -198,7 +198,7 @@
         SELECT M.*,M.RATE_DATA_INT || '%' RATE_DATA FROM (
         SELECT T.SITE,T.RESOURCE_TYPE, T.RESOURCE_TYPE_DESCRIPTION, T.WORK_CENTER, T.WORK_CENTER_DESCRIPTION,T.DATE_TIME,
                 ROUND(SUM(T.PLAN_HOUR) * SUM(T.CAPACITY_MAN_HOUR) / 8 ,4) PLAN_HOUR, SUM(T.CAPACITY_MAN_HOUR) CAPACITY_MAN_HOUR,
-               CASE WHEN SUM(T.PLAN_HOUR) = 0 THEN 0 ELSE ROUND(SUM(T.PLAN_HOUR)/8,4)*100 END RATE_DATA_INT
+               CASE WHEN SUM(T.PLAN_HOUR) = 0 OR SUM(T.CAPACITY_MAN_HOUR) = 0 THEN 0 ELSE ROUND(SUM(T.PLAN_HOUR)/8,4)*100 END RATE_DATA_INT
             FROM
         (
         SELECT RDT.* , SUM( (DECODE(A.CNT,NULL,0,A.CNT) + DECODE(B.CNT,NULL,0,B.CNT) + DECODE(C.CNT,NULL,0,C.CNT) + DECODE(D.CNT,NULL,0,D.CNT)

equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceFaultReceiveServiceImpl.java

@@ -107,7 +107,7 @@ public class ResourceFaultReceiveServiceImpl extends ServiceImpl<ResourceFaultRe
             JSONObject jsonObj = (JSONObject) jsonArray.get(i);
             String faultCode = jsonObj.getString("FAULT_CODE");
             resourceFaultReceive.setFaultCode(faultCode);
-            String description = jsonObj.getString("DESCRIPTION");
+            String description = jsonObj.getString("CONTENT");
             resourceFaultReceive.setDescription(description);
             String dateTime = jsonObj.getString("DATE_TIME");
             LocalDateTime faultDate = LocalDateTime.parse(dateTime, dataFormatter);

equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java

@@ -241,9 +241,9 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
                 repairTask.setPrimaryReasonDescription(resourceRepairTask.getPrimaryReasonDescription());
                 repairTask.setPrecautionMeasureDescription(resourceRepairTask.getPrecautionMeasureDescription());
                 // 修改设备状态：判断维修前和维修结束的stopMachie字段是否修改
-                String stopMachine = resourceRepairTask.getStopMachine();
+                /*String stopMachine = resourceRepairTask.getStopMachine();
                 String stopMachineT = repairTask.getStopMachine();
-                /*if (!stopMachine.equals(stopMachineT)){
+                if (!stopMachine.equals(stopMachineT)){
                     String resourceNo = repairTask.getResourceNo();
                     resrceService.updateResourceStatus(site, resourceNo, stopMachineT.equals("N")?"301":"5");
                 }*/
@@ -259,27 +259,36 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
                 resourceInspectTask.setPlanCompleteDate(endDate);
                 resourceInspectTask.setResrce(resourceRepairTask.getResourceNo());
                 List<ResourceInspectTask> inspectTaskList = resourceInspectTaskMapper.getInspectTaskListByCondition(resourceInspectTask);
+                Boolean bl = true;
                 for (ResourceInspectTask inspectTask:inspectTaskList) {
-                    // 查询到点检结果为NG的设备，创建新的当日点检任务
+                    if (Constants.RSESULT_OK.equals(inspectTask.getResult())){
-                    if (Constants.RSESULT_NG.equals(inspectTask.getResult())){
+                        bl = false;
-                        String taskNo = inspectTask.getTaskNo();
-                        String taskStr = taskNo+now;
-                        inspectTask.setTaskNo(taskStr);
-                        inspectTask.setHandle(HandleEnum.RESOURCE_INSPECT_TASK.getHandle(site,taskStr));
-                        inspectTask.setResult("");
-                        inspectTask.setActualCompleteDate(null);
-                        inspectTask.setExecutor("");
-                        inspectTask.setCreatedDateTime(now);
-                        inspectTask.setTaskCreateDate(now);
-                        inspectTask.setPlanStartDate(now);
-                        inspectTask.setActualStartDate(null);
-                        inspectTask.setStatus(Constants.INSPECTION_TASK_STATUS_NEW);
-                        inspectTask.setModifyUser(null);
-                        inspectTask.setModifiedDateTime(null);
-                        resourceInspectTaskMapper.insert(inspectTask);
                         break;
                     }
                 }
+                if (bl){
+                    for (ResourceInspectTask inspectTask:inspectTaskList) {
+                        // 查询到点检结果为NG的设备，创建新的当日点检任务
+                        if (Constants.RSESULT_NG.equals(inspectTask.getResult())){
+                            String taskNo = inspectTask.getTaskNo();
+                            String taskStr = taskNo+now;
+                            inspectTask.setTaskNo(taskStr);
+                            inspectTask.setHandle(HandleEnum.RESOURCE_INSPECT_TASK.getHandle(site,taskStr));
+                            inspectTask.setResult("");
+                            inspectTask.setActualCompleteDate(null);
+                            inspectTask.setExecutor("");
+                            inspectTask.setCreatedDateTime(now);
+                            inspectTask.setTaskCreateDate(inspectTask.getTaskCreateDate().plusMinutes(1));
+                            inspectTask.setPlanStartDate(now);
+                            inspectTask.setActualStartDate(null);
+                            inspectTask.setStatus(Constants.INSPECTION_TASK_STATUS_NEW);
+                            inspectTask.setModifyUser(null);
+                            inspectTask.setModifiedDateTime(null);
+                            resourceInspectTaskMapper.insert(inspectTask);
+                            break;
+                        }
+                    }
+                }
                 break;
             case "302":
                 // 取消代码、取消描述、取消时间、取消人员