巡检

platform-dao/src/main/java/com/platform/dao/vo/query/fill/FillGatherTaskVO.java

@@ -1,5 +1,8 @@
 package com.platform.dao.vo.query.fill;
 
+import com.platform.dao.entity.fill.FillGather;
+import com.platform.dao.entity.fill.FillGatherInfo;
+import com.platform.dao.entity.fill.FillInfo;
 import lombok.Data;
 import com.platform.common.bean.BaseVO;
 import com.platform.common.bean.BaseDTO;
@@ -105,5 +108,10 @@ public class FillGatherTaskVO extends BaseVO implements Serializable {
      */
     private Integer period;
 
+    /**
+     * 巡检内容项集合
+     */
+    private List<FillInfo> fillInfos;
+
 
 }

platform-service/src/main/java/com/platform/service/fill/impl/FillGatherTaskServiceImpl.java

@@ -203,6 +203,12 @@ public class FillGatherTaskServiceImpl extends BaseServiceImpl<FillGatherTaskMap
         FillGatherTask task = mapper.selectByPrimaryKey(id);
         FillGatherTaskVO vo = BeanConverterUtil.copyObjectProperties(task,FillGatherTaskVO.class);
         vo.setDetails(fillGatherTaskDetailMapper.selectVOByTaskId(id));
+        List<FillInfo> fillInfos = new ArrayList<>();
+        List<FillGatherInfo> infos = fillGatherInfoMapper.select(new FillGatherInfo().setGatherId(task.getGatherId()));
+        for(FillGatherInfo info : infos){
+            fillInfos.add(fillInfoMapper.selectByPrimaryKey(info.getInfoId()));
+        }
+        vo.setFillInfos(fillInfos);
         return vo;
     }