1.压力管道编辑功能接口开发

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
+import com.yeejoin.amos.boot.biz.common.annotation.Group;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -14,6 +15,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @Accessors(chain = true)
+@Group(value = "PipelineChangeItemDto")
 public class PipelineChangeItemDto extends TechParamsPipelineChangeFieldDto {
 
     @FieldDisplayDefine(value = "设计单位名称")

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.api.dto;
 
 import com.alibaba.fastjson.JSON;
 import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
+import com.yeejoin.amos.boot.biz.common.annotation.Group;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -14,11 +15,12 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@Group(value = "idx_biz_jg_project_contraption")
 @ApiModel(value = "ProjectContraptionChangeFieldDto", description = "管道工程装置表")
 public class ProjectContraptionChangeDataDto extends BaseChangeDataDto {
 
     @FieldDisplayDefine(value = "主键", isExist = false)
-    private Long sequenceNbr;
+    private String projectContraptionId;
 
     private static final long serialVersionUID = 1L;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -701,7 +701,7 @@
         <foreach collection="records" item="record" open="(" close=")" separator=",">
             #{record}
         </foreach>
-        ORDER BY ui.REC_DATE DESC
+        ORDER BY ibjui.REC_DATE DESC
     </select>
     <sql id="page-list-vessel">
         SELECT

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -86,7 +87,9 @@ public class BatchDataChangeProcessStrategy implements IChangeDataProcessStrateg
                 // 设计信息更新
                 pieLineDataChangeService.saveDesignForPieLine(record, allChangeColumns, item);
                 // 技术参数入库保存
-                commonEquipDataProcessService.savePieLineTechParam(record, allChangeColumns, item);
+                TechParamsPipelineChangeFieldDto paramsPipelineChangeFieldDto = new PipelineChangeItemDto();
+                BeanUtil.copyProperties(item, paramsPipelineChangeFieldDto, false);
+                commonEquipDataProcessService.savePieLineTechParam(record, allChangeColumns, paramsPipelineChangeFieldDto);
             });
         } else { // 气瓶逻辑
             List<MultiChangeItemData> items = equips.toJavaList(MultiChangeItemData.class);
@@ -135,7 +138,7 @@ public class BatchDataChangeProcessStrategy implements IChangeDataProcessStrateg
     public Map<String, Object> getDetail(String applyNo, String bizId) {
         Map<String, Object> result = new HashMap<>();
         JgUseRegistration jgUseRegistration = useRegistrationService.getOne(new LambdaQueryWrapper<JgUseRegistration>()
-                .eq(JgUseRegistration::getApplyNo, applyNo).select(BaseEntity::getSequenceNbr));
+                .eq(JgUseRegistration::getApplyNo, applyNo).select(BaseEntity::getSequenceNbr, JgUseRegistration::getProjectContraptionId));
         LambdaQueryWrapper<JgUseRegistrationEq> lambda = new QueryWrapper<JgUseRegistrationEq>().lambda();
         lambda.eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr());
         lambda.select(JgUseRegistrationEq::getEquId);
@@ -152,6 +155,7 @@ public class BatchDataChangeProcessStrategy implements IChangeDataProcessStrateg
             IdxBizJgProjectContraption idxBizJgProjectContraption = idxBizJgProjectContraptionService.getById(jgUseRegistration.getProjectContraptionId());
             Map<String, Object> map = IdxBizJgRegisterInfoServiceImpl.convertCamelToUnderscore(idxBizJgProjectContraption, IdxBizJgProjectContraptionServiceImpl.jsonFields);
             result.putAll(map);
+            result.put("projectContraptionId", idxBizJgProjectContraption.getSequenceNbr());
             tableData = jgUseRegistrationMapper.queryForUnitPipelineEquipmentForEdit(records);
         }
         result.put("tableData", tableData);

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

@@ -68,7 +68,6 @@ public class CommonEquipDataProcessService {
         this.equipChangeDataUpdateService = equipChangeDataUpdateService;
     }
 
-
     public <T extends BaseChangeDataDto> T castMap2Bean(Map<String, Object> map, Class<T> clazz) {
         try {
             T t = clazz.newInstance();
@@ -80,6 +79,7 @@ public class CommonEquipDataProcessService {
     }
 
 
+
     public void checkValidField(String record, BaseChangeDataDto changeDataDto, String equList, String equCategory, String equDefine) {
         // 注册信息
         if (changeDataDto instanceof EquipRegisterChangeDataDto) {

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

@@ -30,26 +30,25 @@ public class PieLineDataChangeServiceImpl {
     public void update(ProjectContraptionChangeDataDto projectContraptionChangeDataDtoNew, List<ChangeDataDto> allChangeColumns) {
         // 原有对象行转列
         ProjectContraptionChangeDataDto projectContraptionChangeDataDtoOld = getOldProjectContratData(projectContraptionChangeDataDtoNew);
-        List<ChangeDataDto> newProjectContraptionChangeData = commonEquipDataProcessService.convertBeanField2Column2(projectContraptionChangeDataDtoNew, projectContraptionChangeDataDtoNew.getSequenceNbr() + "");
+        List<ChangeDataDto> newProjectContraptionChangeData = commonEquipDataProcessService.convertBeanField2Column2(projectContraptionChangeDataDtoNew, projectContraptionChangeDataDtoNew.getProjectContraptionId());
         // 新对象构造行转列
-        List<ChangeDataDto> oldProjectContraptionChangeData = commonEquipDataProcessService.convertBeanField2Column2(projectContraptionChangeDataDtoOld, projectContraptionChangeDataDtoNew.getSequenceNbr() + "");
+        List<ChangeDataDto> oldProjectContraptionChangeData = commonEquipDataProcessService.convertBeanField2Column2(projectContraptionChangeDataDtoOld, projectContraptionChangeDataDtoNew.getProjectContraptionId());
         // 数据比对记录变化字段列表
         allChangeColumns.addAll(commonEquipDataProcessService.mergeChangeFields(newProjectContraptionChangeData, oldProjectContraptionChangeData));
         // 数据入库
         LambdaUpdateWrapper<IdxBizJgProjectContraption> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.eq(BaseEntity::getSequenceNbr, projectContraptionChangeDataDtoNew.getSequenceNbr());
+        updateWrapper.eq(BaseEntity::getSequenceNbr, projectContraptionChangeDataDtoNew.getProjectContraptionId());
         updateWrapper.set(IdxBizJgProjectContraption::getProjectContraption, projectContraptionChangeDataDtoNew.getProjectContraption());
         updateWrapper.set(IdxBizJgProjectContraption::getProjectContraptionNo, projectContraptionChangeDataDtoNew.getProjectContraptionNo());
         updateWrapper.set(IdxBizJgProjectContraption::getPipelineLength, projectContraptionChangeDataDtoNew.getPipelineLength());
         updateWrapper.set(IdxBizJgProjectContraption::getProductPhoto, projectContraptionChangeDataDtoNew.getProductPhoto());
         updateWrapper.set(IdxBizJgProjectContraption::getOtherAccessories, projectContraptionChangeDataDtoNew.getOtherAccessories());
         updateWrapper.set(IdxBizJgProjectContraption::getProductQualificationCertificate, projectContraptionChangeDataDtoNew.getProductQualificationCertificate());
-        updateWrapper.set(IdxBizJgProjectContraption::getProductPhoto, projectContraptionChangeDataDtoNew.getProductPhoto());
         idxBizJgProjectContraptionServiceImpl.update(null, updateWrapper);
     }
 
     private ProjectContraptionChangeDataDto getOldProjectContratData(ProjectContraptionChangeDataDto projectContraptionChangeDataDtoNew) {
-        IdxBizJgProjectContraption projectContraption = idxBizJgProjectContraptionServiceImpl.getById(projectContraptionChangeDataDtoNew.getSequenceNbr());
+        IdxBizJgProjectContraption projectContraption = idxBizJgProjectContraptionServiceImpl.getById(projectContraptionChangeDataDtoNew.getProjectContraptionId());
         return BeanUtil.copyProperties(projectContraption, ProjectContraptionChangeDataDto.class);
     }