merge

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/SrvTaskInfoVO.java

@@ -50,12 +50,9 @@ public class SrvTaskInfoVO implements Serializable {
      * 服务计划状态
      */
     private String taskStatus;
-    /**
-     * 服务计划附件
-     */
-    private Result<List<ChFndAttach>> listResult;
-    /**
-     * 服务计划附件
-     */
-    private List<ChFndAttach> listAttach;
+
+//    /**
+//     * 服务计划附件
+//     */
+//    private List<ChFndAttach> listAttach;
 }

governance/src/main/java/com/hungraim/ltc/governance/service/impl/SrvTaskServiceImpl.java

@@ -76,20 +76,20 @@ public class SrvTaskServiceImpl implements SrvTaskService {
     public List<SrvTaskInfoVO> getSrvTaskInfoList(String programId) {
         List<SrvTaskInfoVO> srvTaskInfoList = srvTaskMapper.getSrvTaskInfoList(programId);
         //查询服务计划附件
-        try {
-            for (SrvTaskInfoVO vo : srvTaskInfoList) {
-                // 返回对应的附件列表
-                Result<List<ChFndAttach>> listResult = attachFeignService.selectAttachs(Long.parseLong(programId), AttachType.SRV_TASK.getUploadType());
-                if (!listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
-                    log.info("请求获取附件列表错误：错误码{},错误信息:{}", listResult.getCode(), listResult.getMsg());
-                } else {
-                    vo.setListResult(listResult);
-                }
-            }
-        } catch (Exception e) {
-            log.error(e.getMessage());
-            e.printStackTrace();
-        }
+//        try {
+//            for (SrvTaskInfoVO vo : srvTaskInfoList) {
+//                // 返回对应的附件列表
+//                Result<List<ChFndAttach>> listResult = attachFeignService.selectAttachs(Long.parseLong(programId), AttachType.SRV_TASK.getUploadType());
+//                if (!listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
+//                    log.info("请求获取附件列表错误：错误码{},错误信息:{}", listResult.getCode(), listResult.getMsg());
+//                } else {
+//                    vo.setListResult(listResult);
+//                }
+//            }
+//        } catch (Exception e) {
+//            log.error(e.getMessage());
+//            e.printStackTrace();
+//        }
         //具体服务日期
         for (SrvTaskInfoVO vo : srvTaskInfoList) {
             List<ChSrvTaskDetail> taskDetails = chSrvTaskDetailMapper.selectList(new QueryWrapper<ChSrvTaskDetail>().eq("srv_task_id", vo.getSrvTaskId()));
@@ -138,13 +138,13 @@ public class SrvTaskServiceImpl implements SrvTaskService {
                 Long newSrvTaskId = chSrvTask.getSrvTaskId();
                 this.insertTaskDetail(newSrvTaskId, taskDetails);
                 //添加附件
-                this.updateAttachs(srvTaskInfoVO.getListAttach(), chSrvTask.getSrvTaskId());
+//                this.updateAttachs(srvTaskInfoVO.getListAttach(), chSrvTask.getSrvTaskId());
             } else {
                 // 修改服务计划
                 chSrvTaskDetailMapper.delete(new QueryWrapper<ChSrvTaskDetail>().eq("srv_task_id", Long.parseLong(srvTaskId)));//删除原来的计划详情
                 this.insertTaskDetail(Long.parseLong(srvTaskId), taskDetails);
                 //修改附件
-                this.updateAttachs(srvTaskInfoVO.getListAttach(), Long.parseLong(srvTaskId));
+//                this.updateAttachs(srvTaskInfoVO.getListAttach(), Long.parseLong(srvTaskId));
             }
         }
     }