fix(jg):未纳管压力管道安装告知业务调整

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -343,11 +344,11 @@ public class JgInstallationNoticeDto extends BaseDto {
      * 装置起始位置-压力管道使用
      */
     @ApiModelProperty("start_latitude_longitude")
-    private String startLatitudeLongitude;
+    private JSONObject startLatitudeLongitude;
 
     /**
      * 装置结束位置-压力管道使用
      */
     @ApiModelProperty("end_latitude_longitude")
-    private String endLatitudeLongitude;
+    private JSONObject 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

@@ -425,6 +425,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     // 提取节点等信息
                     workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
                     BeanUtils.copyProperties(noticeDto, notice);
+                    notice.setStartLatitudeLongitude(JSON.toJSONString(noticeDto.getStartLatitudeLongitude()));
+                    notice.setEndLatitudeLongitude(JSON.toJSONString(noticeDto.getEndLatitudeLongitude()));
                     if (!ObjectUtils.isEmpty(notice.getInstanceStatus())) {
                         notice.setInstanceStatus(notice.getInstanceStatus() + "," + workflowResultDto.getNextExecutorRoleIds());
                     } else {
@@ -460,6 +462,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     // 提取节点等信息
                     workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
                     BeanUtils.copyProperties(noticeDto, notice);
+                    notice.setStartLatitudeLongitude(JSON.toJSONString(noticeDto.getStartLatitudeLongitude()));
+                    notice.setEndLatitudeLongitude(JSON.toJSONString(noticeDto.getEndLatitudeLongitude()));
                     if (!ObjectUtils.isEmpty(notice.getInstanceStatus())) {
                         notice.setInstanceStatus(notice.getInstanceStatus() + "," + workflowResultDto.getNextExecutorRoleIds());
                     } else {
@@ -877,6 +881,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         JgInstallationNotice dto = new JgInstallationNotice();
         BeanUtils.copyProperties(model, dto);
 //            int i = deviceList.indexOf(obj);
+        dto.setStartLatitudeLongitude(JSON.toJSONString(model.getStartLatitudeLongitude()));
+        dto.setEndLatitudeLongitude(JSON.toJSONString(model.getEndLatitudeLongitude()));
         String applyNo = applyNoList.get(0);
         dto.setApplyNo(applyNo);
         dto.setNoticeDate(new Date());

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/IdxBizJgProjectContraptionMapper.xml

@@ -97,11 +97,9 @@
                  FROM
                      tzs_jg_installation_notice a
                  WHERE a.project_contraption_id = #{projectContraptionId}
-                   AND (a.notice_status <![CDATA[ <> ]]> '6614'
-                     OR a.notice_status <![CDATA[ <> ]]> '6615'
-                     OR a.notice_status <![CDATA[ <> ]]> '6610'
-                     OR a.notice_status <![CDATA[ <> ]]> '6617'
-                     OR a.notice_status <![CDATA[ <> ]]> '6612')
+                   AND a.notice_status <![CDATA[ <> ]]> '6610'
+                   AND a.notice_status <![CDATA[ <> ]]> '6615'
+                   AND a.notice_status <![CDATA[ <> ]]> '6614'
              )
     </select>