Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -181,6 +181,9 @@ public class JgReformNoticeDto extends BaseDto {
     @ApiModelProperty (value = "告知设备列表")
     private List<Map<String, Object>> deviceList;
 
+    @ApiModelProperty(value = "管道列表")
+    private List<Map<String, Object>> pipelineList;
+
     @ApiModelProperty (value = "区名字")
     private String countyName;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgReformNoticeService.java

@@ -33,7 +33,7 @@ public interface IJgReformNoticeService extends IService<JgReformNotice> {
      * @param noticeDto 改造告知
      * @param op        操作类型
      */
-    JgReformNoticeDto updateInstallationNotice(String submitType, JgReformNoticeDto noticeDto, String op);
+    JgReformNoticeDto updateNotice(String submitType, Map<String, Object> noticeMap, String op);
 
     /**
      * 分页查询

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgReformNoticeController.java

@@ -65,13 +65,9 @@ public class JgReformNoticeController extends BaseController {
     @PutMapping(value = "/update")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新改造告知", notes = "根据sequenceNbr更新改造告知")
     public ResponseModel<JgReformNoticeDto> updateBySequenceNbrJgReformNotice(@RequestParam String submitType,
-                                                                              @RequestBody JgReformNoticeDto installationInfo,
+                                                                              @RequestBody Map<String, Object> noticeMap,
                                                                               @RequestParam(value = "op", required = false) String op) {
-        if (Objects.isNull(installationInfo)) {
-            throw new IllegalArgumentException("参数installationInfo不能为空");
-        }
-
-        return ResponseHelper.buildResponse(jgReformNoticeService.updateInstallationNotice(submitType, installationInfo, op));
+        return ResponseHelper.buildResponse(jgReformNoticeService.updateNotice(submitType, noticeMap, op));
     }
 
     /**

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

@@ -5,6 +5,7 @@
     <select id="getDetail" resultType="java.util.Map">
         SELECT
             SEQUENCE_NBR,
+            SEQUENCE_NBR as projectContraptionId,
             USE_UNIT_CREDIT_CODE,
             EQU_LIST,
             EQU_CATEGORY,