新增评定机构或更新评定机构信息

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

@@ -74,11 +74,9 @@ public class AprOrganController {
 
     /**
      * 新增评定机构或更新评定机构信息(有apr_organ_id就更新,没有就新增)
-     *
-     * @param updateType 更新类型(1:账户信息修改,2:基本信息修改),新增不传
      */
     @DeleteMapping("/updateAprOrganStatus")
-    public Result addOrUpdateAprOrgan(ChAprOrgan chAprOrgan, Short updateType) {
+    public Result addOrUpdateAprOrgan(ChAprOrgan chAprOrgan) {
         if (chAprOrgan == null) {
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
@@ -128,10 +126,6 @@ public class AprOrganController {
             }
         } else {
             //更新
-            if (updateType != 1 && updateType != 2) {
-                return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
-            }
-            if (updateType == 1) {//账户信息修改
             if (StringUtils.isBlank(chAprOrgan.getAccName())) {//银行账户名称
                 return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
             }
@@ -147,7 +141,6 @@ public class AprOrganController {
             if (chAprOrgan.getCardType() == null) {//卡类型
                 return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
             }
-            } else {//基本信息修改
             if (StringUtils.isBlank(chAprOrgan.getDistrictProvincial()) || StringUtils.isBlank(chAprOrgan.getDistrictArea()) || StringUtils.isBlank(chAprOrgan.getDistrictCity())) {//所在省市区
                 return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
             }
@@ -170,8 +163,7 @@ public class AprOrganController {
                 return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
             }
         }
-        }
-        aprOrganService.addOrUpdateAprOrgan(chAprOrgan, updateType);
+        aprOrganService.addOrUpdateAprOrgan(chAprOrgan);
         return Result.success();
     }
 

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

@@ -16,7 +16,7 @@ public interface AprOrganService {
 
     void updateAprOrganStatus(String aprOrganId, Short status);
 
-    void addOrUpdateAprOrgan(ChAprOrgan chAprOrgan, Short updateType);
+    void addOrUpdateAprOrgan(ChAprOrgan chAprOrgan);
 
     ChAprOrgan getAprOrganInfo(Long aprOrganId);
 }

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

@@ -45,7 +45,7 @@ public class AprOrganServiceImpl implements AprOrganService {
     }
 
     @Override
-    public void addOrUpdateAprOrgan(ChAprOrgan chAprOrgan, Short updateType) {
+    public void addOrUpdateAprOrgan(ChAprOrgan chAprOrgan) {
         if (chAprOrgan.getAprOrganId() == null) {
             //新增
             chAprOrgan.setEffTime(new Date());
@@ -54,7 +54,6 @@ public class AprOrganServiceImpl implements AprOrganService {
         } else {
             //更新
             ChAprOrgan aprOrgan = aprOrganMapper.selectById(chAprOrgan.getAprOrganId());
-            if (updateType == 1) {//账户信息修改
             aprOrgan.setAccName(chAprOrgan.getAccName());
             aprOrgan.setBankAccName(chAprOrgan.getBankAccName());
             aprOrgan.setBankNo(chAprOrgan.getBankNo());
@@ -63,8 +62,6 @@ public class AprOrganServiceImpl implements AprOrganService {
             aprOrgan.setBankDistrictWebsite(chAprOrgan.getBankDistrictWebsite());
             aprOrgan.setCardType(chAprOrgan.getCardType());
             aprOrgan.setRemark(chAprOrgan.getRemark());
-                aprOrganMapper.updateById(aprOrgan);
-            } else {//基本信息修改
             aprOrgan.setDistrictProvincial(chAprOrgan.getDistrictProvincial());
             aprOrgan.setDistrictCity(chAprOrgan.getDistrictCity());
             aprOrgan.setDistrictArea(chAprOrgan.getDistrictArea());
@@ -80,7 +77,6 @@ public class AprOrganServiceImpl implements AprOrganService {
             aprOrganMapper.updateById(aprOrgan);
         }
     }
-    }
 
     @Override
     public ChAprOrgan getAprOrganInfo(Long aprOrganId) {