fix(大编辑) ：es顺序

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/ProjectContraptionChangeDataDto.java

@@ -132,4 +132,11 @@ public class ProjectContraptionChangeDataDto extends BaseChangeDataDto {
     @FieldDisplayDefine(value = "使用登记编号")
     private String useRegistrationCode;
 
+
+    @FieldDisplayDefine(value = "监管码", isExist = false)
+    private String supervisoryCode;
+
+    @FieldDisplayDefine(value = "设备代码", isExist = false)
+    private String equCode;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/PieLineDataChangeServiceImpl.java

@@ -113,6 +113,8 @@ public class PieLineDataChangeServiceImpl {
 
     private ProjectContraptionChangeDataDto getOldProjectContraptionData(ProjectContraptionChangeDataDto projectContraptionChangeDataDtoNew) {
         IdxBizJgProjectContraption projectContraption = idxBizJgProjectContraptionServiceImpl.getById(projectContraptionChangeDataDtoNew.getProjectContraptionId());
+        projectContraptionChangeDataDtoNew.setEquCode(projectContraption.getEquCode());
+        projectContraptionChangeDataDtoNew.setSupervisoryCode(projectContraption.getSupervisoryCode());
         return BeanUtil.copyProperties(projectContraption, ProjectContraptionChangeDataDto.class);
     }
 
@@ -197,7 +199,7 @@ public class PieLineDataChangeServiceImpl {
         // 汇总表打印会使用
         useInfo.setUseDate(projectContraptionChangeDataDto.getUseDate());
         useInfo.setDataSource(projectContraptionChangeDataDto.getDataSource());
-        useInfo.setIsIntoManagement(Boolean.FALSE);
+        useInfo.setIsIntoManagement(Boolean.TRUE);
         useInfo.setEquState(String.valueOf(EquipmentEnum.ZAIYONG.getCode()));
         SingleProjectEquipChangeProcess.setNewUseAddressInfo(projectContraptionChangeDataDto, useInfo);
         commonEquipDataProcessService.getIdxBizJgUseInfoService().save(useInfo);
@@ -255,6 +257,7 @@ public class PieLineDataChangeServiceImpl {
         otherInfo.setSequenceNbr(null);
         otherInfo.setClaimStatus("已认领");
         otherInfo.setRecDate(new Date());
+        otherInfo.setSupervisoryCode(projectContraptionChangeDataDto.getSupervisoryCode());
         commonEquipDataProcessService.getIdxBizJgOtherInfoMapper().insert(otherInfo);
 
         //管道技术参数
@@ -291,6 +294,11 @@ public class PieLineDataChangeServiceImpl {
         esEquipmentDto.setORG_BRANCH_NAME(projectContraptionChangeDataDto.getOrgName());
         esEquipmentDto.setOrgBranchCode(projectContraptionChangeDataDto.getOrgCode());
         esEquipmentDto.setCREATE_DATE(new Date().getTime());
+        esEquipmentDto.setUSE_PLACE(String.join("/", projectContraptionChangeDataDto.getProvinceName(), projectContraptionChangeDataDto.getCityName(), projectContraptionChangeDataDto.getCountyName(), projectContraptionChangeDataDto.getStreetName()));
+        esEquipmentDto.setUSE_PLACE_CODE(String.join("#", projectContraptionChangeDataDto.getProvince(), projectContraptionChangeDataDto.getCity(), projectContraptionChangeDataDto.getCounty(), projectContraptionChangeDataDto.getStreet()));
+        esEquipmentDto.setADDRESS(projectContraptionChangeDataDto.getAddress());
+        esEquipmentDto.setSUPERVISORY_CODE(projectContraptionChangeDataDto.getSupervisoryCode());
+        esEquipmentDto.setEQU_CODE(projectContraptionChangeDataDto.getEquCode());
         esEquipmentDto.setProjectContraptionId(projectContraptionChangeDataDto.getProjectContraptionId());
         if (inspectionDetectionInfo.getNextInspectDate() != null) {
             esEquipmentDto.setNEXT_INSPECT_DATE(inspectionDetectionInfo.getNextInspectDate().getTime());
@@ -387,6 +395,11 @@ public class PieLineDataChangeServiceImpl {
             esEquipmentDto.setORG_BRANCH_NAME(projectContraptionChangeDataDto.getOrgName());
             esEquipmentDto.setOrgBranchCode(projectContraptionChangeDataDto.getOrgCode());
             esEquipmentDto.setUSE_ORG_CODE(projectContraptionChangeDataDto.getUseRegistrationCode());
+            esEquipmentDto.setUSE_PLACE(String.join("/", projectContraptionChangeDataDto.getProvinceName(), projectContraptionChangeDataDto.getCityName(), projectContraptionChangeDataDto.getCountyName(), projectContraptionChangeDataDto.getStreetName()));
+            esEquipmentDto.setUSE_PLACE_CODE(String.join("#", projectContraptionChangeDataDto.getProvince(), projectContraptionChangeDataDto.getCity(), projectContraptionChangeDataDto.getCounty(), projectContraptionChangeDataDto.getStreet()));
+            esEquipmentDto.setADDRESS(projectContraptionChangeDataDto.getAddress());
+            esEquipmentDto.setSUPERVISORY_CODE(projectContraptionChangeDataDto.getSupervisoryCode());
+            esEquipmentDto.setEQU_CODE(projectContraptionChangeDataDto.getEquCode());
             if (pipelineNew.getNextInspectDate() != null) {
                 esEquipmentDto.setNEXT_INSPECT_DATE(pipelineNew.getNextInspectDate().getTime());
             }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionResultServiceImpl.java

@@ -313,6 +313,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
         JyjcInspectionResultModel dbResultModel = this.queryBySeq(model.getSequenceNbr());
         // 更新使用信息、检验信息、技术参数
         Set<String> records = this.updateTechParamAndInspectInfo(dbResultModel, jybgFile);
+        sendDataRefreshMsg(records);
         return dbResultModel;
     }