feature:管道安装告知详情调整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgInstallationNoticeMapper.java

@@ -47,5 +47,5 @@ public interface JgInstallationNoticeMapper extends CustomBaseMapper<JgInstallat
 
     List<Map<String, Object>> getDeviceListByProjectContraption(@Param("projectContraptionSeq") String projectContraptionSeq);
 
-    Map<String, Object> getPipelineEquInfoByRecord(@Param("record") String record);
+    List<Map<String, Object>> getPipelineEquInfoByRecords(@Param("records") List<String> records);
 }

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

@@ -293,12 +293,16 @@
         </where>
     </select>
 
-    <select id="getPipelineEquInfoByRecord" resultType="java.util.Map">
+    <select id="getPipelineEquInfoByRecords" resultType="java.util.Map">
         <include refid="page-list-pipeline"/>
         <where>
-            <if test="record != null and record != ''">
-                and ui."RECORD" = #{record}
+            <if test="records != null and !records.isEmpty()">
+                and ui."RECORD" in
+                <foreach collection="records" item="record" open="(" close=")" separator=",">
+                    #{record}
+                </foreach>
             </if>
+
         </where>
     </select>
 

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

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.component.event.RestEventTrigger;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -167,7 +168,7 @@ public class JgInstallationNoticeController extends BaseController {
             notes = "查询工程装置下的所有未做安装告知、不在安装告知流程、安装告知作废的设备")
     @GetMapping(value = "/getDeviceListByProjectContraptionSeq")
     public ResponseModel<Object> getDeviceListByProjectContraption(@RequestParam Map<String, Object> params) {
-        String projectContraptionSeq = String.valueOf(params.get("sequenceNbr"));
+        String projectContraptionSeq = ValidationUtil.isEmpty(params.get("sequenceNbr")) ? String.valueOf(params.get("record")) : params.get("sequenceNbr").toString();
         return ResponseHelper.buildResponse(iJgInstallationNoticeService.getDeviceListByProjectContraption(projectContraptionSeq));
     }
 }

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

@@ -14,8 +14,9 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
+import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -91,13 +92,11 @@ public class DataHandlerServiceImpl {
                                 new TypeReference<ArrayList<Map<String, Object>>>() {
                                 }
                         );
-                        deviceList.forEach(device -> {
-                            String record = String.valueOf(device.get("record"));
-                            Map<String, Object> pipelineEquInfo = installationNoticeService.getBaseMapper().getPipelineEquInfoByRecord(record);
-                            device.putAll(pipelineEquInfo);
-                        });
-                        // 更新处理后的数据回到 history 对象
-                        hisData.put("deviceList", deviceList);
+                        if (!ValidationUtil.isEmpty(deviceList)) {
+                            List<Map<String, Object>> pipelineListInfo = installationNoticeService.getBaseMapper().getPipelineEquInfoByRecords(deviceList.stream().map(device -> String.valueOf(device.get("record"))).collect(Collectors.toList()));
+                            // 更新处理后的数据回到 history 对象
+                            hisData.put("deviceList", pipelineListInfo);
+                        }
                         history.setChangeData(objectMapper.writeValueAsString(hisData)); // 更新 changeData 字段
                     } catch (Exception e) {
                         log.error("JSON 数据处理失败!", e);

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.util.StringUtil;
+import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
@@ -26,6 +27,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.PipelineEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper;
@@ -171,7 +173,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
     @Autowired
     private IdxBizJgFactoryInfoServiceImpl idxBizJgFactoryInfoService;
-
+    @Autowired
+    private IdxBizJgProjectContraptionServiceImpl projectContraptionService;
     @Autowired
     private ObjectMapper objectMapper;
 
@@ -322,12 +325,21 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
 
 
     private Map<String, Object> setNewEquipData(String companyLevel, Map<String, Object> installationInfo) {
+        List<Map<String, Object>> equipListMaps = Lists.newArrayList();
+        String equCategory = (String) installationInfo.get("equCategoryCode");
         LambdaQueryWrapper<JgInstallationNoticeEq> lambda = new QueryWrapper<JgInstallationNoticeEq>().lambda();
         lambda.eq(JgInstallationNoticeEq::getEquipTransferId, installationInfo.get("sequenceNbr"));
         List<JgInstallationNoticeEq> jgInstallationNoticeEqs = jgInstallationNoticeEqMapper.selectList(lambda);
-        List<String> ids = jgInstallationNoticeEqs.stream().map(item -> item.getEquId()).collect(Collectors.toList());
-        Iterable<ESEquipmentCategoryDto> equips = esEquipmentCategory.findAllById(ids);
-        List<Map<String, Object>> equipListMaps = getEquipListMaps(equips);
+        if (!ValidationUtil.isEmpty(jgInstallationNoticeEqs)) {
+            List<String> ids = jgInstallationNoticeEqs.stream().map(item -> item.getEquId()).collect(Collectors.toList());
+            // 压力管道从工程装置表查询设备信息
+            if (PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(equCategory)) {
+                equipListMaps = jgInstallationNoticeMapper.getPipelineEquInfoByRecords(ids);
+            } else {
+                Iterable<ESEquipmentCategoryDto> equips = esEquipmentCategory.findAllById(ids);
+                equipListMaps = getEquipListMaps(equips);
+            }
+        }
 
 //        Map<String, Object> detail = equipmentInfos.get(0);
 //        Map<String, Object> equInfo = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(detail.get("equId").toString());
@@ -1712,8 +1724,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
      */
     @Override
     public Object getDeviceListByProjectContraption(String projectContraptionSeq) {
+        IdxBizJgProjectContraption projectContraption = projectContraptionService.getById(projectContraptionSeq);
+        if (ValidationUtil.isEmpty(projectContraption)) {
+            return null;
+        }
         List<Map<String, Object>> deviceList = this.baseMapper.getDeviceListByProjectContraption(projectContraptionSeq);
-        return new JSONObject().fluentPut("deviceList", deviceList);
+        return new JSONObject().fluentPut("deviceList", deviceList).fluentPut("projectContraption", projectContraption.getProjectContraption()).fluentPut("projectContraptionNo", projectContraption.getProjectContraptionNo()).fluentPut("pipelineLength", projectContraption.getPipelineLength());
     }
 
     @Override

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

@@ -6,7 +6,6 @@ import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -14,7 +13,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
-import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -53,18 +52,14 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.foundation.exception.BaseException;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.exception.instance.TooManyRequests;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 /**
@@ -134,7 +129,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 		// 使用单位资质
 		COMPANY_TYPE_CERT_TYPE_MAP.put("使用单位", "1232");
 		// 检验检测机构资质：细分为1233-1、1233-2
-		COMPANY_TYPE_CERT_TYPE_MAP.put("检验检测机构", "1233");
+		COMPANY_TYPE_CERT_TYPE_MAP.put("检验检测机构", "1233-1,1233-2");
 		// 安装改造维修单位身份资质：充装单位-1231 制造单位-1236 设计单位-1235 安装改造维修单位-1234
 		COMPANY_TYPE_CERT_TYPE_MAP.put("安装改造维修单位", "1231,1234,1235,1236");
 	}

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgProjectContraptionMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 import java.util.Map;