Merge remote-tracking branch 'origin/master'

equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskController.java

@@ -148,8 +148,6 @@ public class ResourceInspectTaskController {
         String resourceNo = resourceInspectTaskDto.getResrce();
         String resourceTypeNo = resourceInspectTaskDto.getResourceTypeNo();
         String workCenter = resourceInspectTaskDto.getWorkCenter();
-        String compareStartDate = resourceInspectTaskDto.getCompareStartDate();
-        String compareEndDate = resourceInspectTaskDto.getCompareEndDate();
         if (planNo != null){
             resourceInspectTaskDto.setResourceInspectPlanBo(HandleEnum.RESOURCE_INSPECT_PLAN.getHandle(site,planNo,resourceInspectTaskDto.getPlanRevision()));
         }
@@ -161,9 +159,6 @@ public class ResourceInspectTaskController {
         }
         if (workCenter != null){
             resourceInspectTaskDto.setWorkCenter(HandleEnum.WORK_CENTER.getHandle(site,workCenter));
-        }
-        if (compareStartDate != null){
-
         }
         try{
             return R.ok(resourceInspectTaskService.findResourceInspectTaskList(resourceInspectTaskDto));

equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskMapper.java

@@ -48,6 +48,6 @@ public interface ResourceInspectTaskMapper extends BaseMapper<ResourceInspectTas
      */
     LocalDateTime getMaxCreateTimeByStatus(ResourceInspectTask resourceInspectTask);
 
-    Integer findResourceTaskByResrceAndCategory(@Param("site") String site,@Param("category") String category, @Param("resrce") String resrce);
+    Integer findResourceTaskByResrceAndCategory(@Param("site") String site,@Param("category") String category, @Param("resrce") String resrce,@Param("planHandle") String planHandle);
 
 }

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

@@ -141,7 +141,7 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl<ResourceInspectP
             equip.setCreateUser(user);
             equip.setCreatedDateTime(LocalDateTime.now());
             String resourceNo = equip.getResourceNo();
-            Integer cnt = resourceInspectTaskMapper.findResourceTaskByResrceAndCategory(site, category, resourceNo);
+            Integer cnt = resourceInspectTaskMapper.findResourceTaskByResrceAndCategory(site, category, resourceNo,handle);
             if (cnt > 0){
                 resInfo.append(resourceNo+",");
             }

equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml

@@ -660,7 +660,7 @@
         WHERE
         (ZG.USER_GROUP_BO IS NULL OR (ZG.USER_GROUP_BO IS NOT NULL AND UGM.USER_OR_GROUP_GBO = #{currentUser}))
         AND RIK.SITE = #{site}
-        AND TASK_CREATE_DATE <= (SELECT TO_DATE(TO_CHAR(SYSDATE+1,'yyyy-mm-dd') || ' 00:00:00','yyyy-MM-dd hh24:mi-ss') -8/24 FROM DUAL)
+        AND TASK_CREATE_DATE <= (SELECT TO_DATE(TO_CHAR(SYSDATE,'yyyy-mm-dd') || ' 00:00:00','yyyy-MM-dd hh24:mi-ss') -4/24 FROM DUAL)
         <if test="taskNo != null and taskNo != ''">
             AND RIK.TASK_NO = #{taskNo}
         </if>
@@ -732,7 +732,7 @@
 
     <select id="findResourceTaskByResrceAndCategory" resultType="Integer">
         SELECT COUNT(*) FROM Z_RESOURCE_INSPECT_TASK ZRIT
-        WHERE ZRIT.SITE = #{site} AND ZRIT.RESRCE = #{resrce} AND ZRIT.CATEGORY = #{category}
+        WHERE ZRIT.SITE = #{site} AND ZRIT.RESRCE = #{resrce} AND ZRIT.CATEGORY = #{category} AND ZRIT.RESOURCE_INSPECT_PLAN_BO != #{planHandle}
     </select>
 
     <!--自定义sql-->