Skip to content

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

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

parent f9bc41a9
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 70 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 @ e74f272c
......@@ -1606,32 +1606,32 @@ public class DataDockServiceImpl {
try {
log.info("解析第{}行数据：{}", rowIndex, JSON.toJSONString(data));
checkNotBlank(data.getPipeName(), "管道名称不能为空；", rowError);
checkNotBlank(data.getDesignUnitCreditCode(), "设计单位统一社会信用代码不能为空；", rowError);
checkNotBlank(data.getDesignUnitName(), "设计单位名称不能为空；", rowError);
checkNotBlank(data.getInspectOrgCode(), "检验检测机构统一社会信用代码不能为空；", rowError);
checkNotBlank(data.getInspectOrgName(), "检验检测机构名称不能为空；", rowError);
checkNotBlank(data.getInspectConclusion(), "检验结论不能为空；", rowError);
checkNotBlank(data.getInspectType(), "检验类型不能为空；", rowError);
checkNotBlank(data.getInspectDate(), "检验日期不能为空；", rowError);
Optional.ofNullable(data.getInspectDate()).ifPresent(v -> checkDateFormatCorrect(v, "检验日期格式不正确；", rowError));
checkNotBlank(data.getInspectStaff(), "检验人员名称不能为空；", rowError);
checkNotBlank(data.getNextInspectDate(), "下次检验日期不能为空；", rowError);
Optional.ofNullable(data.getNextInspectDate()).ifPresent(v -> checkDateFormatCorrect(v, "下次检验日期格式不正确；", rowError));
checkNotBlank(data.getInspectReportNo(), "检验报告编号不能为空；", rowError);
checkNotBlank(data.getUscUnitCreditCode(), "安装单位统一社会信用代码不能为空；", rowError);
checkNotBlank(data.getUscUnitName(), "安装单位名称不能为空；", rowError);
checkNotBlank(data.getUscDate(), "安装年月不能为空", rowError);
//checkNotBlank(data.getDesignUnitCreditCode(), "设计单位统一社会信用代码不能为空；", rowError);
//checkNotBlank(data.getDesignUnitName(), "设计单位名称不能为空；", rowError);
//checkNotBlank(data.getInspectOrgCode(), "检验检测机构统一社会信用代码不能为空；", rowError);
//checkNotBlank(data.getInspectOrgName(), "检验检测机构名称不能为空；", rowError);
//checkNotBlank(data.getInspectConclusion(), "检验结论不能为空；", rowError);
//checkNotBlank(data.getInspectType(), "检验类型不能为空；", rowError);
//checkNotBlank(data.getInspectDate(), "检验日期不能为空；", rowError);
//Optional.ofNullable(data.getInspectDate()).ifPresent(v -> checkDateFormatCorrect(v, "检验日期格式不正确；", rowError));
//checkNotBlank(data.getInspectStaff(), "检验人员名称不能为空；", rowError);
//checkNotBlank(data.getNextInspectDate(), "下次检验日期不能为空；", rowError);
//Optional.ofNullable(data.getNextInspectDate()).ifPresent(v -> checkDateFormatCorrect(v, "下次检验日期格式不正确；", rowError));
//checkNotBlank(data.getInspectReportNo(), "检验报告编号不能为空；", rowError);
//checkNotBlank(data.getUscUnitCreditCode(), "安装单位统一社会信用代码不能为空；", rowError);
//checkNotBlank(data.getUscUnitName(), "安装单位名称不能为空；", rowError);
//checkNotBlank(data.getUscDate(), "安装年月不能为空", rowError);
// 技术参数
checkNotBlank(data.getWallThickness(), "公称壁厚不能为空；", rowError);
Optional.ofNullable(data.getWallThickness()).ifPresent(item -> checkPipeSpecifications(item, "公称壁厚请输入数字或者/分割的范围，如2/6；", rowError));
checkNotBlank(data.getNominalDiameter(), "公称直径不能为空；", rowError);
Optional.ofNullable(data.getNominalDiameter()).ifPresent(item -> checkPipeSpecifications(item, "公称直径请输入数字或者/分割的范围，如2/6；", rowError));
checkNotBlank(data.getPipeLength(), "管道长度不能为空；", rowError);
Optional.ofNullable(data.getPipeLength()).ifPresent(item -> checkDateFormatNumber(item, "管道长度必须为数字", rowError));
checkNotBlank(data.getPressure(), "设计-压力不能为空；", rowError);
checkNotBlank(data.getMedium(), "设计-介质不能为空；", rowError);
checkNotBlank(data.getTemperature(), "设计-温度不能为空；", rowError);
checkNotBlank(data.getPipelineNumber(), "管道编号不能为空；", rowError);
//checkNotBlank(data.getWallThickness(), "公称壁厚不能为空；", rowError);
//Optional.ofNullable(data.getWallThickness()).ifPresent(item -> checkPipeSpecifications(item, "公称壁厚请输入数字或者/分割的范围，如2/6；", rowError));
//checkNotBlank(data.getNominalDiameter(), "公称直径不能为空；", rowError);
//Optional.ofNullable(data.getNominalDiameter()).ifPresent(item -> checkPipeSpecifications(item, "公称直径请输入数字或者/分割的范围，如2/6；", rowError));
//checkNotBlank(data.getPipeLength(), "管道长度不能为空；", rowError);
//Optional.ofNullable(data.getPipeLength()).ifPresent(item -> checkDateFormatNumber(item, "管道长度必须为数字", rowError));
//checkNotBlank(data.getPressure(), "设计-压力不能为空；", rowError);
//checkNotBlank(data.getMedium(), "设计-介质不能为空；", rowError);
//checkNotBlank(data.getTemperature(), "设计-温度不能为空；", rowError);
//checkNotBlank(data.getPipelineNumber(), "管道编号不能为空；", rowError);
Optional.ofNullable(data.getPipelineNumber()).ifPresent(v -> {
if (pipelineNumList.contains(v)) {
rowError.append("管道编号不能重复");
......@@ -1639,7 +1639,7 @@ public class DataDockServiceImpl {
pipelineNumList.add(v);
}
});
checkNotBlank(data.getDeviceLevel(), "管道级别不能为空；", rowError);
//checkNotBlank(data.getDeviceLevel(), "管道级别不能为空；", rowError);
// 工业管道校验使用信息
......@@ -1900,7 +1900,18 @@ public class DataDockServiceImpl {
.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")))
.setPipelineLength(equLists.stream().mapToDouble(item -> Double.parseDouble(item.getPipeLength())).sum())
.setPipelineLength(
Optional.ofNullable(equLists)
.orElse(Collections.emptyList())
.stream()
.filter(Objects::nonNull)
.map(PipingExcelDto::getPipeLength)
.filter(Objects::nonNull)
.map(String::trim)
.filter(s -> !s.isEmpty())
.mapToDouble(Double::parseDouble)
.sum()
)
.setInspectUnitCreditCode(inspectUnitCreditCode)
.setInspectUnitName(inspectUnitName)
.setStartLatitudeLongitude(toJSONString(equipInfo.get("startLatitudeLongitude")))
......
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/IdxBizJgRegisterInfoServiceImpl.java
View file @ e74f272c
......@@ -1118,6 +1118,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
resultMap.put(EQUIP_CLASS_FORM_ID, equIpClassMap);
}
equipInfoMap.put("companyLevel", companyLevel);
equipInfoMap.put("type", equIpClassMap.get("type"));
// 设备参数
if (equIpClassMap.containsKey(EQU_LIST) && !ValidationUtil.isEmpty(equIpClassMap.get(EQU_LIST).toString())) {
Map<String, Object> equipParamsMap = this.getEquipParamsMap(record, "", equIpClassMap.get(EQU_LIST).toString());
......@@ -3642,11 +3643,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
private String getDataSource(String operateType, LinkedHashMap equipmentInfoForm) {
// 数据来源 历史数据his 新数据new
String equipSource = String.valueOf(equipmentInfoForm.get(DATA_SOURCE));
if(OPERATESAVE.equals(operateType)){
return "new".equals(equipSource) ? "jg" : "his".equals(equipSource) ? "jg_his" : "jg_his_black";
} else {
return equipSource;
}
return "new".equals(equipSource) ? "jg" : "his".equals(equipSource) ? "jg_his" : "jg_his_black";
}
public void checkEsData(String id) {
......
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 @ e74f272c
......@@ -1930,7 +1930,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 更新es的下次检验日期
param.put("NEXT_INSPECT_DATE", this.castDate2TimeStr(dataMap.getString("nextInspectDate")));
param.put("USE_INNER_CODE", useInfo.getUseInnerCode());
param.put("IS_INTO_MANAGEMENT", true);
if (!Arrays.asList("temp", "tempEdit").contains(dataMap.get("historySubmitType"))) {
param.put("IS_INTO_MANAGEMENT", true);
}
param.put("USE_PLACE_CODE", jsonObject.get("province") + "#" + jsonObject.get("city") + "#" + jsonObject.get("county") + "#" + jsonObject.get("factoryUseSiteStreet"));
param.put("USE_SITE_CODE", String.valueOf(jsonObject.get("usePlace")));
param.put("ORG_BRANCH_CODE", branchCode);
......@@ -3971,6 +3973,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
@Transactional(rollbackFor = Exception.class)
public List<Map<String, Object>> handleHistoryEquip(JSONObject map) {
try {
Object submitType = map.get("historySubmitType");
// 使用登记证编号
String useRegistrationCode = Optional.ofNullable(Objects.toString(map.get("useOrgCode"), null))
.map(String::trim)
......@@ -4108,36 +4111,52 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
LambdaQueryWrapper<JgUseRegistrationEq> lambda = new QueryWrapper<JgUseRegistrationEq>().lambda();
lambda.eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr());
JgUseRegistrationEq jgUseRegistrationEq = new JgUseRegistrationEq();
jgUseRegistrationEq.setEquId(map.get("equipId").toString());
jgUseRegistrationEq.setEquId(equipId);
jgRelationEquipMapper.update(jgUseRegistrationEq, lambda);
} else {
// 业务管理设备信息保存
JgUseRegistrationEq jgRelationEquip = new JgUseRegistrationEq();
jgRelationEquip.setEquId(Objects.toString(map.get("equipId"), null));
ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
if (!ObjectUtils.isEmpty(listResponseModel)) {
jgUseRegistration.setApplyNo(listResponseModel.getResult().get(0));
//新增暂存
if(!Arrays.asList("tempSubmit", "tempEdit").contains(submitType)){
// 业务管理设备信息保存
JgUseRegistrationEq jgRelationEquip = new JgUseRegistrationEq();
jgRelationEquip.setEquId(equipId);
ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
if (!ObjectUtils.isEmpty(listResponseModel)) {
jgUseRegistration.setApplyNo(listResponseModel.getResult().get(0));
}
jgUseRegistration.setAuditPassDate(new Date());
jgUseRegistration.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
String status = "temp".equals(submitType)
? FlowStatusEnum.TO_BE_SUBMITTED.getName()
: FlowStatusEnum.TO_BE_FINISHED.getName();
jgUseRegistration.setStatus(status);
jgUseRegistration.setUseRegistrationCode(ValidationUtil.isEmpty(map.get("useOrgCode")) ? "" : String.valueOf(map.get("useOrgCode")));
jgUseRegistration.setRegType("1");//历史登记
this.save(jgUseRegistration);
jgRelationEquip.setEquipTransferId(jgUseRegistration.getSequenceNbr().toString());
jgRelationEquipMapper.insert(jgRelationEquip);
} else{
String status = "tempEdit".equals(submitType)
? FlowStatusEnum.TO_BE_SUBMITTED.getName()
: FlowStatusEnum.TO_BE_FINISHED.getName();
jgUseRegistration.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
jgUseRegistration.setStatus(status);
this.getBaseMapper().updateById(jgUseRegistration);
// 更新设备关联表
LambdaQueryWrapper<JgUseRegistrationEq> lambda = new QueryWrapper<JgUseRegistrationEq>().lambda();
lambda.eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr());
JgUseRegistrationEq jgUseRegistrationEq = new JgUseRegistrationEq();
jgUseRegistrationEq.setEquId(equipId);
jgRelationEquipMapper.update(jgUseRegistrationEq, lambda);
}
jgUseRegistration.setAuditPassDate(new Date());
jgUseRegistration.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
Object submitType = map.get("historySubmitType");
String status = "temp".equals(submitType)
? FlowStatusEnum.TO_BE_SUBMITTED.getName()
: FlowStatusEnum.TO_BE_FINISHED.getName();
jgUseRegistration.setStatus(status);
jgUseRegistration.setUseRegistrationCode(ValidationUtil.isEmpty(map.get("useOrgCode")) ? "" : String.valueOf(map.get("useOrgCode")));
jgUseRegistration.setRegType("1");//历史登记
this.save(jgUseRegistration);
jgRelationEquip.setEquipTransferId(jgUseRegistration.getSequenceNbr().toString());
jgRelationEquipMapper.insert(jgRelationEquip);
// 暂存历史表
updateHistory(map, Objects.toString(map.get("equipId"), null), String.valueOf(jgUseRegistration.getSequenceNbr()), jgUseRegistration.getSupervisoryCode());
//监督管理信息
LambdaQueryWrapper<IdxBizJgSupervisionInfo> lambdaSup = new QueryWrapper<IdxBizJgSupervisionInfo>().lambda();
lambdaSup.eq(IdxBizJgSupervisionInfo::getRecord, jgRelationEquip.getEquId());
lambdaSup.eq(IdxBizJgSupervisionInfo::getRecord, equipId);
IdxBizJgSupervisionInfo supervisionInfo = idxBizJgSupervisionInfoMapper.selectOne(lambdaSup);
if (supervisionInfo != null && !ObjectUtils.isEmpty(map.get("orgBranchCode"))) {
supervisionInfo.setOrgBranchCode(String.valueOf(map.get("orgBranchCode")).split("_")[0]);
......@@ -4147,7 +4166,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 注册信息
LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, jgRelationEquip.getEquId());
lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, equipId);
IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
String equCode = "";
if (registerInfo != null) {
......@@ -4169,7 +4188,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 设计信息
LambdaQueryWrapper<IdxBizJgDesignInfo> lambdaDes = new QueryWrapper<IdxBizJgDesignInfo>().lambda();
lambdaDes.eq(IdxBizJgDesignInfo::getRecord, jgRelationEquip.getEquId());
lambdaDes.eq(IdxBizJgDesignInfo::getRecord, equipId);
IdxBizJgDesignInfo designInfo = idxBizJgDesignInfoService.getOne(lambdaDes);
if (designInfo != null) {
designInfo.setDesignUnitCreditCode(MapUtil.getStr(map, "designUnitCreditCode"));
......@@ -4188,7 +4207,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 制造信息
LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, jgRelationEquip.getEquId());
factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, equipId);
IdxBizJgFactoryInfo idxBizJgFactoryInfo = idxBizJgFactoryInfoService.getOne(factoryInfoWrapper);
if (idxBizJgFactoryInfo != null) {
idxBizJgFactoryInfo.setProduceUnitCreditCode(MapUtil.getStr(map, "produceUnitCreditCode"));
......@@ -4298,21 +4317,21 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
}
// 历史设备 生成证书管理表记录 & 生成安装 维保等操作记录
if (registerInfo != null && !"temp".equals(map.get("historySubmitType"))) {
if (registerInfo != null && !Arrays.asList("temp", "tempEdit").contains(map.get("historySubmitType"))) {
this.historyEquGenManageRelated(map, jgUseRegistration, registerInfo, idxBizJgFactoryInfo);
String routePath = this.buildTaskModel(jgUseRegistration, map, reginParams);
jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
.applyNo(jgUseRegistration.getApplyNo())
.businessType(BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName())
.businessId(jgUseRegistration.getSequenceNbr() + "")
.equId(String.valueOf(map.get("equipId")))
.approvalUnit(jgUseRegistration.getReceiveOrgName())
.approvalUnitCode(jgUseRegistration.getReceiveOrgCode())
.status("正常")
.routePath(routePath)
.changeContent(BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName() + "业务办理")
.build());
}
String routePath = this.buildTaskModel(jgUseRegistration, map, reginParams);
jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
.applyNo(jgUseRegistration.getApplyNo())
.businessType(BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName())
.businessId(jgUseRegistration.getSequenceNbr() + "")
.equId(String.valueOf(map.get("equipId")))
.approvalUnit(jgUseRegistration.getReceiveOrgName())
.approvalUnitCode(jgUseRegistration.getReceiveOrgCode())
.status("正常")
.routePath(routePath)
.changeContent(BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName() + "业务办理")
.build());
}
return this.baseMapper.getDetailById(jgUseRegistration.getSequenceNbr());
} catch (BadRequest | LocalBadRequest e) {
......
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