yangjun
/
hldy_java_monomer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

机构加盟、信息变更流程代码判断逻辑调整

This commit is contained in:
1378012178@qq.com 2026-02-11 17:28:31 +08:00
parent ea4e4401d1
commit 7aacf62c13
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfoApiEntity.java
View File

@ -356,5 +356,9 @@ public class OrgAllInfoApiEntity implements Serializable {
*/
private java.lang.String handleBy;
/**
* 是否跳过重复校验
*/
private String izSkipRepetVali;
}

19
nursing-unit-api/src/main/java/com/nu/modules/wechat/orgapplyinfo/api/OrgApplyInfoApi.java
View File

@ -36,13 +36,13 @@ public class OrgApplyInfoApi {
}
//验证入驻申请信息是否有变更
if ("1".equals(orgApplyInfoApiEntity.getStatus()) && StringUtils.isNotBlank(orgApplyInfoApiEntity.getPkId())) {
if (!"Y".equals(orgApplyInfoApiEntity.getIzSkipRepetVali()) && "1".equals(orgApplyInfoApiEntity.getStatus()) && StringUtils.isNotBlank(orgApplyInfoApiEntity.getPkId())) {
if (!orgApplyInfoApi.validateApplyChanged(orgApplyInfoApiEntity)) {
return Result.error("未做变更");
}
}
//验证机构变更信息是否有变更
if ("4".equals(orgApplyInfoApiEntity.getStatus())) {
if (!"Y".equals(orgApplyInfoApiEntity.getIzSkipRepetVali()) && "4".equals(orgApplyInfoApiEntity.getStatus())) {
if (!orgApplyInfoApi.validateUpInfoChanged(orgApplyInfoApiEntity)) {
return Result.error("未做变更");
}
@ -53,17 +53,12 @@ public class OrgApplyInfoApi {
}
System.out.println("-----------新增/编辑机构加盟申请信息--------tel------------" + orgApplyInfoApiEntity.getTel());
if (StringUtils.isNotBlank(orgApplyInfoApiEntity.getId()) && !"rz".equals(orgApplyInfoApiEntity.getOptType())) {
orgApplyInfoApi.updateById(orgApplyInfoApiEntity);
return Result.ok("保存成功！");
//入驻申请
if ("1".equals(orgApplyInfoApiEntity.getStatus())) {
return Result.ok(orgApplyInfoApi.insertApply(orgApplyInfoApiEntity));
} else {
//入驻申请
if ("1".equals(orgApplyInfoApiEntity.getStatus())) {
return Result.ok(orgApplyInfoApi.insertApply(orgApplyInfoApiEntity));
} else {
//变更申请
return Result.ok(orgApplyInfoApi.insertUpInfo(orgApplyInfoApiEntity));
}
//变更申请
return Result.ok(orgApplyInfoApi.insertUpInfo(orgApplyInfoApiEntity));
}
}