fix(jg):任务 33274 【新增压力管道安装告知】安装告知页面及接口调整

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

@@ -338,4 +338,16 @@ public class JgInstallationNoticeDto extends BaseDto {
      * 管道工程装置id
      */
     private String projectContraptionId;
+
+    /**
+     * 装置起始位置-压力管道使用
+     */
+    @ApiModelProperty("start_latitude_longitude")
+    private String startLatitudeLongitude;
+
+    /**
+     * 装置结束位置-压力管道使用
+     */
+    @ApiModelProperty("end_latitude_longitude")
+    private String endLatitudeLongitude;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgInstallationNotice.java

@@ -488,9 +488,20 @@ public class JgInstallationNotice extends BaseEntity {
     @TableField("equ_list_code")
     private String equListCode;
     /**
-     * 工程装置主键
+     * 工程装置主键-压力管道使用
      */
     @TableField("project_contraption_id")
     private String projectContraptionId;
 
+    /**
+     * 装置起始位置-压力管道使用
+     */
+    @TableField("start_latitude_longitude")
+    private String startLatitudeLongitude;
+
+    /**
+     * 装置结束位置-压力管道使用
+     */
+    @TableField("end_latitude_longitude")
+    private String endLatitudeLongitude;
 }

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/JgInstallationNoticeServiceImpl.java

@@ -283,6 +283,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 installationInfo.put(s, ObjectUtils.isEmpty(installationInfo.get(s)) ? new JSONArray() : parseArray(installationInfo.get(s).toString()));
             }
         }
+        String[] jsonObjFields = {"startLatitudeLongitude", "endLatitudeLongitude"};
+        for (String s : jsonObjFields) {
+            if (installationInfo.containsKey(s)) {
+                installationInfo.put(s, ObjectUtils.isEmpty(installationInfo.get(s)) ? null : JSON.parseObject(installationInfo.get(s).toString()));
+            }
+        }
         if (Integer.parseInt(notice.getNoticeStatus()) >= FlowStatusEnum.TO_BE_FINISHED.getCode()) {
             // 完成及作废时显示历史数据
             JSONObject hisData = commonService.queryHistoryData(notice.getSequenceNbr());
@@ -302,6 +308,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         } else {
             // 显示最新的设备信息
             Map<String, Object> detail = setNewEquipData(companyLevel, installationInfo);
+            detail.put("startLatitudeLongitude", JSON.parseObject(notice.getStartLatitudeLongitude()));
+            detail.put("endLatitudeLongitude", JSON.parseObject(notice.getEndLatitudeLongitude()));
             return new HashMap<String, Map<String, Object>>() {{
                 this.put("installationInfo", detail);
             }};
@@ -1917,6 +1925,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         projectContraption.setUscUnitName(jgInstallationNotice.getInstallUnitName());
         projectContraption.setUseUnitName(jgInstallationNotice.getUseUnitName());
         projectContraption.setUseUnitCreditCode(jgInstallationNotice.getUseUnitCreditCode());
+        projectContraption.setStartLatitudeLongitude(jgInstallationNotice.getStartLatitudeLongitude());
+        projectContraption.setEndLatitudeLongitude(jgInstallationNotice.getEndLatitudeLongitude());
         projectContraptionService.updateById(projectContraption);
 
         // 更新安装告知业务表信息

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

@@ -3792,6 +3792,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         re.put("equipmentLists", equList);
         re.put("projectContraption", projectContraption.getProjectContraption());
         re.put("projectContraptionId", projectContraptionSeq);
+        re.put("projectContraptionNo", projectContraption.getProjectContraptionNo());
+        re.put("pipelineLength", projectContraption.getPipelineLength());
         this.setPieLineInspectInfo(projectContraptionSeq, re);
         this.setConstructionInfo(projectContraptionSeq, re);
         return re;