Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dto/JyjcInspectionApplicationDto.java

@@ -137,9 +137,6 @@ public class JyjcInspectionApplicationDto extends BaseModel {
     @ApiModelProperty(value = "下一步任务id")
     private String nextTaskId;
 
-    @ApiModelProperty(value = "下一步执行人Ids")
-    private String nextExecuteUserIds;
-
     @ApiModelProperty(value = "下一步任务名称")
     private String nextTaskName;
 

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

@@ -1290,7 +1290,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         useInfo.setIsIntoManagement(Boolean.TRUE);
         useInfoMapper.updateById(useInfo);
         // 更新es
-        updateEsData(usePlace, mapData, otherInfo, jgUseRegistration, jsonObject);
+        updateEsData(usePlace, mapData, otherInfo,useInfo, jgUseRegistration, jsonObject);
         jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
                 .applyNo(jgUseRegistration.getApplyNo())
                 .businessType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName())
@@ -1375,7 +1375,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return codeUtil.generateEquipmentCode(codeGenerateDto);
     }
 
-    public void updateEsData(String usePlace, JSONObject dataMap, IdxBizJgOtherInfo otherInfo,
+    public void updateEsData(String usePlace, JSONObject dataMap, IdxBizJgOtherInfo otherInfo,IdxBizJgUseInfo useInfo,
                              JgUseRegistration jgUseRegistration, JSONObject jsonObject) {
         // 更新es
         HashMap<String, Map<String, Object>> objMap = new HashMap<>();
@@ -1391,6 +1391,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         param.put("USE_PLACE", usePlace);
         param.put("STATUS", "已认领");
         param.put("EQU_STATE", 1);
+        param.put("USE_INNER_CODE", useInfo.getUseInnerCode());
         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")));
@@ -2845,7 +2846,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 this.createCode(map, jgUseRegistration, registerInfo, useInfo, otherInfo);
                 map.put("equCode", equCode);
                 // 更新es
-                this.updateEsData(usePlace, map, otherInfo, jgUseRegistration, map);
+                this.updateEsData(usePlace, map, otherInfo,useInfo, jgUseRegistration, map);
                 this.updateById(jgUseRegistration);
 
                 // 设备安装信息更新