Commit f8cb8508 authored by 蔡镇泽's avatar 蔡镇泽

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

parent 119679b2
...@@ -74,11 +74,9 @@ public class AprOrganController { ...@@ -74,11 +74,9 @@ public class AprOrganController {
/** /**
* 新增评定机构或更新评定机构信息(有apr_organ_id就更新,没有就新增) * 新增评定机构或更新评定机构信息(有apr_organ_id就更新,没有就新增)
*
* @param updateType 更新类型(1:账户信息修改,2:基本信息修改),新增不传
*/ */
@DeleteMapping("/updateAprOrganStatus") @DeleteMapping("/updateAprOrganStatus")
public Result addOrUpdateAprOrgan(ChAprOrgan chAprOrgan, Short updateType) { public Result addOrUpdateAprOrgan(ChAprOrgan chAprOrgan) {
if (chAprOrgan == null) { if (chAprOrgan == null) {
return Result.failed(ResultCode.REQUEST_PARAM_ERROR); return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
} }
...@@ -128,50 +126,44 @@ public class AprOrganController { ...@@ -128,50 +126,44 @@ public class AprOrganController {
} }
} else { } else {
//更新 //更新
if (updateType != 1 && updateType != 2) { if (StringUtils.isBlank(chAprOrgan.getAccName())) {//银行账户名称
return Result.failed(ResultCode.REQUEST_PARAM_ERROR); return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
} }
if (updateType == 1) {//账户信息修改 if (StringUtils.isBlank(chAprOrgan.getBankNo())) {//银行账号
if (StringUtils.isBlank(chAprOrgan.getAccName())) {//银行账户名称 return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
return Result.failed(ResultCode.REQUEST_PARAM_ERROR); }
} if (StringUtils.isBlank(chAprOrgan.getBankDistrictProvincial()) || StringUtils.isBlank(chAprOrgan.getBankDistrictCity())) {//账号所属省市
if (StringUtils.isBlank(chAprOrgan.getBankNo())) {//银行账号 return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
return Result.failed(ResultCode.REQUEST_PARAM_ERROR); }
} if (StringUtils.isBlank(chAprOrgan.getBankDistrictWebsite())) {//账号所属网点
if (StringUtils.isBlank(chAprOrgan.getBankDistrictProvincial()) || StringUtils.isBlank(chAprOrgan.getBankDistrictCity())) {//账号所属省市 return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
return Result.failed(ResultCode.REQUEST_PARAM_ERROR); }
} if (chAprOrgan.getCardType() == null) {//卡类型
if (StringUtils.isBlank(chAprOrgan.getBankDistrictWebsite())) {//账号所属网点 return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
return Result.failed(ResultCode.REQUEST_PARAM_ERROR); }
} if (StringUtils.isBlank(chAprOrgan.getDistrictProvincial()) || StringUtils.isBlank(chAprOrgan.getDistrictArea()) || StringUtils.isBlank(chAprOrgan.getDistrictCity())) {//所在省市区
if (chAprOrgan.getCardType() == null) {//卡类型 return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
return Result.failed(ResultCode.REQUEST_PARAM_ERROR); }
} if (StringUtils.isBlank(chAprOrgan.getUnifiedSocialCreditCode())) {//统一社会信用代码
} else {//基本信息修改 return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
if (StringUtils.isBlank(chAprOrgan.getDistrictProvincial()) || StringUtils.isBlank(chAprOrgan.getDistrictArea()) || StringUtils.isBlank(chAprOrgan.getDistrictCity())) {//所在省市区 }
return Result.failed(ResultCode.REQUEST_PARAM_ERROR); if (chAprOrgan.getOrganTypeId() == null) {//机构类型id
} return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
if (StringUtils.isBlank(chAprOrgan.getUnifiedSocialCreditCode())) {//统一社会信用代码 }
return Result.failed(ResultCode.REQUEST_PARAM_ERROR); if (StringUtils.isBlank(chAprOrgan.getAcptArea()) || StringUtils.isBlank(chAprOrgan.getAcptAddress()) || StringUtils.isBlank(chAprOrgan.getAcptStreet())) {//机构详细地址
} return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
if (chAprOrgan.getOrganTypeId() == null) {//机构类型id }
return Result.failed(ResultCode.REQUEST_PARAM_ERROR); if (StringUtils.isBlank(chAprOrgan.getLinkName())) {//机构联系人姓名
} return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
if (StringUtils.isBlank(chAprOrgan.getAcptArea()) || StringUtils.isBlank(chAprOrgan.getAcptAddress()) || StringUtils.isBlank(chAprOrgan.getAcptStreet())) {//机构详细地址 }
return Result.failed(ResultCode.REQUEST_PARAM_ERROR); if (StringUtils.isBlank(chAprOrgan.getLinkTel())) {//机构联系人手机号
} return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
if (StringUtils.isBlank(chAprOrgan.getLinkName())) {//机构联系人姓名 }
return Result.failed(ResultCode.REQUEST_PARAM_ERROR); if (chAprOrgan.getGroupDetailId() == null) {//评定起点地址
} return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
if (StringUtils.isBlank(chAprOrgan.getLinkTel())) {//机构联系人手机号
return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
}
if (chAprOrgan.getGroupDetailId() == null) {//评定起点地址
return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
}
} }
} }
aprOrganService.addOrUpdateAprOrgan(chAprOrgan, updateType); aprOrganService.addOrUpdateAprOrgan(chAprOrgan);
return Result.success(); return Result.success();
} }
......
...@@ -16,7 +16,7 @@ public interface AprOrganService { ...@@ -16,7 +16,7 @@ public interface AprOrganService {
void updateAprOrganStatus(String aprOrganId, Short status); void updateAprOrganStatus(String aprOrganId, Short status);
void addOrUpdateAprOrgan(ChAprOrgan chAprOrgan, Short updateType); void addOrUpdateAprOrgan(ChAprOrgan chAprOrgan);
ChAprOrgan getAprOrganInfo(Long aprOrganId); ChAprOrgan getAprOrganInfo(Long aprOrganId);
} }
...@@ -45,7 +45,7 @@ public class AprOrganServiceImpl implements AprOrganService { ...@@ -45,7 +45,7 @@ public class AprOrganServiceImpl implements AprOrganService {
} }
@Override @Override
public void addOrUpdateAprOrgan(ChAprOrgan chAprOrgan, Short updateType) { public void addOrUpdateAprOrgan(ChAprOrgan chAprOrgan) {
if (chAprOrgan.getAprOrganId() == null) { if (chAprOrgan.getAprOrganId() == null) {
//新增 //新增
chAprOrgan.setEffTime(new Date()); chAprOrgan.setEffTime(new Date());
...@@ -54,31 +54,27 @@ public class AprOrganServiceImpl implements AprOrganService { ...@@ -54,31 +54,27 @@ public class AprOrganServiceImpl implements AprOrganService {
} else { } else {
//更新 //更新
ChAprOrgan aprOrgan = aprOrganMapper.selectById(chAprOrgan.getAprOrganId()); ChAprOrgan aprOrgan = aprOrganMapper.selectById(chAprOrgan.getAprOrganId());
if (updateType == 1) {//账户信息修改 aprOrgan.setAccName(chAprOrgan.getAccName());
aprOrgan.setAccName(chAprOrgan.getAccName()); aprOrgan.setBankAccName(chAprOrgan.getBankAccName());
aprOrgan.setBankAccName(chAprOrgan.getBankAccName()); aprOrgan.setBankNo(chAprOrgan.getBankNo());
aprOrgan.setBankNo(chAprOrgan.getBankNo()); aprOrgan.setBankDistrictProvincial(chAprOrgan.getBankDistrictProvincial());
aprOrgan.setBankDistrictProvincial(chAprOrgan.getBankDistrictProvincial()); aprOrgan.setBankDistrictCity(chAprOrgan.getBankDistrictCity());
aprOrgan.setBankDistrictCity(chAprOrgan.getBankDistrictCity()); aprOrgan.setBankDistrictWebsite(chAprOrgan.getBankDistrictWebsite());
aprOrgan.setBankDistrictWebsite(chAprOrgan.getBankDistrictWebsite()); aprOrgan.setCardType(chAprOrgan.getCardType());
aprOrgan.setCardType(chAprOrgan.getCardType()); aprOrgan.setRemark(chAprOrgan.getRemark());
aprOrgan.setRemark(chAprOrgan.getRemark()); aprOrgan.setDistrictProvincial(chAprOrgan.getDistrictProvincial());
aprOrganMapper.updateById(aprOrgan); aprOrgan.setDistrictCity(chAprOrgan.getDistrictCity());
} else {//基本信息修改 aprOrgan.setDistrictArea(chAprOrgan.getDistrictArea());
aprOrgan.setDistrictProvincial(chAprOrgan.getDistrictProvincial()); aprOrgan.setUnifiedSocialCreditCode(chAprOrgan.getUnifiedSocialCreditCode());
aprOrgan.setDistrictCity(chAprOrgan.getDistrictCity()); aprOrgan.setOrganTypeId(chAprOrgan.getOrganTypeId());
aprOrgan.setDistrictArea(chAprOrgan.getDistrictArea()); aprOrgan.setAcptArea(chAprOrgan.getAcptArea());
aprOrgan.setUnifiedSocialCreditCode(chAprOrgan.getUnifiedSocialCreditCode()); aprOrgan.setAcptAddress(chAprOrgan.getAcptAddress());
aprOrgan.setOrganTypeId(chAprOrgan.getOrganTypeId()); aprOrgan.setAcptStreet(chAprOrgan.getAcptStreet());
aprOrgan.setAcptArea(chAprOrgan.getAcptArea()); aprOrgan.setLinkName(chAprOrgan.getLinkName());
aprOrgan.setAcptAddress(chAprOrgan.getAcptAddress()); aprOrgan.setLinkTel(chAprOrgan.getLinkTel());
aprOrgan.setAcptStreet(chAprOrgan.getAcptStreet()); aprOrgan.setGroupDetailId(chAprOrgan.getGroupDetailId());
aprOrgan.setLinkName(chAprOrgan.getLinkName()); aprOrgan.setLinkMail(chAprOrgan.getLinkMail());
aprOrgan.setLinkTel(chAprOrgan.getLinkTel()); aprOrganMapper.updateById(aprOrgan);
aprOrgan.setGroupDetailId(chAprOrgan.getGroupDetailId());
aprOrgan.setLinkMail(chAprOrgan.getLinkMail());
aprOrganMapper.updateById(aprOrgan);
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment