评定机构及评定机构人员文件上传及列表查询

common/common-core/src/main/java/com/hungraim/ltc/util/AttachType.java

@@ -57,8 +57,17 @@ public enum AttachType {
     /**
      * 15:护理人员附件;
      */
-    SRV_ORGAN_EMP((short) 15);
+    SRV_ORGAN_EMP((short) 15),
 
+    /**
+     * 16:服务计划制定附件;
+     */
+    SRV_TASK((short) 16),
+
+    /**
+     * 17:鉴定机构人员附件;
+     */
+    APR_EMP((short) 17);
 
     private Short uploadType;
 

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

@@ -2,6 +2,7 @@ package com.hungraim.ltc.governance.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.governance.service.AprOrganService;
+import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
 import com.hungraim.ltc.pojo.entity.assessment.ChAprEmp;
 import com.hungraim.ltc.pojo.entity.assessment.ChCfgAprGroupDetail;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChAprOrgan;
@@ -10,6 +11,7 @@ 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.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;
@@ -81,13 +83,35 @@ 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                 账号信息附件
+     * @param organBusinessLicense        机构营业执照附件
+     * @param healthcareProviderAgreement 定点医护机构协议附件
+     * @param otherFile                   其他附件
      */
     @PostMapping("/addOrUpdateAprOrgan")
-    public Result addOrUpdateAprOrgan(ChAprOrgan chAprOrgan) {
+    public Result addOrUpdateAprOrgan(ChAprOrgan chAprOrgan, ChFndAttach accountInfo, ChFndAttach organBusinessLicense, ChFndAttach healthcareProviderAgreement, ChFndAttach otherFile) {
         if (chAprOrgan == null) {
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
+        if (accountInfo == null || organBusinessLicense == null || healthcareProviderAgreement == null) {
+
+        }
         if (chAprOrgan.getAprOrganId() == null) {
             //新增
             if (StringUtils.isBlank(chAprOrgan.getOrganId())) {//适用机构
@@ -171,7 +195,7 @@ public class AprOrganController {
                 return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
             }
         }
-        aprOrganService.addOrUpdateAprOrgan(chAprOrgan);
+        aprOrganService.addOrUpdateAprOrgan(chAprOrgan, accountInfo, organBusinessLicense, healthcareProviderAgreement, otherFile);
         return Result.success();
     }
 
@@ -193,7 +217,6 @@ public class AprOrganController {
         return Result.success(chCfgAprGroupDetails);
     }
 
-
     /**
      * 评定人员信息列表
      *
@@ -217,10 +240,26 @@ public class AprOrganController {
     }
 
     /**
+     * 查询评定人员附件列表
+     *
+     * @param empId 评定人员id
+     */
+    @RequestMapping("/empFileList")
+    public Result<List<AttachVo>> empFileList(Long empId) {
+        Result<List<AttachVo>> listResult = aprOrganService.empFileList(empId);
+        if (!listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
+            return Result.failed("请求获取附件列表错误：错误码{" + listResult.getCode() + "},错误信息:{" + listResult.getMsg() + "}");
+        }
+        return listResult;
+    }
+
+    /**
      * 新增评定机构人员或更新评定机构人员信息(有emp_id就更新,没有就新增)
+     *
+     * @param fileDataList 附件
      */
     @DeleteMapping("/addOrUpdateAprEmp")
-    public Result addOrUpdateAprEmp(ChAprEmp chAprEmp) {
+    public Result addOrUpdateAprEmp(List<ChFndAttach> fileDataList, ChAprEmp chAprEmp) {
         if (chAprEmp == null) {
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
@@ -271,7 +310,7 @@ public class AprOrganController {
                 return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
             }
         }
-        aprOrganService.addOrUpdateAprEmp(chAprEmp);
+        aprOrganService.addOrUpdateAprEmp(fileDataList, chAprEmp);
         return Result.success();
     }
 
@@ -294,4 +333,5 @@ public class AprOrganController {
         List<ChFndEducation> fndEducation = aprOrganService.fndEducation();
         return Result.success(fndEducation);
     }
+
 }

governance/src/main/java/com/hungraim/ltc/governance/service/AprOrganService.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.assessment.ChAprEmp;
 import com.hungraim.ltc.pojo.entity.assessment.ChCfgAprGroupDetail;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChAprOrgan;
@@ -9,6 +10,8 @@ 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.AprOrganVO;
+import com.hungraim.ltc.pojo.vo.system.AttachVo;
+import com.hungraim.ltc.util.Result;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -24,7 +27,7 @@ public interface AprOrganService {
 
     void updateAprOrganStatus(String aprOrganId, Short status);
 
-    void addOrUpdateAprOrgan(ChAprOrgan chAprOrgan);
+    void addOrUpdateAprOrgan(ChAprOrgan chAprOrgan, ChFndAttach accountInfo, ChFndAttach organBusinessLicense, ChFndAttach healthcareProviderAgreement, ChFndAttach otherFile);
 
     ChAprOrgan getAprOrganInfo(Long aprOrganId);
 
@@ -34,9 +37,13 @@ public interface AprOrganService {
 
     Page<AprEmpVO> aprEmpList(Page<AprEmpVO> page, Long organId, Boolean isIncluded, String organName, String realName, String tel, String certiCode, String isLock, String empType);
 
-    void addOrUpdateAprEmp(ChAprEmp chAprEmp);
+    void addOrUpdateAprEmp(List<ChFndAttach> fileDataList, ChAprEmp chAprEmp);
 
     List<ChCfgAprempType> cfgAprEmpType(String parAprempTypeId);
 
     List<ChFndEducation> fndEducation();
+
+    Result<List<AttachVo>> empFileList(Long empId);
+
+    Result<List<AttachVo>> aprOrganFileList(Long aprOrganId);
 }

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

@@ -2,9 +2,11 @@ package com.hungraim.ltc.governance.service.impl;
 
 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.api.OrganFeignService;
 import com.hungraim.ltc.governance.dao.*;
 import com.hungraim.ltc.governance.service.AprOrganService;
+import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
 import com.hungraim.ltc.pojo.entity.assessment.ChAprEmp;
 import com.hungraim.ltc.pojo.entity.assessment.ChCfgAprGroupDetail;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChAprOrgan;
@@ -13,12 +15,18 @@ 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.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.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -35,6 +43,7 @@ public class AprOrganServiceImpl implements AprOrganService {
     private final ChCfgAprGroupDetailMapper cfgAprGroupDetailMapper;
     private final CfgAprempMapper cfgAprempMapper;
     private final FndEducationMapper fndEducationMapper;
+    private AttachFeignService attachFeignService;
 
     @Override
     public Page<AprOrganVO> aprOrganList(Page<AprOrganVO> page, Long organId, Boolean isIncluded, String organName, String code) {
@@ -58,7 +67,7 @@ public class AprOrganServiceImpl implements AprOrganService {
     }
 
     @Override
-    public void addOrUpdateAprOrgan(ChAprOrgan chAprOrgan) {
+    public void addOrUpdateAprOrgan(ChAprOrgan chAprOrgan, ChFndAttach accountInfo, ChFndAttach organBusinessLicense, ChFndAttach healthcareProviderAgreement, ChFndAttach otherFile) {
         if (chAprOrgan.getAprOrganId() == null) {
             //新增
             chAprOrgan.setEffTime(new Date());
@@ -88,7 +97,16 @@ public class AprOrganServiceImpl implements AprOrganService {
             aprOrgan.setGroupDetailId(chAprOrgan.getGroupDetailId());
             aprOrgan.setLinkMail(chAprOrgan.getLinkMail());
             aprOrganMapper.updateById(aprOrgan);
+            chAprOrgan.setAprOrganId(aprOrgan.getAprOrganId());
         }
+        List<ChFndAttach> fileDataList = new ArrayList<>();
+        fileDataList.add(accountInfo);
+        fileDataList.add(organBusinessLicense);
+        fileDataList.add(healthcareProviderAgreement);
+        if (otherFile != null) {
+            fileDataList.add(otherFile);
+        }
+        updateAttachs(fileDataList, chAprOrgan.getAprOrganId(), AttachType.APR_ORGAN.getUploadType());
     }
 
     @Override
@@ -120,8 +138,9 @@ public class AprOrganServiceImpl implements AprOrganService {
         return aprOrganMapper.aprEmpList(page, organIds, organName, realName, tel, certiCode, isLock, empType);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
-    public void addOrUpdateAprEmp(ChAprEmp chAprEmp) {
+    public void addOrUpdateAprEmp(List<ChFndAttach> fileDataList, ChAprEmp chAprEmp) {
         if (chAprEmp.getEmpId() == null) {
             //新增
             chAprEmp.setEffTime(new Date());
@@ -134,7 +153,9 @@ public class AprOrganServiceImpl implements AprOrganService {
             aprEmp.setAprempTypeIdS(chAprEmp.getAprempTypeIdS());
             aprEmp.setEduId(chAprEmp.getEduId());
             aprEmpMapper.updateById(aprEmp);
+            chAprEmp.setEmpId(aprEmp.getEmpId());
         }
+        updateAttachs(fileDataList, chAprEmp.getEmpId().longValue(), AttachType.APR_EMP.getUploadType());
     }
 
     @Override
@@ -154,4 +175,48 @@ public class AprOrganServiceImpl implements AprOrganService {
     public List<ChFndEducation> fndEducation() {
         return fndEducationMapper.selectList(new QueryWrapper<>());
     }
+
+    @Override
+    public Result<List<AttachVo>> empFileList(Long empId) {
+        Result<List<AttachVo>> listResult = null;
+        try {
+            // 返回对应的附件列表
+            listResult = attachFeignService.selectAttachs(empId, AttachType.APR_EMP.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;
+    }
+
+    @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;
+    }
+
+    /**
+     * 调用feign api来修改附件数据
+     */
+    private void updateAttachs(List<ChFndAttach> fileDataList, Long ctrlId, Short attachType) {
+        // 新增附件修改逻辑
+        AttachUpdateVo attachUpdateVo = new AttachUpdateVo();
+        attachUpdateVo.setCtrlId(ctrlId);
+        attachUpdateVo.setAttachType(attachType);
+        attachUpdateVo.setChFndAttachs(fileDataList);
+        attachFeignService.updateAttachs(attachUpdateVo);
+    }
 }

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

@@ -80,7 +80,7 @@ public class SrvTaskServiceImpl implements SrvTaskService {
         try {
             for (SrvTaskInfoVO vo : srvTaskInfoList) {
                 // 返回对应的附件列表
-                Result<List<AttachVo>> listResult = attachFeignService.selectAttachs(Long.parseLong(programId), AttachType.AUDIT.getUploadType());
+                Result<List<AttachVo>> listResult = attachFeignService.selectAttachs(Long.parseLong(programId), AttachType.SRV_TASK.getUploadType());
                 if (!listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
                     log.info("请求获取附件列表错误：错误码{},错误信息:{}", listResult.getCode(), listResult.getMsg());
                 } else {
@@ -112,7 +112,7 @@ public class SrvTaskServiceImpl implements SrvTaskService {
         // 新增附件修改逻辑
         AttachUpdateVo attachUpdateVo = new AttachUpdateVo();
         attachUpdateVo.setCtrlId(ctrlId);
-        attachUpdateVo.setAttachType(AttachType.AUDIT.getUploadType());
+        attachUpdateVo.setAttachType(AttachType.SRV_TASK.getUploadType());
         attachUpdateVo.setChFndAttachs(fileDataList);
         attachFeignService.updateAttachs(attachUpdateVo);
     }