Merge branch 'develop_tzs_main' into develop_tzs_feat/xzspj

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TmCylinderFillingCheckService.java

@@ -57,7 +57,7 @@ public class TmCylinderFillingCheckService extends MyBaseServiceImpl<TmCylinderF
 				entity -> new MultiFieldKey(entity.getAppId(), entity.getSequenceCode(), entity.getFillingBeforeId()),
 				"appId",
 				"sequenceCode",
-				"fillBeforeId");
+				"fillingBeforeId");
 	}
 
 	private void syncCylinderFillingAfter(List<TmCylinderFillingCheckModel> model) {

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TmCylinderFillingRecordService.java

@@ -66,7 +66,7 @@ public class TmCylinderFillingRecordService extends MyBaseServiceImpl<TmCylinder
 				entity -> new MultiFieldKey(entity.getAppId(), entity.getSequenceCode(), entity.getFillingBeforeId()),
 				"appId",
 				"sequenceCode",
-				"fillingRecordId"
+				"fillingBeforeId"
 		);
 	}
 

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

@@ -324,7 +324,7 @@ public class TzsAppService {
             // 设备维保信息
             JSONObject useJsonObject = new JSONObject();
             List maintenanceList = new ArrayList();
-            getGroupList(null, record, MaintenanceInfo.class, MaintenanceInfoModelForWX.class, maintenanceInfoService, maintenanceList, false, dictionaryList, equipmentCategories);
+            getGroupList(null, record, MaintenanceInfo.class, MaintenanceInfoModelForWX.class, maintenanceInfoService, maintenanceList, true, dictionaryList, equipmentCategories);
             useJsonObject.put("title", "设备维保信息");
             if (maintenanceList.size() > 1) {
                 List maintenanceList1 = new ArrayList();

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

@@ -28,6 +28,10 @@ public interface JgUseRegistrationManageMapper extends BaseMapper<JgUseRegistrat
                                                   @Param("dto") JgUseRegistrationManageDto dto,
                                                   @Param("sort") SortVo sortMap);
 
+    Page<JgUseRegistrationManageDto> queryForUnitChangePage(@Param("page") Page<JgUseRegistrationManageDto> page,
+                                                  @Param("dto") JgUseRegistrationManageDto dto,
+                                                  @Param("sort") SortVo sortMap);
+
     Page<JgUseRegistrationManageDto> queryForPageForJG(@Param("page") Page<JgUseRegistrationManageDto> page,
                                                   @Param("dto") JgUseRegistrationManageDto dto,
                                                   @Param("sort") SortVo sortMap, @Param("orgCode") String orgCode);

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

@@ -3499,7 +3499,7 @@
     </select>
 
     <select id="queryTcmUnitSeqByCreditCode" resultType="java.lang.String">
-        select sequence_nbr seq from tzs_tcm_unit_info where unit_code = #{unitCreditCode}
+        select sequence_nbr seq from tzs_tcm_unit_info where (unit_code = #{unitCreditCode} or unit_name = #{unitCreditCode})
         <if test="unitType != null and unitType != ''">
             and unit_type in
             <foreach item="item" index="index" collection="unitType.split(',')" open="(" separator="," close=")">

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

@@ -159,6 +159,105 @@
             tjurm.create_date DESC
         </where>
     </select>
+    <select id="queryForUnitChangePage" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto">
+        <include refid="page_list"/>
+        ,estate.sequence_nbr AS estateUnitName
+        FROM tzs_jg_use_registration_manage tjurm
+        LEFT JOIN (
+        SELECT DISTINCT ON (ri.use_org_code)
+        ri.use_org_code, ei.sequence_nbr
+        FROM idx_biz_jg_register_info ri
+        JOIN idx_biz_jg_use_info ui ON ui.record = ri.record
+        JOIN tzs_tcm_unit_info ei ON ei.unit_code = ui.ESTATE_UNIT_CREDIT_CODE
+        <where>
+            <if test="dto.equListCode != null and dto.equListCode != ''">
+                and ri.EQU_LIST = #{dto.equListCode}
+            </if>
+            <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
+                and ri."EQU_CATEGORY" = #{dto.equCategoryCode}
+            </if>
+            <if test="dto.dataType == 'company' ">
+                AND ui."USE_UNIT_CREDIT_CODE" = #{dto.useUnitCreditCode}
+            </if>
+        </where>
+        ORDER BY ri.use_org_code, ui.rec_date DESC
+        ) estate ON estate.use_org_code = tjurm.use_registration_code
+        <where>
+            tjurm.is_delete = 0
+            <if test="dto.equList != null and dto.equList != ''">
+                and tjurm.equ_list = #{dto.equList}
+            </if>
+            <if test="dto.equListCode != null and dto.equListCode != ''">
+                and tjurm.equ_list_code = #{dto.equListCode}
+            </if>
+            <if test="dto.equCategory != null and dto.equCategory != ''">
+                and tjurm.equ_category = #{dto.equCategory}
+            </if>
+            <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
+                and tjurm.equ_category_code = #{dto.equCategoryCode}
+            </if>
+            <if test="dto.equDefine != null and dto.equDefine != ''">
+                and tjurm.equ_define = #{dto.equDefine}
+            </if>
+            <if test="dto.equDefineCode != null and dto.equDefineCode != ''">
+                and tjurm.equ_define_code = #{dto.equDefineCode}
+            </if>
+            <if test="dto.useRegistrationCode != null and dto.useRegistrationCode != ''">
+                and tjurm.use_registration_code like concat('%',#{dto.useRegistrationCode},'%')
+            </if>
+            <if test="dto.applyNo != null and dto.applyNo != ''">
+                and tjurm.apply_no like concat('%',#{dto.applyNo},'%')
+            </if>
+            <if test="dto.certificateNo != null and dto.certificateNo != ''">
+                and tjurm.certificate_no = #{dto.certificateNo}
+            </if>
+            <if test="dto.auditPassDate != null and dto.auditPassDate != ''">
+                and tjurm.audit_pass_date like concat('%',DATE_FORMAT(#{dto.auditPassDate},'%Y-%m-%d'),'%')
+            </if>
+            <if test="dto.certificateStatus != null and dto.certificateStatus != ''">
+                and tjurm.certificate_status = #{dto.certificateStatus}
+            </if>
+            <if test="dto.useUnitCreditCodeForSearch != null and dto.useUnitCreditCodeForSearch != ''">
+                and tjurm.use_unit_credit_code = #{dto.useUnitCreditCodeForSearch}
+            </if>
+            <if test="dto.useUnitCreditNameForSearch != null and dto.useUnitCreditNameForSearch != ''">
+                and tjurm.use_unit_name like concat ('%',#{dto.useUnitCreditNameForSearch},'%')
+            </if>
+            <if test="dto.receiveCompanyCode != null and dto.receiveCompanyCode != ''">
+                and (tjurm.receive_company_code = #{dto.receiveCompanyCode}
+                or tjurm.receive_company_code is null or tjurm.receive_company_code = '')
+            </if>
+            <if test="dto.dataType == 'company' ">
+                AND tjurm.use_unit_credit_code = #{dto.useUnitCreditCode}
+            </if>
+            <if test="dto.dataType == 'supervision' ">
+                AND tjurm.receive_company_code = #{dto.receiveCompanyCode}
+            </if>
+            <if test="dto.whetherVehicleCylinder != null and dto.whetherVehicleCylinder == 1 ">
+                AND tjurm.reg_type = '车用气瓶登记'
+            </if>
+            <if test="dto.isScrap != null and dto.isScrap != ''">
+                and tjurm.is_scrap = #{dto.isScrap}
+            </if>
+            <if test="dto.isDoBusiness != null and dto.isDoBusiness != ''">
+                and tjurm.is_do_business = #{dto.isDoBusiness}
+            </if>
+            <if test="dto.cityName != null and dto.cityName != ''">
+                and tjurm.equ_use_address LIKE CONCAT('%', #{dto.cityName}, '%')
+            </if>
+            <if test="dto.carNumber != null and dto.carNumber != ''">
+                and tjurm.car_number LIKE CONCAT('%', #{dto.carNumber}, '%')
+            </if>
+            <if test="dto.certInBusinessFlag != null and dto.certInBusinessFlag != '' and dto.certInBusinessFlag == 'false'">
+                and NOT EXISTS ( <include refid="useRegCertInBusiness"/> )
+            </if>
+            ORDER BY
+            <if test="sort != null">
+                tjurm.${sort.field} ${sort.sortType},
+            </if>
+            tjurm.create_date DESC
+        </where>
+    </select>
     <select id="queryForPageForJG" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto">
         <include refid="page_list"/>
         from tzs_jg_use_registration_manage tjurm
@@ -589,7 +688,7 @@
         ri.use_org_code, ei.sequence_nbr
         FROM idx_biz_jg_register_info ri
         JOIN idx_biz_jg_use_info ui ON ui.record = ri.record
-        JOIN tz_base_enterprise_info ei ON ei.use_unit_code = ui.ESTATE_UNIT_CREDIT_CODE
+        JOIN tzs_tcm_unit_info ei ON ei.unit_code = ui.ESTATE_UNIT_CREDIT_CODE
         <where>
             <if test="dto.equListCode != null and dto.equListCode != ''">
                 and ri.EQU_LIST = #{dto.equListCode}

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

@@ -341,7 +341,7 @@ public class JgUseRegistrationManageController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/unitChange/page")
-    @ApiOperation(httpMethod = "GET", value = "单位变更分页查询", notes = "单位变更分页查询")
+    @ApiOperation(httpMethod = "GET", value = "单位变更分页查询-带产权单位", notes = "单位变更分页查询-带产权单位")
     @FieldMapping({@FieldMapping.FieldMap(sourceField = "useUnitSeq", targetField = "originalUseUnitCreditCode", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitCreditInfoBySeq")})
     public ResponseModel<Page<JgUseRegistrationManageDto>> queryForUnitChangePage(JgUseRegistrationManageDto dto,
                                                                         @RequestParam(value = "sort", required = false) String sort,
@@ -361,7 +361,7 @@ public class JgUseRegistrationManageController extends BaseController {
             return ResponseHelper.buildResponse(page);
         }
         dto.setIsDoBusiness("1");
-        return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePage(page, dto, sort));
+        return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryForUnitChangePage(page, dto, sort));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/SingleEquipChangeProcess.java

@@ -285,7 +285,7 @@ public class SingleEquipChangeProcess implements IEquipChangeDataProcessStrategy
     private void beforeCheckForUseOrgCode(IdxBizJgUseInfo useInfoOld, IdxBizJgRegisterInfo registerInfoNew) {
         // 1.使用登记证编辑时重复性校验
         if (!CylinderTypeEnum.CYLINDER.getCode().equals(registerInfoNew.getEquCategory())) {  // 非气瓶逻辑,所有设备不能重复
-            if (useInfoOld.getDataSource().equals("jg_his") && StringUtils.isNotEmpty(registerInfoNew.getUseOrgCode())) {
+            if (useInfoOld.getDataSource().startsWith("jg_his") && StringUtils.isNotEmpty(registerInfoNew.getUseOrgCode())) {
                 Boolean isUsed = commonEquipDataProcessService.getCommonService().useRegistrationCertificateAccountUnique(registerInfoNew.getUseOrgCode(), useInfoOld.getRecord());
                 if (isUsed) {
                     throw new BadRequest("使用登记证编号已存在！");

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

@@ -1965,7 +1965,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         StringBuilder businessBuilder = new StringBuilder(business);
         if (!ObjectUtils.isEmpty(useRegistrationCode)) {
             List<JgUseRegistrationManage> regs = jgUseRegistrationManageService.lambdaQuery()
-                    .select(JgUseRegistrationManage::getReceiveOrgName,
+                    .select(JgUseRegistrationManage::getSequenceNbr,
+                            JgUseRegistrationManage::getReceiveOrgName,
                             JgUseRegistrationManage::getReceiveCompanyCode)
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode)
                     .eq(JgUseRegistrationManage::getIsDelete, false)

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

@@ -335,6 +335,20 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
     }
 
     /**
+     * 单位变更证-查询
+     */
+    public Page<JgUseRegistrationManageDto> queryForUnitChangePage(Page<JgUseRegistrationManageDto> page,
+                                                                                JgUseRegistrationManageDto dto,
+                                                                                String sort) {
+        SortVo sortMap = commonServiceImpl.sortFieldConversion(sort);
+        if (ApplicationFormTypeEnum.BF.getBusinessCode().equals(dto.getApplyType()) && (!CylinderTypeEnum.CYLINDER.getCode().equals(dto.getEquCategoryCode()) || dto.getRegType().equals(BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName()))){
+            dto.setCertificateStatus(null);
+            dto.setIsScrap("0");
+        }
+        return jgUseRegistrationManageMapper.queryForUnitChangePage(page, dto, sortMap);
+    }
+
+    /**
      * 分页查询证管理表-选择证使用，添加产权单位id
      */
     public Page<JgUseRegistrationManageDto> queryUseRegistrationManagePage(Page<JgUseRegistrationManageDto> page,

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

@@ -161,6 +161,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
     private static final String DEFINITION_KEY = "useRegistration";
     private static final String JIAN_CHA_ROLE_ID = "1864242478501093377";
+    private static final int ONCE_MAX_SUBMIT = 5000;
     private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");;
     private static final int BATCH_SIZE = 1000;
     private final List<String> NOT_FLOWING_STATE = Arrays.asList("使用单位待提交", "一级受理已驳回", "使用单位已撤回", "已作废");
@@ -940,6 +941,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 if (!ObjectUtils.isEmpty(map.get("submit")) && hasExistingCertificate && map.get("isAddEquip").equals("0")) {
                     throw new BadRequest("该企业已存在气瓶证书，请选择增补功能进行登记！");
                 }
+                if (equipmentLists.size() > ONCE_MAX_SUBMIT) {
+                    throw new BadRequest("单次提交最多允许 " + ONCE_MAX_SUBMIT + " 条数据，请分批提交！");
+                }
             }
 
             // 压力管道逻辑(如果是合并到已有证的工程装置，需要去除已完成设备)
@@ -1030,8 +1034,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             if (!ValidationUtil.isEmpty(map.getString("estateUnitSeq"))) {
                 String estateUnitSeq = String.valueOf(map.getString("estateUnitSeq"));
                 Map<String, String> propertyUnitInfo = commonServiceImpl.queryTcmUnitInfoBySeq(estateUnitSeq, TcmUnitTypeEnum.CQ.getCode());
-                map.put("estateUnitCode", propertyUnitInfo.get("unitCode"));
-                map.put("estateUnitName", propertyUnitInfo.get("unitName"));
+                map.put("estateUnitCode", MapUtil.getStr(propertyUnitInfo, "unitCode"));
+                map.put("estateUnitName", MapUtil.getStr(propertyUnitInfo, "unitCode") + "_" + MapUtil.getStr(propertyUnitInfo, "unitName"));
             }
 
             // 使用地点
@@ -3272,9 +3276,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      */
     void fillHistoryDataWithNewEquip(JSONObject jsonObject, JgUseRegistration jgUseRegistration, String record) {
         // 非已完成、非作废时显示设备最新信息。前置需求：一个设备只能同时发起一个流程
+        // 流程中的新设备处理逻辑（历史有证已完成不执行、历史黑设备在使用登记编辑维保、安装信息，所以详情从json取）
         if (!(FlowStatusEnum.TO_BE_FINISHED.getName().equals(jgUseRegistration.getStatus())
                 || FlowStatusEnum.TO_BE_DISCARD.getName().equals(jgUseRegistration.getStatus()))
-                || "1".equals(jgUseRegistration.getRegType())) {
+                && !"2".equals(jgUseRegistration.getRegType())) {
             fillLastEquipDetail(jsonObject, record);
         }
     }
@@ -3283,7 +3288,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 基本信息 + 制造信息 + 设计信息
         fillLastEquipBaseInfo(jsonObject, record);
         // 安装信息
-        if (!jsonObject.containsKey("installationIsComplete")) {
+
         Map<String, Object> installDetail = this.baseMapper.getInstallDetail(record);
         // 历史设备登记来的数据没有安装业务信息 从一码通数据拿
         if (ValidationUtil.isEmpty(installDetail)) {
@@ -3292,7 +3297,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         if (!ObjectUtils.isEmpty(installDetail)) {
             jsonObject.putAll(installDetail);
         }
-        }
+
         // 维保信息
         Map<String, Object> maintenanceDetail = this.baseMapper.getMaintenanceDetail(record);
         // 历史设备登记来的数据没有维保业务信息 从一码通数据拿
@@ -4500,20 +4505,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     useInfo.setStreetName(useStreetName);
                     useInfo.setAddress(String.valueOf(map.get("address")));
                     useInfo.setIsNotXiXian(String.valueOf(map.get("isXixian")));
-                    useInfo.setEstateUnitCreditCode(Optional.ofNullable(map.get("estateUnitName"))
-                            .map(Object::toString)
-                            .filter(s -> s.contains("_"))
-                            .map(s -> s.split("_", 2))
-                            .filter(parts -> parts.length == 2)
-                            .map(parts -> parts[0])
-                            .orElse(null));
-                    useInfo.setEstateUnitName(Optional.ofNullable(map.get("estateUnitName"))
-                            .map(Object::toString)
-                            .filter(s -> s.contains("_"))
-                            .map(s -> s.split("_", 2))
-                            .filter(parts -> parts.length == 2)
-                            .map(parts -> parts[1])
-                            .orElse(null));
+                    if (!ValidationUtil.isEmpty(MapUtil.getStr(map, "estateUnitName")) && MapUtil.getStr(map, "estateUnitName").split("_").length == 2) {
+                        useInfo.setEstateUnitCreditCode(MapUtil.getStr(map, "estateUnitName").split("_")[0]);
+                        useInfo.setEstateUnitName(MapUtil.getStr(map, "estateUnitName").split("_")[1]);
+                    } else {
+                        Map<String, String> propertyUnitInfo = commonServiceImpl.queryTcmUnitInfoBySeq(MapUtil.getStr(map, "estateUnitName"), TcmUnitTypeEnum.CQ.getCode());
+                        useInfo.setEstateUnitCreditCode(MapUtil.getStr(propertyUnitInfo, "unitCode"));
+                        useInfo.setEstateUnitName(MapUtil.getStr(propertyUnitInfo, "unitName"));
+                    }
                     useInfo.setPhone(String.valueOf(map.get("phone")));
                     useInfo.setSafetyManager(map.getString("safetyManagerName"));
                     useInfo.setSafetyManagerId(map.getString("safetyManagerId"));

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzBaseEnterpriseInfoController.java

@@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.component.event.RestEventTrigger;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -383,6 +384,7 @@ public class TzBaseEnterpriseInfoController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/deleteBatch")
     @ApiOperation(httpMethod = "DELETE", value = "批量删除企业", notes = "批量删除企业")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<Boolean> deleteBatch(@RequestParam String ids) {
         return ResponseHelper.buildResponse(enterpriseManageService.delete(Arrays.asList(ids.split(","))));
     }
@@ -390,6 +392,7 @@ public class TzBaseEnterpriseInfoController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PutMapping(value = "/enableBatch")
     @ApiOperation(httpMethod = "PUT", value = "企业启用", notes = "企业启用")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<Boolean> enableBatch(@RequestParam String ids) {
         return ResponseHelper.buildResponse(enterpriseManageService.enable(Arrays.asList(ids.split(","))));
     }
@@ -397,6 +400,7 @@ public class TzBaseEnterpriseInfoController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PutMapping(value = "/disableBatch")
     @ApiOperation(httpMethod = "PUT", value = "企业停用", notes = "企业停用")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<Boolean> disableBatch(@RequestParam String ids) {
         return ResponseHelper.buildResponse(enterpriseManageService.disable(Arrays.asList(ids.split(","))));
     }