查询评定报告附件列表

assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java

@@ -5,6 +5,7 @@ import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
 import com.hungraim.ltc.pojo.entity.assessment.ChRefuseReason;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
 import com.hungraim.ltc.pojo.vo.assessment.*;
+import com.hungraim.ltc.pojo.vo.system.AttachVo;
 import com.hungraim.ltc.service.TaskService;
 import com.hungraim.ltc.util.Result;
 import com.hungraim.ltc.util.ResultCode;
@@ -75,6 +76,20 @@ public class TaskController {
     }
 
     /**
+     * 查询评定报告附件列表
+     *
+     * @param reportId 评定报告id
+     */
+    @RequestMapping("/reportFileList")
+    public Result<List<AttachVo>> reportFileList(Long reportId) {
+        Result<List<AttachVo>> listResult = taskService.reportFileList(reportId);
+        if (!listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
+            return Result.failed("请求获取附件列表错误：错误码{" + listResult.getCode() + "},错误信息:{" + listResult.getMsg() + "}");
+        }
+        return listResult;
+    }
+
+    /**
      * 通过报告id查询评定报告人员信息
      *
      * @param reportId 评定报告id

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/TaskService.java

@@ -5,6 +5,7 @@ import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
 import com.hungraim.ltc.pojo.entity.assessment.ChRefuseReason;
 import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
 import com.hungraim.ltc.pojo.vo.assessment.*;
+import com.hungraim.ltc.pojo.vo.system.AttachVo;
 import com.hungraim.ltc.util.Result;
 import org.springframework.stereotype.Service;
 
@@ -52,4 +53,6 @@ public interface TaskService {
     Result<Object> updatePushTimeAndRemark(String pushId, Date timeDate, String remark);
 
     List<ChRefuseReason> refuseReasonList();
+
+    Result<List<AttachVo>> reportFileList(Long reportId);
 }

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java

@@ -11,9 +11,11 @@ import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvDisableLevel;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
 import com.hungraim.ltc.pojo.vo.assessment.*;
 import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
+import com.hungraim.ltc.pojo.vo.system.AttachVo;
 import com.hungraim.ltc.service.TaskService;
 import com.hungraim.ltc.util.AttachType;
 import com.hungraim.ltc.util.Result;
+import com.hungraim.ltc.util.ResultCode;
 import com.hungraim.ltc.util.SerialNumberUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -438,4 +440,20 @@ public class TaskServiceImpl implements TaskService {
     public List<ChRefuseReason> refuseReasonList() {
         return refuseReasonMapper.selectList(new QueryWrapper<>());
     }
+
+    @Override
+    public Result<List<AttachVo>> reportFileList(Long reportId) {
+        Result<List<AttachVo>> listResult = null;
+        try {
+            // 新增返回对应的附件列表
+            listResult = attachFeignService.selectAttachs(reportId, (short) 1);
+            if (!listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
+                log.info("请求获取附件列表错误：错误码{},错误信息:{}", listResult.getCode(), listResult.getMsg());
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            e.printStackTrace();
+        }
+        return listResult;
+    }
 }
\ No newline at end of file

governance/src/main/java/com/hungraim/ltc/governance/controller/BuildBedController.java

 package com.hungraim.ltc.governance.controller;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
-import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
-import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvSend;
 import com.hungraim.ltc.governance.service.*;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
 import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
 import com.hungraim.ltc.pojo.entity.governance.ChSrvBuildBed;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvSend;
 import com.hungraim.ltc.pojo.vo.disable.ChrSrvVo;
 import com.hungraim.ltc.pojo.vo.governance.BuildBedSearchReq;
 import com.hungraim.ltc.pojo.vo.governance.DisableInfoTaskVO;
@@ -18,7 +15,6 @@ import com.hungraim.ltc.pojo.vo.governance.DisableInfoVo;
 import com.hungraim.ltc.pojo.vo.governance.SrvSendVO;
 import com.hungraim.ltc.util.Result;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -151,7 +147,7 @@ public class BuildBedController {
                 if(chrSrvVo.getSrvSendId() == null){
                     Long id = sendService.selectMaxId();
                     if(id == null){
-                        id = 0l;
+                        id = 0L;
                     }
                     chSrvSend.setSrvSendId(++id);
                 }