Skip to content

A
amos-boot-biz
Commit d0500ecc authored by 刘林's avatar 刘林
Browse files
Options

fix(jg):历史有证暂存功能修改

parent e74f272c
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 19 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/DataDockServiceImpl.java
View file @ d0500ecc
......@@ -1845,20 +1845,20 @@ public class DataDockServiceImpl {
AgencyUserModel userModel = reginParams.getUserModel();
CompanyBo company = reginParams.getCompany();
String orgBranchCode = equipInfo.getString("orgBranchCode");
String equListCode = String.valueOf(equipInfo.get("EQU_LIST"));
String equCategoryCode = String.valueOf(equipInfo.get("EQU_CATEGORY"));
String equDefineCode = String.valueOf(equipInfo.get("EQU_DEFINE"));
String equListCode = Objects.toString(equipInfo.get("EQU_LIST"), null);
String equCategoryCode = Objects.toString(equipInfo.get("EQU_CATEGORY"), null);
String equDefineCode = Objects.toString(equipInfo.get("EQU_DEFINE"), null);
String receiveOrgCode = Optional.ofNullable(equipInfo.get("RECEIVE_ORG_CODE")).map(String::valueOf).orElse(null);
String inspectUnitCreditCode = Optional.ofNullable(equLists.get(0).getInspectOrgCode()).orElse("");
String inspectUnitName = Optional.ofNullable(equLists.get(0).getInspectOrgName()).orElse("");
String inspectUnitCreditCode = Optional.ofNullable(equLists.get(0).getInspectOrgCode()).orElse(null);
String inspectUnitName = Optional.ofNullable(equLists.get(0).getInspectOrgName()).orElse(null);
String useOrgCode = Optional.ofNullable(equipInfo.get("USE_ORG_CODE")).map(String::valueOf).orElse(null);
String province = String.valueOf(equipInfo.get("province"));
String city = String.valueOf(equipInfo.get("city"));
String county = String.valueOf(equipInfo.get("county"));
String street = String.valueOf(equipInfo.get("street"));
String address = String.valueOf(equipInfo.get("address"));
String usePlace = String.valueOf(equipInfo.get("usePlace"));
String useDate = String.valueOf(equipInfo.get("useDate"));
String province = Objects.toString(equipInfo.get("province"), null);
String city = Objects.toString(equipInfo.get("city"), null);
String county = Objects.toString(equipInfo.get("county"), null);
String street = Objects.toString(equipInfo.get("street"), null);
String address = Objects.toString(equipInfo.get("address"), null);
String usePlace = Objects.toString(equipInfo.get("usePlace"), null);
String useDate = Objects.toString(equipInfo.get("useDate"), null);
return new EquipRequestParamsDto().setCompanyCode(company.getCompanyCode().split("_")[0])
.setProvince(province)
.setProvinceName("陕西省")
......@@ -1884,7 +1884,7 @@ public class DataDockServiceImpl {
.setOrgBranchCode(orgBranchCode.split("_").length > 1 ? orgBranchCode.split("_")[0] : "")
.setOrgBranchName(orgBranchCode.split("_").length > 1 ? orgBranchCode.split("_")[1] : "")
.setUseOrgCode(useOrgCode)
.setVehicleApanage(String.valueOf(equipInfo.get("VEHICLE_APANAGE")))
.setVehicleApanage(Objects.toString(equipInfo.get("VEHICLE_APANAGE"),""))
.setReceiveOrgCode(Optional.ofNullable(receiveOrgCode)
.map(code -> code.split("_"))
.filter(parts -> parts.length > 0)
......@@ -1895,8 +1895,8 @@ public class DataDockServiceImpl {
.filter(parts -> parts.length > 1)
.map(parts -> parts[1])
.orElse(null))
.setProjectContraption(String.valueOf(equipInfo.get("PROJECT_CONTRAPTION")))
.setProjectContraptionNo(String.valueOf(equipInfo.get("PROJECT_CONTRAPTION_NO")))
.setProjectContraption(Objects.toString(equipInfo.get("PROJECT_CONTRAPTION"),null))
.setProjectContraptionNo(Objects.toString(equipInfo.get("PROJECT_CONTRAPTION_NO"),null))
.setProductPhoto(toJSONString(equipInfo.get("PRODUCT_PHOTO")))
.setProductQualificationCertificate(toJSONString(equipInfo.get("PRODUCT_QUALIFICATION_CERTIFICATE")))
.setOtherAccessories(ValidationUtil.isEmpty(equipInfo.get("OTHER_ACCESSORIES")) ? null : toJSONString(equipInfo.get("OTHER_ACCESSORIES")))
......
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/JgUseRegistrationServiceImpl.java
View file @ d0500ecc
......@@ -4168,13 +4168,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, equipId);
IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
String equCode = "";
String equCode = Objects.toString(map.get("equCode"),null);
if (registerInfo != null) {
registerInfo.setUseOrgCode(jgUseRegistration.getUseRegistrationCode());
registerInfo.setEquCodeType(String.valueOf(map.get("equCodeType")));
equCode = ObjectUtils.isEmpty(map.get("equCode")) && !StringUtils.isEmpty(jgUseRegistration.getReceiveCompanyCode())
? this.getEquCode(registerInfo, jgUseRegistration.getReceiveCompanyCode())
: String.valueOf(map.get("equCode"));
if(submitType.equals("tempSubmit")){
equCode = ObjectUtils.isEmpty(map.get("equCode")) && !StringUtils.isEmpty(jgUseRegistration.getReceiveCompanyCode())
? this.getEquCode(registerInfo, jgUseRegistration.getReceiveCompanyCode())
: String.valueOf(map.get("equCode"));
}
registerInfo.setEquCode(equCode);// 设备代码
registerInfo.setEquPrice(String.valueOf(map.get("equPrice")));
registerInfo.setProductPhoto(JSONObject.toJSONString(map.get("productPhoto")));
......
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