Skip to content

A
amos-boot-biz
Commit 99e7f983 authored by hcing's avatar hcing
Browse files
Options

设备认领bugfix

parent 92b7e2e8
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 6 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java
View file @ 99e7f983
...@@ -2312,7 +2312,7 @@ public class CommonServiceImpl implements ICommonService { ...@@ -2312,7 +2312,7 @@ public class CommonServiceImpl implements ICommonService {
result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0]*000$").matcher(category.getCode()).matches()).collect(Collectors.toList()); result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0]*000$").matcher(category.getCode()).matches()).collect(Collectors.toList());
break; break;
case "2": case "2":
result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0]*00$").matcher(category.getCode()).matches()).collect(Collectors.toList()); result = categoryList.stream().filter(category -> Pattern.compile("^[^\0]*00$").matcher(category.getCode()).matches()).collect(Collectors.toList());
break; break;
case "3": case "3":
result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0A-Za-z]*[A-Za-z0-9]*[^0]0$").matcher(category.getCode()).matches()).collect(Collectors.toList()); result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0A-Za-z]*[A-Za-z0-9]*[^0]0$").matcher(category.getCode()).matches()).collect(Collectors.toList());
...@@ -2342,7 +2342,7 @@ public class CommonServiceImpl implements ICommonService { ...@@ -2342,7 +2342,7 @@ public class CommonServiceImpl implements ICommonService {
result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0]*000$").matcher(category.getCode()).matches()).collect(Collectors.toList()); result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0]*000$").matcher(category.getCode()).matches()).collect(Collectors.toList());
break; break;
case "2": case "2":
result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0]*00$").matcher(category.getCode()).matches()).collect(Collectors.toList()); result = categoryList.stream().filter(category -> Pattern.compile("^[^\0]*00$").matcher(category.getCode()).matches()).collect(Collectors.toList());
break; break;
case "3": case "3":
result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0A-Za-z]*[A-Za-z0-9]*[^0]0$").matcher(category.getCode()).matches()).collect(Collectors.toList()); result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0A-Za-z]*[A-Za-z0-9]*[^0]0$").matcher(category.getCode()).matches()).collect(Collectors.toList());
...@@ -2360,7 +2360,7 @@ public class CommonServiceImpl implements ICommonService { ...@@ -2360,7 +2360,7 @@ public class CommonServiceImpl implements ICommonService {
result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0]*000$").matcher(category.getCode()).matches()).collect(Collectors.toList()); result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0]*000$").matcher(category.getCode()).matches()).collect(Collectors.toList());
break; break;
case "2": case "2":
result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0]*00$").matcher(category.getCode()).matches()).collect(Collectors.toList()); result = categoryList.stream().filter(category -> Pattern.compile("^[^\0]*00$").matcher(category.getCode()).matches()).collect(Collectors.toList());
break; break;
case "3": case "3":
result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0A-Za-z]*[A-Za-z0-9]*[^0]0$").matcher(category.getCode()).matches()).collect(Collectors.toList()); result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0A-Za-z]*[A-Za-z0-9]*[^0]0$").matcher(category.getCode()).matches()).collect(Collectors.toList());
...@@ -2378,7 +2378,7 @@ public class CommonServiceImpl implements ICommonService { ...@@ -2378,7 +2378,7 @@ public class CommonServiceImpl implements ICommonService {
result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0]*000$").matcher(category.getCode()).matches()).collect(Collectors.toList()); result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0]*000$").matcher(category.getCode()).matches()).collect(Collectors.toList());
break; break;
case "2": case "2":
result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0]*00$").matcher(category.getCode()).matches()).collect(Collectors.toList()); result = categoryList.stream().filter(category -> Pattern.compile("^[^\0]*00$").matcher(category.getCode()).matches()).collect(Collectors.toList());
break; break;
case "3": case "3":
result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0A-Za-z]*[A-Za-z0-9]*[^0]0$").matcher(category.getCode()).matches()).collect(Collectors.toList()); result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0A-Za-z]*[A-Za-z0-9]*[^0]0$").matcher(category.getCode()).matches()).collect(Collectors.toList());
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/EquipClaimServiceImpl.java
View file @ 99e7f983
...@@ -659,6 +659,7 @@ public class EquipClaimServiceImpl { ...@@ -659,6 +659,7 @@ public class EquipClaimServiceImpl {
*/ */
public void addEquipResume(JSONObject equipInfo, BusinessTypeEnum businessTypeEnum, JgUseRegistration useRegistration) { public void addEquipResume(JSONObject equipInfo, BusinessTypeEnum businessTypeEnum, JgUseRegistration useRegistration) {
String record = (String) equipInfo.get(RECORD); String record = (String) equipInfo.get(RECORD);
String routePath = useRegistrationService.buildTaskModel(useRegistration, equipInfo, getSelectedOrgInfo());
JgResumeInfoDto resumeInfoDto = JgResumeInfoDto.builder() JgResumeInfoDto resumeInfoDto = JgResumeInfoDto.builder()
.applyNo(null) .applyNo(null)
.businessType(businessTypeEnum.getName()) .businessType(businessTypeEnum.getName())
...@@ -668,7 +669,7 @@ public class EquipClaimServiceImpl { ...@@ -668,7 +669,7 @@ public class EquipClaimServiceImpl {
.approvalUnitCode(useRegistration.getReceiveOrgName()) .approvalUnitCode(useRegistration.getReceiveOrgName())
.status("正常") .status("正常")
.changeContent(businessTypeEnum.getName() + "业务") .changeContent(businessTypeEnum.getName() + "业务")
.routePath(null) .routePath(routePath)
.build(); .build();
JgResumeInfo resumeInfo = new JgResumeInfo(); JgResumeInfo resumeInfo = new JgResumeInfo();
BeanUtils.copyProperties(resumeInfoDto, resumeInfo); BeanUtils.copyProperties(resumeInfoDto, resumeInfo);
...@@ -681,8 +682,14 @@ public class EquipClaimServiceImpl { ...@@ -681,8 +682,14 @@ public class EquipClaimServiceImpl {
public void checkParams(LinkedHashMap equipInfo) { public void checkParams(LinkedHashMap equipInfo) {
String dataSource = (String) equipInfo.get(DATA_SOURCE); String dataSource = (String) equipInfo.get(DATA_SOURCE);
String record = (String) equipInfo.get(RECORD); String record = (String) equipInfo.get(RECORD);
String useRegistrationCode = Optional.ofNullable(equipInfo.get("useRegistrationCode"))
.map(String::valueOf)
.map(String::trim)
.orElse(null);
// 使用登记证校验 // 使用登记证校验
jgRegisterInfoService.checkUseRegistrationCode(equipInfo); if (!ObjectUtils.isEmpty(useRegistrationCode)) {
jgRegisterInfoService.checkUseRegistrationCode(equipInfo);
}
// 设备代码 字段的唯一性校验 // 设备代码 字段的唯一性校验
jgRegisterInfoService.checkEquCodeUniqueness(equipInfo); jgRegisterInfoService.checkEquCodeUniqueness(equipInfo);
// 车用气瓶业务里面的 产品编号 校验唯一性（产品编号在车用气瓶范围内全局唯一） // 车用气瓶业务里面的 产品编号 校验唯一性（产品编号在车用气瓶范围内全局唯一）
...@@ -720,6 +727,10 @@ public class EquipClaimServiceImpl { ...@@ -720,6 +727,10 @@ public class EquipClaimServiceImpl {
useInfo.setUseUnitCreditCode(company.getCompanyCode()); useInfo.setUseUnitCreditCode(company.getCompanyCode());
useInfo.setUseUnitName(company.getCompanyName()); useInfo.setUseUnitName(company.getCompanyName());
useInfo.setSequenceNbr(Objects.toString(equipInfo.get("USEINFO_SEQ"))); useInfo.setSequenceNbr(Objects.toString(equipInfo.get("USEINFO_SEQ")));
if (ObjectUtils.isEmpty(useInfo.getEquState()) && isIntoManagement) {
// 有证纳管状态 没填写 给默认值
useInfo.setEquState(EquimentEnum.ZAIYONG.getCode().toString());
}
idxBizJgUseInfoService.saveOrUpdateData(useInfo); idxBizJgUseInfoService.saveOrUpdateData(useInfo);
// 设计信息 // 设计信息
IdxBizJgDesignInfo designInfo = JSON.parseObject(toJSONString(equipInfo), IdxBizJgDesignInfo.class); IdxBizJgDesignInfo designInfo = JSON.parseObject(toJSONString(equipInfo), IdxBizJgDesignInfo.class);
......
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