新增评定机构或更新评定机构信息修改传参方式

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

@@ -5,7 +5,6 @@ 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;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprOrganType;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprempType;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChFndEducation;
@@ -84,19 +83,14 @@ public class AprOrganController {
 
     /**
      * 新增评定机构或更新评定机构信息(有apr_organ_id就更新,没有就新增)
-     *
-     * @param accountInfo                 账号信息附件
-     * @param organBusinessLicense        机构营业执照附件
-     * @param healthcareProviderAgreement 定点医护机构协议附件
-     * @param otherFile                   其他附件
      */
     @PostMapping("/addOrUpdateAprOrgan")
-    public Result addOrUpdateAprOrgan(ChAprOrgan chAprOrgan, ChFndAttach accountInfo, ChFndAttach organBusinessLicense, ChFndAttach healthcareProviderAgreement, ChFndAttach otherFile) {
+    public Result addOrUpdateAprOrgan(AprOrganInfoVO chAprOrgan) {
         if (chAprOrgan == null) {
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
-        if (accountInfo == null || organBusinessLicense == null || healthcareProviderAgreement == null) {
-
+        if (chAprOrgan.getFileDataList().size() < 3) {
+            return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
         if (chAprOrgan.getAprOrganId() == null) {
             //新增
@@ -181,7 +175,7 @@ public class AprOrganController {
                 return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
             }
         }
-        aprOrganService.addOrUpdateAprOrgan(chAprOrgan, accountInfo, organBusinessLicense, healthcareProviderAgreement, otherFile);
+        aprOrganService.addOrUpdateAprOrgan(chAprOrgan);
         return Result.success();
     }
 

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

@@ -4,7 +4,6 @@ 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;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprOrganType;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgAprempType;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChFndEducation;
@@ -27,7 +26,7 @@ public interface AprOrganService {
 
     void updateAprOrganStatus(String aprOrganId, Short status);
 
-    void addOrUpdateAprOrgan(ChAprOrgan chAprOrgan, ChFndAttach accountInfo, ChFndAttach organBusinessLicense, ChFndAttach healthcareProviderAgreement, ChFndAttach otherFile);
+    void addOrUpdateAprOrgan(AprOrganInfoVO chAprOrgan);
 
     AprOrganInfoVO getAprOrganInfo(Long aprOrganId);
 

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

@@ -27,7 +27,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -68,7 +67,7 @@ public class AprOrganServiceImpl implements AprOrganService {
     }
 
     @Override
-    public void addOrUpdateAprOrgan(ChAprOrgan chAprOrgan, ChFndAttach accountInfo, ChFndAttach organBusinessLicense, ChFndAttach healthcareProviderAgreement, ChFndAttach otherFile) {
+    public void addOrUpdateAprOrgan(AprOrganInfoVO chAprOrgan) {
         if (chAprOrgan.getAprOrganId() == null) {
             //新增
             chAprOrgan.setEffTime(new Date());
@@ -100,14 +99,7 @@ public class AprOrganServiceImpl implements AprOrganService {
             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());
+        updateAttachs(chAprOrgan.getFileDataList(), chAprOrgan.getAprOrganId(), AttachType.APR_ORGAN.getUploadType());
     }
 
     @Override