管道变更/单位变更

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

@@ -257,13 +257,13 @@
 
     <select id="queryForUnitByProjectContraptionPage"
             resultType="com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption">
-        SELECT
-        ibjpc.*,tjurm.equ_use_address
+        SELECT distinct
+        ibjpc.*
         FROM
         idx_biz_jg_project_contraption ibjpc
         left join tzs_jg_use_registration_manage tjurm ON ibjpc.use_registration_code = tjurm.use_registration_code
         WHERE
-        NOT EXISTS (
+        EXISTS (
         SELECT
         1
         FROM

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

@@ -287,8 +287,13 @@ public class JgUseRegistrationManageController extends BaseController {
         Page<JgUseRegistrationManageDto> page = new Page<JgUseRegistrationManageDto>();
         page.setCurrent(current);
         page.setSize(size);
-        if (!ValidationUtil.isEmpty(dto.getOriginalUseUnitCreditCode())) {
-            dto.setUseUnitCreditCodeForSearch(dto.getOriginalUseUnitCreditCode());
+        String originalUseUnitCreditCode = dto.getOriginalUseUnitCreditCode();
+        if (!ValidationUtil.isEmpty(originalUseUnitCreditCode)) {
+            if(originalUseUnitCreditCode.contains("_")){
+                dto.setUseUnitCreditCodeForSearch(originalUseUnitCreditCode.split("_")[0]);
+            } else {
+                dto.setUseUnitCreditCodeForSearch(originalUseUnitCreditCode);
+            }
         } else {
             return ResponseHelper.buildResponse(page);
         }
@@ -305,8 +310,13 @@ public class JgUseRegistrationManageController extends BaseController {
         Page<IdxBizJgProjectContraption> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
-        if (ValidationUtil.isEmpty(params.get("originalUseUnitCreditCode"))) {
+        String originalUseUnitCreditCode = params.get("originalUseUnitCreditCode");
+        if (ValidationUtil.isEmpty(originalUseUnitCreditCode)) {
             return ResponseHelper.buildResponse(page);
+        }else {
+            if(originalUseUnitCreditCode.contains("_")){
+                params.put("originalUseUnitCreditCode",originalUseUnitCreditCode.split("_")[0]);
+            }
         }
         return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryForUnitByProjectContraptionPage(page, params, sort));
     }

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

@@ -221,7 +221,11 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 new LambdaQueryWrapper<JgRegistrationHistory>()
                         .eq(JgRegistrationHistory::getCurrentDocumentId, notice.getApplyNo())
                         .eq(JgRegistrationHistory::getIsDelete, false));
+        if("8000".equals(notice.getEquListCode())){
+            changeInfo.put("projectContraptionList", JSON.parse(historyServiceOne.getChangeData()));
+        } else {
             changeInfo.put("registrationList", JSON.parse(historyServiceOne.getChangeData()));
+        }
         changeInfo.put("havingPermission", notice.getNextExecuteUserIds() != null && notice.getNextExecuteUserIds().contains(RequestContext.getExeUserId()));
         String companyType = selectedOrgInfo.getCompany().getCompanyType();
         if ("个人主体".equals(companyType)) {
@@ -290,7 +294,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         if (Objects.isNull(noticeDto) || StringUtils.isEmpty(submitType)) {
             throw new IllegalArgumentException("参数不能为空");
         }
-        if("8300".equals(noticeDto.getEquCategory())){
+        if(PipelineEnum.PRESSURE_PIPELINE.getCode().equals(noticeDto.getEquListCode())){
             dealProjectContraptionToUpdate(submitType,noticeDto,op,reginParams);
         }else {
             // 字段转换
@@ -2016,7 +2020,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         model.setCreateDate(new Date());
         model.setCreateUserName(reginParams.getUserModel().getRealName());
         model.setUseRegistCode(String.join("，", registrationNoList));
-        model.setEquList(projectContraptionList.get(0).get("equList").toString());
+        model.setEquList(projectContraptionList.get(0).get("equListName").toString());
         JgChangeRegistrationUnit registrationUnit = new JgChangeRegistrationUnit();
         BeanUtils.copyProperties(model, registrationUnit);
         setNewUnitInfo(reginParams, registrationUnit);

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

@@ -72,6 +72,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static com.alibaba.fastjson.JSON.parseArray;
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl.isValidCreditCode;
@@ -881,6 +882,11 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
                 BigDecimal strippedValue = roundedValue.stripTrailingZeros();
                 item.setPipelineLength(Double.valueOf(strippedValue.toPlainString()));
                 item.setDataSourceName(EquipSourceEnum.getDataSourceName(item.getDataSource()));
+                item.setFullAddress(
+                        Stream.of(item.getProvinceName(), item.getCityName(), item.getCountyName(), item.getStreetName(), item.getAddress())
+                                .map(value -> value == null ? "" : value)
+                                .collect(Collectors.joining())
+                );
             });
         }
         return projectContraptionPage;

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

@@ -288,9 +288,4 @@ public class IdxBizJgProjectContraption extends BaseEntity {
     @TableField(exist = false)
     private Boolean disableBasicButton;
 
-    /**
-     * 设备使用地址
-     */
-    @TableField(exist = false)
-    private String equUseAddress;
 }