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

@@ -283,4 +283,7 @@ public class JgReformNoticeDto extends BaseDto {
 
     @ApiModelProperty("作废人员id")
     private String cancelUserId;
+
+    @ApiModelProperty("管道改造的长度变化值（正值为增加，负值为减少）-压力管道用")
+    private String pipeLengthChanged;
 }

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

@@ -413,4 +413,10 @@ public class JgReformNotice extends BaseEntity {
      */
     @TableField("cancel_user_id")
     private String cancelUserId;
+
+    /**
+     * 管道改造的长度变化值（正值为增加，负值为减少）-压力管道用
+     */
+    @TableField("pipe_length_changed")
+    private String pipeLengthChanged;
 }

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

@@ -31,7 +31,8 @@ import java.util.Map;
 @Api(tags = "管道工程装置表Api")
 @RequestMapping(value = "/idx-biz-jg-project-contraption")
 public class IdxBizJgProjectContraptionController extends BaseController {
-
+	// 设备基本信息表单id
+	private static final String EQUIP_INFO_FORM_ID = "equipInfo";
     @Autowired
 	IdxBizJgProjectContraptionServiceImpl idxBizJgProjectContraptionServiceImpl;
 
@@ -124,11 +125,25 @@ public class IdxBizJgProjectContraptionController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/details")
 	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个管道工程装置表", notes = "根据sequenceNbr查询单个管道工程装置表")
-	public ResponseModel<Map<String, Map<String, Object>>> selectOne(@RequestParam("sequenceNbr") String sequenceNbr) {
+	public ResponseModel<Map<String, Map<String, Object>>> details(@RequestParam("sequenceNbr") String sequenceNbr) {
 		return ResponseHelper.buildResponse(idxBizJgProjectContraptionServiceImpl.details(sequenceNbr));
 	}
 
 	/**
+	 * 根据sequenceNbr查询详情-不包裹设备表单Id
+	 *
+	 * @param sequenceNbr 主键
+	 * @return ResponseModel
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/detailsNotFormId")
+	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个管道工程装置表", notes = "根据sequenceNbr查询单个管道工程装置表")
+	// 传record的原因是前端组件内部写死了，此处是工程装置表seq
+	public ResponseModel<Object> detailsNotFormId(@RequestParam("record") String sequenceNbr) {
+		return ResponseHelper.buildResponse(idxBizJgProjectContraptionServiceImpl.details(sequenceNbr).get(EQUIP_INFO_FORM_ID));
+	}
+
+	/**
 	 * 根据sequenceNbr分页查询管道信息
 	 *
 	 * @param sequenceNbr

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

@@ -292,8 +292,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 jgReformNoticeMapper.updateById(bean);
             }
 
-            jgReformNoticeEqMapper.delete(new QueryWrapper<JgReformNoticeEq>()
-                    .eq("equip_transfer_id", notice.getSequenceNbr()));
+            jgReformNoticeEqMapper.delete(new LambdaQueryWrapper<JgReformNoticeEq>()
+                                                  .eq(JgReformNoticeEq::getEquipTransferId, notice.getSequenceNbr()));
             // eq关系表
             List<JgReformNoticeEq> noticeEqs = new ArrayList<>();
             // 更新设备关系表

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/IdxBizJgProjectContraptionDto.java

 package com.yeejoin.amos.boot.module.ymt.api.dto;
 
 import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -133,4 +134,7 @@ public class IdxBizJgProjectContraptionDto extends BaseDto {
 
     @ApiModelProperty("是否首次合并新增")
     private Boolean isFirstMerge;
+
+    @ApiModelProperty("最新一次管道改造的长度变化值（正值为增加，负值为减少）")
+    private String pipeLengthChanged;
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgProjectContraption.java

@@ -276,6 +276,12 @@ public class IdxBizJgProjectContraption extends BaseEntity {
     private Boolean isFirstMerge;
 
     /**
+     * 最新一次管道改造的长度变化值（正值为增加，负值为减少）
+     */
+    @TableField("pipe_length_changed")
+    private String pipeLengthChanged;
+
+    /**
      * 是否禁用打印汇总表按钮
      */
     @TableField(exist = false)