Commit 7698a144 authored by suhuiguang's avatar suhuiguang

fix(jyjc): 报检规则4.0开发

1.检验结果枚举前缀修改
parent b9bd6cd5
...@@ -754,7 +754,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -754,7 +754,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
List<JgResumeInfoDto> jgResumeInfoDtoList = new ArrayList<>(); List<JgResumeInfoDto> jgResumeInfoDtoList = new ArrayList<>();
Date now = DateUtil.date(); Date now = DateUtil.date();
if (model.getEquipClassify().equals(EquipmentClassifityEnum.YLGD.getCode())) { if (model.getEquipClassify().equals(EquipmentClassifityEnum.YLGD.getCode())) {
List<String> codes = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.JG.getCode(), 1).getResult(); List<String> codes = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SE.getCode(), 1).getResult();
JyjcInspectionResult resultModel = new JyjcInspectionResult(); JyjcInspectionResult resultModel = new JyjcInspectionResult();
resultModel.setInspectionUnitCode(model.getInspectionUnitCode()); resultModel.setInspectionUnitCode(model.getInspectionUnitCode());
resultModel.setInspectionUnitName(model.getInspectionUnitName()); resultModel.setInspectionUnitName(model.getInspectionUnitName());
...@@ -803,7 +803,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -803,7 +803,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
.status("正常") .status("正常")
.routePath(taskV2Model.getRoutePath()).build()); .routePath(taskV2Model.getRoutePath()).build());
} else { } else {
List<String> codes = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.JG.getCode(), applicationEquipModels.size()).getResult(); List<String> codes = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SE.getCode(), applicationEquipModels.size()).getResult();
for (int i = 0; i < applicationEquipModels.size(); i++) { for (int i = 0; i < applicationEquipModels.size(); i++) {
JyjcInspectionResult resultModel = new JyjcInspectionResult(); JyjcInspectionResult resultModel = new JyjcInspectionResult();
resultModel.setInspectionUnitCode(model.getInspectionUnitCode()); resultModel.setInspectionUnitCode(model.getInspectionUnitCode());
......
...@@ -30,7 +30,7 @@ public enum ApplicationFormTypeEnum { ...@@ -30,7 +30,7 @@ public enum ApplicationFormTypeEnum {
YZBG("YZBG", "DJ_YZ"),//移装变更登记 YZBG("YZBG", "DJ_YZ"),//移装变更登记
DWBG("DWBG", "DJ_DW"),//单位变更登记 DWBG("DWBG", "DJ_DW"),//单位变更登记
JY("JY", ""), JY("JY", ""),
JG("SE", ""),// 检验结果 SE("SE", ""),// 检验结果
ZX("ZX", "BF_YZ"),//电梯(设备)移装注销 ZX("ZX", "BF_YZ"),//电梯(设备)移装注销
BF("BF", "BF_ZX"),//电梯(设备)报废注销 BF("BF", "BF_ZX"),//电梯(设备)报废注销
GMBG("GMBG", "DJ_GM"),//更名变更 GMBG("GMBG", "DJ_GM"),//更名变更
......
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