Commit f1f1879b authored by hcing's avatar hcing

fix(jg):台套认领bugfix

parent 34989655
......@@ -467,19 +467,19 @@ public class EquipClaimServiceImpl {
LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, record);
IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
String equCode = Objects.toString(equipInfo.get("equCode"), null);
String equCode = Objects.toString(equipInfo.get("EQU_CODE"), null);
if (registerInfo != null) {
registerInfo.setUseOrgCode(jgUseRegistration.getUseRegistrationCode());
registerInfo.setEquCodeType(Objects.toString(equipInfo.get("equCodeType"), null));
registerInfo.setEquCodeType(Objects.toString(equipInfo.get("EQU_CODE_TYPE"), null));
// 新提交或暂存后提交需生成设备代码
equCode = ObjectUtils.isEmpty(equipInfo.get("equCode")) && !StringUtils.isEmpty(jgUseRegistration.getReceiveCompanyCode())
? useRegistrationService.getEquCode(registerInfo, jgUseRegistration.getReceiveCompanyCode())
: Objects.toString(equipInfo.get("equCode"), null);
if (ObjectUtils.isEmpty(equCode) && !StringUtils.isEmpty(jgUseRegistration.getReceiveCompanyCode())) {
equCode = useRegistrationService.getEquCode(registerInfo, jgUseRegistration.getReceiveCompanyCode());
}
registerInfo.setEquCode(equCode);// 设备代码
registerInfo.setEquPrice(Objects.toString(equipInfo.get("equPrice"), null));
registerInfo.setEquPrice(Objects.toString(equipInfo.get("EQU_PRICE"), null));
registerInfo.setInstallationIsComplete(equipInfo.getOrDefault("installationIsComplete", "1").toString());
if (EquipmentClassifityEnum.CC.getCode().equals(equipInfo.get("EQU_LIST_CODE"))) {
registerInfo.setCarNumber((String) equipInfo.get("carNumber"));
if (EquipmentClassifityEnum.CC.getCode().equals(equipInfo.get(EQU_LIST))) {
registerInfo.setCarNumber((String) equipInfo.get("CAR_NUMBER"));
}
idxBizJgRegisterInfoMapper.updateById(registerInfo);
}
......
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