bug

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/dto/CoreMonitoringTaskRegistrationDTO.java

@@ -106,4 +106,5 @@ public class CoreMonitoringTaskRegistrationDTO  extends PageRequest {
     /** 异常数 */
     @ApiModelProperty(value = "异常数")
     private Integer exceptionCount;
+
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -133,13 +133,23 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
             TMonitoringRetrievalPlan plan1 = tMonitoringRetrievalPlanMapper.selectById(plan.getParentId());
             tMonitoringRetrievalPlanVO.setParentFrequency(plan1.getPlanFrequency());
         }
+        QueryWrapper queryWrapper=new QueryWrapper();
+        queryWrapper.eq("is_deleted",0);
+        queryWrapper.eq("parent_id",id);
+        List<TMonitoringRetrievalPlan> list = tMonitoringRetrievalPlanMapper.selectList(queryWrapper);
+        list.add(plan);
+        List<Long> collect = list.stream().map(TMonitoringRetrievalPlan::getId).collect(Collectors.toList());
         boolean isEdit = false;
         boolean isComplete = false;
         if (plan.getParentId() != null) {
             isEdit = true;
         }
         tMonitoringRetrievalPlanVO.setIsEdit(isEdit);
-        List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectComplete(id);
+        List<String>status=new ArrayList<>();
+        status.add("2");
+        status.add("3");
+        List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectAllTaskByPlanId(collect, status);
+      //  List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectComplete(id);
         if (CollectionUtils.isNotEmpty(coreMonitoringRetrievalTasks) && plan.getParentId() == null) {
             isComplete = true;
         }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/mapper/CoreMonitoringRetrievalTaskMapper.java

@@ -164,6 +164,7 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
      */
     List<CoreMonitoringRetrievalTask> selectCompleteByPlanId(Long planId);
 
+
     void deleteWaitTaskByPlanId(@Param("planId") Long planId);
 
     void updateDeleteTaskByPlanId(@Param("planId") Long planId, @Param("isDeleted") Integer isDeleted);

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

@@ -149,16 +149,12 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     @Override
     public TableDataInfo selectListApp(CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
+        coreMonitoringTaskRegistrationDTO.setRetrievalUser(SecurityUtils.getUserId());
         if (null == coreMonitoringTaskRegistrationDTO.getOrgId()) {
             coreMonitoringTaskRegistrationDTO.setOrgId(loginUser.getOrgId());
         }
         Page<AppCoreMonitoringRetrievalTaskVO> coreMonitoringRetrievalTaskPage = baseMapper.selectListApp(coreMonitoringTaskRegistrationDTO.getPageRequest(), coreMonitoringTaskRegistrationDTO);
-        TableDataInfo<AppCoreMonitoringRetrievalTaskVO> tableDataInfo = new TableDataInfo();
-        tableDataInfo.setMsg("操作成功");
-        tableDataInfo.setCode(200);
-        tableDataInfo.setTotal(coreMonitoringRetrievalTaskPage.getTotal());
-        tableDataInfo.setRows(coreMonitoringRetrievalTaskPage.getRecords());
-        return tableDataInfo;
+        return TableDataInfo.build(coreMonitoringRetrievalTaskPage);
     }
 
 
@@ -175,7 +171,6 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
 
     @Override
     public List<CoreMonitoringRetrievalTask> selectComplete(Long planId) {
-
         return coreMonitoringRetrievalTaskMapper.selectCompleteByPlanId(planId);
     }
 

soc-modules/soc-modules-core/src/main/resources/mapper/access/TMonitoringRetrievalPlanMapper.xml

@@ -79,7 +79,7 @@
     <select id="selectPageList" resultType="com.xunmei.core.access.vo.TMonitoringRetrievalPlanVO">
         SELECT
         IFNULL( b.org_id, a.org_id ) AS parentOrgId,
-        a.id,
+        a.id as id,
         a.plan_name,
         a.org_id,
         a.org_name,

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -158,6 +158,7 @@
         <if test="request.moth !=null">
             and a.ymd_date like concat('%', #{request.moth}, '%')
         </if>
+        AND a.role_id IN (SELECT role_id FROM sys_user_role WHERE user_id=#{request.retrievalUser})
         GROUP BY
         a.id
         ORDER BY FIELD(a.`status`,'1','0','2','3'),