更改文件上传接口返回值类型

apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/DisableServiceImpl.java

@@ -12,7 +12,6 @@ import com.hungraim.ltc.pojo.entity.disable.*;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgPara;
 import com.hungraim.ltc.pojo.vo.disable.*;
 import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
-import com.hungraim.ltc.pojo.vo.system.AttachVo;
 import com.hungraim.ltc.service.DisableService;
 import com.hungraim.ltc.util.AttachType;
 import com.hungraim.ltc.util.Result;
@@ -100,7 +99,7 @@ public class DisableServiceImpl implements DisableService {
         disableExamineInfoVO.setExamineRecords(examineRecords);
         try {
             // zhangch 20210525 新增返回对应的附件列表
-            Result<List<AttachVo>> listResult = attachFeignService.selectAttachs(Long.valueOf(applyId), AttachType.DISABLE.getUploadType());
+            Result<List<ChFndAttach>> listResult = attachFeignService.selectAttachs(Long.valueOf(applyId), AttachType.DISABLE.getUploadType());
             if (listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
                 disableExamineInfoVO.setFileDataList(listResult.getData());
             } else {

apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/SrvOrganServiceImpl.java

 package com.hungraim.ltc.service.impl;
 
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.api.AttachFeignService;
 import com.hungraim.ltc.dao.ChCfgSrvOrganTypeMapper;
@@ -11,12 +10,10 @@ import com.hungraim.ltc.dao.SrvOrganMapper;
 import com.hungraim.ltc.pojo.entity.SysConfig.ChCfgSrvOrganType;
 import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
 import com.hungraim.ltc.pojo.entity.SysConfig.ChFndSrvOrganLevel;
-import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvEmpType;
 import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
 import com.hungraim.ltc.pojo.vo.disable.SrvModeVo;
 import com.hungraim.ltc.pojo.vo.disable.SrvOrganListVo;
 import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
-import com.hungraim.ltc.pojo.vo.system.AttachVo;
 import com.hungraim.ltc.pojo.vo.system.SrvOrganVo;
 import com.hungraim.ltc.service.OrganService;
 import com.hungraim.ltc.service.SrvOrganService;
@@ -124,17 +121,11 @@ public class SrvOrganServiceImpl implements SrvOrganService {
         SrvOrganVo srvOrganVo = new SrvOrganVo();
         BeanUtils.copyProperties(chSrvOrgan, srvOrganVo);
         try {
-            Result<List<AttachVo>> listResult = attachFeignService.selectAttachs(srvOrganId, AttachType.SRV_ORGAN.getUploadType());
+            Result<List<ChFndAttach>> listResult = attachFeignService.selectAttachs(srvOrganId, AttachType.SRV_ORGAN.getUploadType());
             if (StrUtil.equals(listResult.getCode(), ResultCode.SUCCESS.getCode())) {
-                List<AttachVo> data = listResult.getData();
+                List<ChFndAttach> data = listResult.getData();
                 if (data != null) {
-                    List<ChFndAttach> attaches = new ArrayList<>();
-                    for (AttachVo attachVo : data) {
-                        ChFndAttach chFndAttach = new ChFndAttach();
-                        BeanUtils.copyProperties(attachVo, chFndAttach);
-                        attaches.add(chFndAttach);
-                    }
-                    srvOrganVo.setFileDataList(attaches);
+                    srvOrganVo.setFileDataList(data);
                 }
             } else {
                 log.error("查询id为{}的护理机构文件列表失败，失败原因：{}", srvOrganId, listResult.getMsg());

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

@@ -5,7 +5,6 @@ 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;
@@ -81,8 +80,8 @@ public class TaskController {
      * @param reportId 评定报告id
      */
     @RequestMapping("/reportFileList")
-    public Result<List<AttachVo>> reportFileList(Long reportId) {
-        Result<List<AttachVo>> listResult = taskService.reportFileList(reportId);
+    public Result<List<ChFndAttach>> reportFileList(Long reportId) {
+        Result<List<ChFndAttach>> listResult = taskService.reportFileList(reportId);
         if (!listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
             return Result.failed("请求获取附件列表错误：错误码{" + listResult.getCode() + "},错误信息:{" + listResult.getMsg() + "}");
         }

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

@@ -5,7 +5,6 @@ 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;
 
@@ -54,5 +53,5 @@ public interface TaskService {
 
     List<ChRefuseReason> refuseReasonList();
 
-    Result<List<AttachVo>> reportFileList(Long reportId);
+    Result<List<ChFndAttach>> reportFileList(Long reportId);
 }

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

@@ -11,7 +11,6 @@ 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;
@@ -440,8 +439,8 @@ public class TaskServiceImpl implements TaskService {
     }
 
     @Override
-    public Result<List<AttachVo>> reportFileList(Long reportId) {
-        Result<List<AttachVo>> listResult = null;
+    public Result<List<ChFndAttach>> reportFileList(Long reportId) {
+        Result<List<ChFndAttach>> listResult = null;
         try {
             // 返回对应的附件列表
             listResult = attachFeignService.selectAttachs(reportId, AttachType.TASK.getUploadType());

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableExamineInfoVO.java

 package com.hungraim.ltc.pojo.vo.disable;
 
-import com.hungraim.ltc.pojo.vo.system.AttachVo;
+import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
 import lombok.Data;
 
 import java.util.Date;
@@ -107,5 +107,5 @@ public class DisableExamineInfoVO {
     //备注
     private String checkRemark;
 
-    private List<AttachVo> fileDataList;
+    private List<ChFndAttach> fileDataList;
 }

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

+package com.hungraim.ltc.pojo.vo.governance;
+
+import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChAprOrgan;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 评定人员信息详情VO
+ */
+@Data
+public class AprOrganInfoVO extends ChAprOrgan {
+    private List<ChFndAttach> fileDataList;
+}

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

 package com.hungraim.ltc.pojo.vo.governance;
 
 import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
-import com.hungraim.ltc.pojo.vo.system.AttachVo;
 import com.hungraim.ltc.util.Result;
 import lombok.Data;
 
@@ -52,9 +51,9 @@ public class SrvTaskInfoVO implements Serializable {
      */
     private String taskStatus;
     /**
-     * 服务计划附件VO
+     * 服务计划附件
      */
-    private Result<List<AttachVo>> listResult;
+    private Result<List<ChFndAttach>> listResult;
     /**
      * 服务计划附件
      */

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

@@ -10,8 +10,8 @@ import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprOrganType;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprempType;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChFndEducation;
 import com.hungraim.ltc.pojo.vo.governance.AprEmpVO;
+import com.hungraim.ltc.pojo.vo.governance.AprOrganInfoVO;
 import com.hungraim.ltc.pojo.vo.governance.AprOrganVO;
-import com.hungraim.ltc.pojo.vo.system.AttachVo;
 import com.hungraim.ltc.util.Result;
 import com.hungraim.ltc.util.ResultCode;
 import lombok.extern.slf4j.Slf4j;
@@ -59,12 +59,12 @@ public class AprOrganController {
      * @return 返回相关信息
      */
     @GetMapping("/getAprOrganInfo")
-    public Result<ChAprOrgan> getAprOrganInfo(Long aprOrganId) {
+    public Result<AprOrganInfoVO> getAprOrganInfo(Long aprOrganId) {
         if (null == aprOrganId) {
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
-        ChAprOrgan chAprOrgan = aprOrganService.getAprOrganInfo(aprOrganId);
-        return Result.success(chAprOrgan);
+        AprOrganInfoVO aprOrganInfoVO = aprOrganService.getAprOrganInfo(aprOrganId);
+        return Result.success(aprOrganInfoVO);
     }
 
     /**
@@ -83,20 +83,6 @@ public class AprOrganController {
     }
 
     /**
-     * 查询评定机构附件列表
-     *
-     * @param aprOrganId 评定机构id
-     */
-    @RequestMapping("/aprOrganFileList")
-    public Result<List<AttachVo>> aprOrganFileList(Long aprOrganId) {
-        Result<List<AttachVo>> listResult = aprOrganService.aprOrganFileList(aprOrganId);
-        if (!listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
-            return Result.failed("请求获取附件列表错误：错误码{" + listResult.getCode() + "},错误信息:{" + listResult.getMsg() + "}");
-        }
-        return listResult;
-    }
-
-    /**
      * 新增评定机构或更新评定机构信息(有apr_organ_id就更新,没有就新增)
      *
      * @param accountInfo                 账号信息附件
@@ -245,8 +231,8 @@ public class AprOrganController {
      * @param empId 评定人员id
      */
     @RequestMapping("/empFileList")
-    public Result<List<AttachVo>> empFileList(Long empId) {
-        Result<List<AttachVo>> listResult = aprOrganService.empFileList(empId);
+    public Result<List<ChFndAttach>> empFileList(Long empId) {
+        Result<List<ChFndAttach>> listResult = aprOrganService.empFileList(empId);
         if (!listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
             return Result.failed("请求获取附件列表错误：错误码{" + listResult.getCode() + "},错误信息:{" + listResult.getMsg() + "}");
         }
@@ -315,6 +301,21 @@ public class AprOrganController {
     }
 
     /**
+     * 更改评定机构人员状态
+     *
+     * @param empId  评定机构人员id
+     * @param isLock 状态 有效：0；失效：1
+     */
+    @DeleteMapping("/updateAprEmpStatus")
+    public Result updateAprEmpStatus(String empId, Integer isLock) {
+        if (StringUtils.isBlank(empId) || isLock == null || (isLock != 1 && isLock != 0)) {
+            return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+        }
+        aprOrganService.updateAprEmpStatus(empId, isLock);
+        return Result.success();
+    }
+
+    /**
      * 获取评定机构人员资质
      *
      * @param parAprempTypeId 父级鉴定人员类型ID(如果没有就查询所有父类型资质)

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

@@ -3,12 +3,12 @@ package com.hungraim.ltc.governance.controller;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.governance.service.SrvProgramService;
+import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgram;
 import com.hungraim.ltc.pojo.vo.governance.ProgramDetailVo;
 import com.hungraim.ltc.pojo.vo.governance.ProgramListVo;
 import com.hungraim.ltc.pojo.vo.governance.ProgramSetAndProjectVo;
 import com.hungraim.ltc.pojo.vo.governance.SvrSendListVo;
-import com.hungraim.ltc.pojo.vo.system.AttachVo;
 import com.hungraim.ltc.util.Result;
 import com.hungraim.ltc.util.ResultCode;
 import lombok.extern.slf4j.Slf4j;
@@ -87,8 +87,8 @@ public class SrvProgramController {
      * @param programId 服务计划id
      */
     @RequestMapping("/programFileList")
-    public Result<List<AttachVo>> reportFileList(Long programId) {
-        Result<List<AttachVo>> listResult = srvProgramService.programFileList(programId);
+    public Result<List<ChFndAttach>> reportFileList(Long programId) {
+        Result<List<ChFndAttach>> listResult = srvProgramService.programFileList(programId);
         if (!listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
             return Result.failed("请求获取附件列表错误：错误码{" + listResult.getCode() + "},错误信息:{" + listResult.getMsg() + "}");
         }

governance/src/main/java/com/hungraim/ltc/governance/service/AprOrganService.java

@@ -9,8 +9,8 @@ import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprOrganType;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprempType;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChFndEducation;
 import com.hungraim.ltc.pojo.vo.governance.AprEmpVO;
+import com.hungraim.ltc.pojo.vo.governance.AprOrganInfoVO;
 import com.hungraim.ltc.pojo.vo.governance.AprOrganVO;
-import com.hungraim.ltc.pojo.vo.system.AttachVo;
 import com.hungraim.ltc.util.Result;
 import org.springframework.stereotype.Service;
 
@@ -29,7 +29,7 @@ public interface AprOrganService {
 
     void addOrUpdateAprOrgan(ChAprOrgan chAprOrgan, ChFndAttach accountInfo, ChFndAttach organBusinessLicense, ChFndAttach healthcareProviderAgreement, ChFndAttach otherFile);
 
-    ChAprOrgan getAprOrganInfo(Long aprOrganId);
+    AprOrganInfoVO getAprOrganInfo(Long aprOrganId);
 
     List<ChCfgAprOrganType> getCfgAprOrganTypes();
 
@@ -43,7 +43,7 @@ public interface AprOrganService {
 
     List<ChFndEducation> fndEducation();
 
-    Result<List<AttachVo>> empFileList(Long empId);
+    Result<List<ChFndAttach>> empFileList(Long empId);
 
-    Result<List<AttachVo>> aprOrganFileList(Long aprOrganId);
+    void updateAprEmpStatus(String empId, Integer isLock);
 }

governance/src/main/java/com/hungraim/ltc/governance/service/SrvProgramService.java

 package com.hungraim.ltc.governance.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgram;
 import com.hungraim.ltc.pojo.vo.governance.ProgramDetailVo;
 import com.hungraim.ltc.pojo.vo.governance.ProgramListVo;
 import com.hungraim.ltc.pojo.vo.governance.SvrSendListVo;
-import com.hungraim.ltc.pojo.vo.system.AttachVo;
 import com.hungraim.ltc.util.Result;
 
 import java.util.List;
@@ -81,6 +81,6 @@ public interface SrvProgramService {
      *
      * @param programId 服务计划id
      */
-    Result<List<AttachVo>> programFileList(Long programId);
+    Result<List<ChFndAttach>> programFileList(Long programId);
 
 }

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

@@ -14,15 +14,16 @@ import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprOrganType;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprempType;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChFndEducation;
 import com.hungraim.ltc.pojo.vo.governance.AprEmpVO;
+import com.hungraim.ltc.pojo.vo.governance.AprOrganInfoVO;
 import com.hungraim.ltc.pojo.vo.governance.AprOrganVO;
 import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
-import com.hungraim.ltc.pojo.vo.system.AttachVo;
 import com.hungraim.ltc.util.AttachType;
 import com.hungraim.ltc.util.Result;
 import com.hungraim.ltc.util.ResultCode;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -43,7 +44,7 @@ public class AprOrganServiceImpl implements AprOrganService {
     private final ChCfgAprGroupDetailMapper cfgAprGroupDetailMapper;
     private final CfgAprempMapper cfgAprempMapper;
     private final FndEducationMapper fndEducationMapper;
-    private AttachFeignService attachFeignService;
+    private final AttachFeignService attachFeignService;
 
     @Override
     public Page<AprOrganVO> aprOrganList(Page<AprOrganVO> page, Long organId, Boolean isIncluded, String organName, String code) {
@@ -110,8 +111,24 @@ public class AprOrganServiceImpl implements AprOrganService {
     }
 
     @Override
-    public ChAprOrgan getAprOrganInfo(Long aprOrganId) {
-        return aprOrganMapper.selectById(aprOrganId);
+    public AprOrganInfoVO getAprOrganInfo(Long aprOrganId) {
+        ChAprOrgan chAprOrgan = aprOrganMapper.selectById(aprOrganId);
+        //查询附件列表
+        Result<List<ChFndAttach>> listResult = null;
+        try {
+            // 返回对应的附件列表
+            listResult = attachFeignService.selectAttachs(aprOrganId, AttachType.APR_ORGAN.getUploadType());
+            if (!listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
+                log.info("请求获取附件列表错误：错误码{},错误信息:{}", listResult.getCode(), listResult.getMsg());
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            e.printStackTrace();
+        }
+        AprOrganInfoVO aprOrganInfoVO = new AprOrganInfoVO();
+        BeanUtils.copyProperties(chAprOrgan, aprOrganInfoVO);
+        aprOrganInfoVO.setFileDataList(listResult.getData());
+        return aprOrganInfoVO;
     }
 
     @Override
@@ -177,8 +194,8 @@ public class AprOrganServiceImpl implements AprOrganService {
     }
 
     @Override
-    public Result<List<AttachVo>> empFileList(Long empId) {
-        Result<List<AttachVo>> listResult = null;
+    public Result<List<ChFndAttach>> empFileList(Long empId) {
+        Result<List<ChFndAttach>> listResult = null;
         try {
             // 返回对应的附件列表
             listResult = attachFeignService.selectAttachs(empId, AttachType.APR_EMP.getUploadType());
@@ -193,19 +210,10 @@ public class AprOrganServiceImpl implements AprOrganService {
     }
 
     @Override
-    public Result<List<AttachVo>> aprOrganFileList(Long aprOrganId) {
-        Result<List<AttachVo>> listResult = null;
-        try {
-            // 返回对应的附件列表
-            listResult = attachFeignService.selectAttachs(aprOrganId, AttachType.APR_ORGAN.getUploadType());
-            if (!listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
-                log.info("请求获取附件列表错误：错误码{},错误信息:{}", listResult.getCode(), listResult.getMsg());
-            }
-        } catch (Exception e) {
-            log.error(e.getMessage());
-            e.printStackTrace();
-        }
-        return listResult;
+    public void updateAprEmpStatus(String empId, Integer isLock) {
+        ChAprEmp chAprEmp = aprEmpMapper.selectById(empId);
+        chAprEmp.setIsLock(isLock);
+        aprEmpMapper.updateById(chAprEmp);
     }
 
     /**

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

@@ -15,17 +15,14 @@ import com.hungraim.ltc.pojo.vo.governance.ProgramListVo;
 import com.hungraim.ltc.pojo.vo.governance.ProgramSetAndProjectVo;
 import com.hungraim.ltc.pojo.vo.governance.SvrSendListVo;
 import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
-import com.hungraim.ltc.pojo.vo.system.AttachVo;
 import com.hungraim.ltc.util.AttachType;
 import com.hungraim.ltc.util.Result;
 import com.hungraim.ltc.util.ResultCode;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -68,18 +65,12 @@ public class SrvProgramServiceImpl implements SrvProgramService {
     public ProgramDetailVo getProgramDetail(Long programId) {
         ProgramDetailVo programDetail = chSrvProgramMapper.getProgramDetail(programId);
         // 返回对应的附件列表
-        Result<List<AttachVo>> listResult = attachFeignService.selectAttachs(programId, AttachType.PROGRAM.getUploadType());
+        Result<List<ChFndAttach>> listResult = attachFeignService.selectAttachs(programId, AttachType.PROGRAM.getUploadType());
         if (!listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
             log.info("请求获取附件列表错误：错误码{},错误信息:{}", listResult.getCode(), listResult.getMsg());
         } else {
-            List<AttachVo> data = listResult.getData();
-            List<ChFndAttach> attachList = new ArrayList<>();
-            for (AttachVo attachVo : data) {
-                ChFndAttach attach = new ChFndAttach();
-                BeanUtils.copyProperties(attachVo, attach);
-                attachList.add(attach);
-            }
-            programDetail.setFileDataList(attachList);
+            List<ChFndAttach> data = listResult.getData();
+            programDetail.setFileDataList(data);
         }
         return programDetail;
     }
@@ -162,8 +153,8 @@ public class SrvProgramServiceImpl implements SrvProgramService {
     }
 
     @Override
-    public Result<List<AttachVo>> programFileList(Long programId) {
-        Result<List<AttachVo>> listResult = null;
+    public Result<List<ChFndAttach>> programFileList(Long programId) {
+        Result<List<ChFndAttach>> listResult = null;
         try {
             // 返回对应的附件列表
             listResult = attachFeignService.selectAttachs(programId, AttachType.PROGRAM.getUploadType());

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

@@ -12,7 +12,6 @@ import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTask;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail;
 import com.hungraim.ltc.pojo.vo.governance.*;
 import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
-import com.hungraim.ltc.pojo.vo.system.AttachVo;
 import com.hungraim.ltc.util.AttachType;
 import com.hungraim.ltc.util.DateUtils;
 import com.hungraim.ltc.util.Result;
@@ -80,7 +79,7 @@ public class SrvTaskServiceImpl implements SrvTaskService {
         try {
             for (SrvTaskInfoVO vo : srvTaskInfoList) {
                 // 返回对应的附件列表
-                Result<List<AttachVo>> listResult = attachFeignService.selectAttachs(Long.parseLong(programId), AttachType.SRV_TASK.getUploadType());
+                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 {

system/system-admin-service/src/main/java/com/hungraim/ltc/system/controller/FileUploadController.java

 package com.hungraim.ltc.system.controller;
 
+import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
 import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
-import com.hungraim.ltc.pojo.vo.system.AttachVo;
 import com.hungraim.ltc.system.config.FileUploadConfig;
 import com.hungraim.ltc.system.service.AttachService;
 import com.hungraim.ltc.util.FileUtils;
@@ -72,11 +72,11 @@ public class FileUploadController {
      * @return 返回对应的数据列表
      */
     @GetMapping("/attachs")
-    Result<List<AttachVo>> selectAttachs(Long ctrlId, Short attachType) {
+    Result<List<ChFndAttach>> selectAttachs(Long ctrlId, Short attachType) {
         if (null == ctrlId || 0 == ctrlId || null == attachType) {
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
-        List<AttachVo> attachVos = attachService.selectAttachs(ctrlId, attachType);
+        List<ChFndAttach> attachVos = attachService.selectAttachs(ctrlId, attachType);
         return Result.success(attachVos);
     }
 }

system/system-admin-service/src/main/java/com/hungraim/ltc/system/service/AttachService.java

 package com.hungraim.ltc.system.service;
 
+import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
 import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
-import com.hungraim.ltc.pojo.vo.system.AttachVo;
 
 import java.util.List;
 
@@ -34,5 +34,5 @@ public interface AttachService {
      * @param attachType 附件类型
      * @return 返回对应的数据列表
      */
-    List<AttachVo> selectAttachs(Long ctrlId, Short attachType);
+    List<ChFndAttach> selectAttachs(Long ctrlId, Short attachType);
 }

system/system-admin-service/src/main/java/com/hungraim/ltc/system/service/impl/AttachServiceImpl.java

@@ -3,15 +3,12 @@ package com.hungraim.ltc.system.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
 import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
-import com.hungraim.ltc.pojo.vo.system.AttachVo;
 import com.hungraim.ltc.system.dao.ChFndAttachMapper;
 import com.hungraim.ltc.system.service.AttachService;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -103,14 +100,7 @@ public class AttachServiceImpl implements AttachService {
     }
 
     @Override
-    public List<AttachVo> selectAttachs(Long ctrlId, Short attachType) {
-        List<AttachVo> attachVos = new ArrayList<>();
-        List<ChFndAttach> chFndAttaches = this.getChFndAttaches(ctrlId, attachType);
-        for (ChFndAttach chFndAttach : chFndAttaches) {
-            AttachVo attachVo = new AttachVo();
-            BeanUtils.copyProperties(chFndAttach, attachVo);
-            attachVos.add(attachVo);
-        }
-        return attachVos;
+    public List<ChFndAttach> selectAttachs(Long ctrlId, Short attachType) {
+        return this.getChFndAttaches(ctrlId, attachType);
     }
 }

system/system-api/src/main/java/com/hungraim/ltc/api/AttachFeignService.java

 package com.hungraim.ltc.api;
 
+import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
 import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
-import com.hungraim.ltc.pojo.vo.system.AttachVo;
 import com.hungraim.ltc.util.Result;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,5 +37,5 @@ public interface AttachFeignService {
      * @return 返回对应的数据列表
      */
     @GetMapping("/api.system/resource/attachs")
-    Result<List<AttachVo>> selectAttachs(@RequestParam("ctrlId") Long ctrlId, @RequestParam("attachType") Short attachType);
+    Result<List<ChFndAttach>> selectAttachs(@RequestParam("ctrlId") Long ctrlId, @RequestParam("attachType") Short attachType);
 }