app检查登记页面列表查询逻辑调整

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -148,7 +148,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
             coreMonitoringTaskRegistrationDTO.setOrgId(loginUser.getOrgId());
         }
         Page<AppCoreMonitoringRetrievalTaskVO> coreMonitoringRetrievalTaskPage = baseMapper.selectListApp(coreMonitoringTaskRegistrationDTO.getPageRequest(), coreMonitoringTaskRegistrationDTO);
-        TableDataInfo<CoreMonitoringRetrievalTask> tableDataInfo = new TableDataInfo();
+        TableDataInfo<AppCoreMonitoringRetrievalTaskVO> tableDataInfo = new TableDataInfo();
         tableDataInfo.setMsg("操作成功");
         tableDataInfo.setCode(200);
         tableDataInfo.setTotal(coreMonitoringRetrievalTaskPage.getTotal());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRegisterSericeImpl.java

@@ -82,28 +82,42 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
     @Override
     public TableDataInfo appList(AppPageDto dto) {
         Page<AppPageVo> page = dto.toPage();
-        page = baseMapper.selectTaskGroup(page, dto,SecurityUtils.getUserId());
+        page = baseMapper.selectTaskGroup(page, dto, SecurityUtils.getUserId());
         if (CollectionUtil.isEmpty(page.getRecords())) {
             return TableDataInfo.success(page);
         }
 
 //        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
 
-        List<Long> batchIds = page.getRecords().stream().map(r -> r.getBatchId()).collect(Collectors.toList());
-        LambdaQueryWrapper<CoreSafetyTask> wrapper = new LambdaQueryWrapper<CoreSafetyTask>()
-                .in(CoreSafetyTask::getBatchId, batchIds);
+//        List<Long> batchIds = page.getRecords().stream().map(r -> r.getBatchId()).collect(Collectors.toList());
+        LambdaQueryWrapper<CoreSafetyTask> wrapper = new LambdaQueryWrapper<CoreSafetyTask>();
         if (ObjectUtil.isNotNull(dto.getBeCheckedOrgId())) {
             wrapper.eq(CoreSafetyTask::getOrgId, dto.getBeCheckedOrgId());
         }
+        if (ObjectUtil.isNotNull(dto.getCheckOrgId())) {
+            wrapper.eq(CoreSafetyTask::getCheckOrgId, dto.getCheckOrgId());
+        }
+        if (ObjectUtil.isNotNull(dto.getStatus())) {
+            wrapper.eq(CoreSafetyTask::getStatus, dto.getStatus());
+        }
+        if (ObjectUtil.isNotNull(dto.getTaskTime())) {
+            wrapper.ge(CoreSafetyTask::getPlanEndTime, dto.getTaskTime())
+                    .le(CoreSafetyTask::getPlanStartTime, dto.getTaskTime());
+        }
+        wrapper.in(CoreSafetyTask::getPlanId, page.getRecords().stream().map(r -> r.getPlanId()).collect(Collectors.toList()));
+
         List<CoreSafetyTask> list = baseMapper.selectList(wrapper);
-        Map<Long, List<CoreSafetyTask>> grouped = list.stream().collect(Collectors.groupingBy(t -> t.getBatchId()));
+//        Map<Long, List<CoreSafetyTask>> grouped = list.stream().collect(Collectors.groupingBy(t -> t.getBatchId()));
 
         List<Long> planIds = page.getRecords().stream().map(r -> r.getPlanId()).distinct().collect(Collectors.toList());
         List<CoreSafecheckPlanToRole> planToRoles = coreSafecheckPlanToRoleMapper.selectList(new LambdaQueryWrapper<CoreSafecheckPlanToRole>()
                 .in(CoreSafecheckPlanToRole::getPlanId, planIds)
         );
         page.getRecords().forEach(vo -> {
-            List<CoreSafetyTask> v = grouped.get(vo.getBatchId());
+            List<CoreSafetyTask> v = list.stream()
+                    .filter(i -> ObjectUtil.equal(i.getPlanId(), vo.getPlanId()) && ObjectUtil.equal(vo.getCount(), i.getCount())
+                    && ObjectUtil.equal(i.getPlanStartTime(),vo.getPlanStartTime()) && ObjectUtil.equal(i.getPlanEndTime(),vo.getPlanEndTime()))
+                    .collect(Collectors.toList());
             List<Long> roleIds = planToRoles.stream().filter(p -> ObjectUtil.equal(p.getPlanId(), vo.getPlanId()))
                     .map(p -> p.getRoleId()).collect(Collectors.toList());
             vo.setCheckRoleId(roleIds);
@@ -220,7 +234,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         }
 
         List<TaskRegisterNfcVo> nfcs = baseMapper.selectNfc(plan.getId(), id, task.getOrgId());
-        TaskRegisterVo<AppTaskRegisterPointVo> vo = TaskRegisterVo.of(task, plan.getCheckOrgType().toString(),roleNames);
+        TaskRegisterVo<AppTaskRegisterPointVo> vo = TaskRegisterVo.of(task, plan.getCheckOrgType().toString(), roleNames);
         Set<Long> usedNfcId = new HashSet<>();
         for (AppTaskRegisterPointVo point : points) {
             List<CoreSafetyTaskDataRemarkimg> dataImgs = taskImgs.get(point.getPointDataId());
@@ -429,7 +443,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         LambdaUpdateWrapper<CoreSafetyTask> taskUpdateWraper = new LambdaUpdateWrapper();
         taskUpdateWraper.eq(CoreSafetyTask::getId, data.getId())
 //                .set(CoreSafetyTask::getStatus, ObjectUtil.equal(data.getIsSubmit(), 0) ? SafetyCheckTaskStatus.UnderWay.getValue() : SafetyCheckTaskStatus.Completed.getValue())
-                .set(CoreSafetyTask::getStatus,ObjectUtil.equal(data.getIsSubmit(), 0) ? SafetyCheckTaskStatus.UnderWay.getValue() : SafetyCheckTaskStatus.Completed.getValue())
+                .set(CoreSafetyTask::getStatus, ObjectUtil.equal(data.getIsSubmit(), 0) ? SafetyCheckTaskStatus.UnderWay.getValue() : SafetyCheckTaskStatus.Completed.getValue())
                 .set(CoreSafetyTask::getSubmitTime, new Date())
                 .set(CoreSafetyTask::getSubmitorId, SecurityUtils.getUserId())
                 .set(CoreSafetyTask::getSubmitBy, SecurityUtils.getLoginUser().getName())

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/regsiter/AppPageVo.java

@@ -36,9 +36,10 @@ public class AppPageVo {
      */
     private Date planEndTime;
 
-    @JsonIgnore
-    private Long batchId;
+//    @JsonIgnore
+//    private Long batchId;
 
+    private Integer count;
     /**
      * 检查角色id
      */

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -701,8 +701,9 @@
         t.title as taskName,
         t.plan_start_time as planStartTime,
         t.plan_end_time as planEndTime,
-        t.batch_id as batchId
+        t.count as count
         from core_safety_task t
+        inner join core_safecheck_plan p on t.plan_id =p.id and p.is_deleted=0
         <if test="params.roleIds!=null and params.roleIds.size>0">
             inner join ( select id,r.role_id from core_safecheck_plan p
             inner join core_safecheck_plan_to_role r on p.id=r.plan_id
@@ -726,7 +727,7 @@
             </foreach> or
                 t.grant_user_id=#{userId})
         </if>
-        group by t.plan_id,t.title,t.plan_start_time,t.plan_end_time,t.batch_id
+        group by t.plan_id,t.title,t.plan_start_time,t.plan_end_time,t.count
     </select>
     <select id="selectNfcRecord" resultType="com.xunmei.core.safetyCheck.vo.CheckNfcRecord">
         select t.scan_method, n.area_name, n.collection_area_name, t.img,t.submit_time as execute_time