Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/BusinessTypeEnum.java

@@ -20,7 +20,7 @@ public enum BusinessTypeEnum {
 
     JG_ADVICE_REMOVAL("105", "移装告知"),
 
-    JG_MAINTENANCE_RECORD("106", "维保备案"),
+    JG_MAINTENANCE_RECORD("106", "维保合同备案"),
 
     JG_USAGE_REGISTRATION("107", "使用登记"),
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/SafetyProblemTypeEnum.java

@@ -16,7 +16,7 @@ public enum SafetyProblemTypeEnum {
     JYCQ("2", "检验超期", "设备检验超期", "safetyProblemTracing/jy/cq", "outOfInspectionRecords"),
     JYBJ("21", "检验报检", "设备报检", "safetyProblemTracing/jy/bj", null),
     WBCQ("1", "维保超期", "设备维保超期", "safetyProblemTracing/wb/cq", "outOfMaintenanceRecords"),
-    WBBA("11", "维保备案", "设备维保备案", "safetyProblemTracing/wb/ba", null),
+    WBBA("11", "维保合同备案", "设备维保合同备案", "safetyProblemTracing/wb/ba", null),
     ZZCQ("3", "资质超期", "企业资质超期", "safetyProblemTracing/zz/cq", null);
 
     private final String code;

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

@@ -49,79 +49,157 @@
             LEFT JOIN idx_biz_jg_other_info  other   on re.equ_id = other.RECORD
             LEFT JOIN idx_biz_jg_supervision_info ibjsi  on re.equ_id = ibjsi.RECORD
     </sql>
+    <sql id="page-list-sub-select">
+        select
+            ur.sequence_nbr as sequenceNbr,
+            ur.audit_status as auditStatus,
+            date_format(ur.reg_date,'%Y-%m-%d') as regDate,
+            ur.use_unit_name as useUnitName,
+            ur.status,
+            ur.receive_org_name as receiveOrgName,
+            ur.use_address as place,
+            ur.instance_id as instanceId,
+            ur.apply_no as applyNo,
+            ur.next_execute_ids as nextExecuteIds,
+            ur.promoter,
+            ur.use_registration_code  as useRegistrationCode,
+            date_format(ur.audit_pass_date,'%Y-%m-%d')  as auditPassDate,
+            date_format(ur.create_date,'%Y-%m-%d')  as createDate,
+            ur.receive_org_name as receiveOrgName,
+            ur.next_execute_user_ids as nextExecuteUserIds,
+            ur.next_task_id as nextTaskId,
+            ur.create_user_id as createUserId,
+            ur.rec_date as recDate,
+            ur.manage_type as manageType,
+            ur.reg_type as regType,
+            ur.is_delete,
+            ur.create_date,
+            ur.receive_company_code,
+            ur.use_unit_credit_code,
+            ur.transfer_to_user_ids,
+            ur.use_address as fullAddress,
+            ur.cancel_reason as cancelReason,
+            (select group_concat(re.equ_id) from tzs_jg_use_registration_eq re  where ur.sequence_nbr = re.equip_transfer_id) as equipId,
+            (SELECT
+                 group_concat(other.supervisory_code)
+             from
+                 idx_biz_jg_register_info jri
+                     LEFT JOIN idx_biz_jg_other_info  other   on jri.RECORD = other.RECORD where jri.RECORD in  (select re.equ_id from tzs_jg_use_registration_eq re  where ur.sequence_nbr = re.equip_transfer_id)) as supervisoryCode ,
+            (SELECT
+                 group_concat(other.CODE96333)
+             from
+                 idx_biz_jg_register_info jri
+                     LEFT JOIN idx_biz_jg_other_info  other   on jri.RECORD = other.RECORD where jri.RECORD in  (select re.equ_id from tzs_jg_use_registration_eq re  where ur.sequence_nbr = re.equip_transfer_id)) as code96333 ,
+            (SELECT
+                 group_concat(jri.PRODUCT_NAME)
+             from
+                 idx_biz_jg_register_info jri where jri.RECORD in  (select re.equ_id from tzs_jg_use_registration_eq re  where ur.sequence_nbr = re.equip_transfer_id)) as productName ,
+            (SELECT
+                 group_concat(DISTINCT jri.EQU_CODE)
+             from
+                 idx_biz_jg_register_info jri where jri.RECORD in  (select re.equ_id from tzs_jg_use_registration_eq re  where ur.sequence_nbr = re.equip_transfer_id)) as equCode ,
+            (SELECT
+                 group_concat(DISTINCT jri.EQU_LIST)
+             from
+                 idx_biz_jg_register_info jri where jri.RECORD in  (select re.equ_id from tzs_jg_use_registration_eq re  where ur.sequence_nbr = re.equip_transfer_id)) as equListCode,
+            (SELECT
+                 group_concat(DISTINCT jri.EQU_CATEGORY)
+             from
+                 idx_biz_jg_register_info jri where jri.RECORD in  (select re.equ_id from tzs_jg_use_registration_eq re  where ur.sequence_nbr = re.equip_transfer_id)) as equCategoryCode,
+            (SELECT
+                 group_concat(DISTINCT jri."EQU_DEFINE")
+             from
+                 idx_biz_jg_register_info jri where jri.RECORD in  (select re.equ_id from tzs_jg_use_registration_eq re  where ur.sequence_nbr = re.equip_transfer_id)) as equDefineCode,
+            (SELECT
+                 group_concat(DISTINCT c.name)
+             from
+                 idx_biz_jg_register_info jri,tz_equipment_category c  where jri.EQU_LIST = c.code and jri.RECORD in  (select re.equ_id from tzs_jg_use_registration_eq re  where ur.sequence_nbr = re.equip_transfer_id)) as equListName,
+             (SELECT
+                 group_concat(DISTINCT c.name)
+             from
+                 idx_biz_jg_register_info jri,tz_equipment_category c  where jri.EQU_CATEGORY = c.code and jri.RECORD in  (select re.equ_id from tzs_jg_use_registration_eq re  where ur.sequence_nbr = re.equip_transfer_id)) as equCategory,
+            (SELECT
+                 group_concat(DISTINCT c.name)
+             from
+                 idx_biz_jg_register_info jri,tz_equipment_category c  where jri.EQU_DEFINE = c.code and jri.RECORD in  (select re.equ_id from tzs_jg_use_registration_eq re  where ur.sequence_nbr = re.equip_transfer_id)) as equDefine,
+            (SELECT
+                 group_concat(DISTINCT ibjsi.ORG_BRANCH_NAME)
+             from
+                 idx_biz_jg_supervision_info ibjsi where ibjsi.RECORD in  (select re.equ_id from tzs_jg_use_registration_eq re  where ur.sequence_nbr = re.equip_transfer_id)) as orgBranchName
+        from
+            tzs_jg_use_registration ur
+    </sql>
 
     <select id="getListPage" resultType="java.util.Map">
-        <include refid="page-list"/>
+         select
+             *
+        from
+        (
+            <include refid="page-list-sub-select"/>
+        )
+
         <where>
-            ur.is_delete = 0
+            is_delete = 0
             <if test="dto.equList != null and dto.equList != ''">
-                and jri. EQU_LIST= #{dto.equList}
+                and equListCode= #{dto.equList}
             </if>
             <if test="dto.equCategory != null and dto.equCategory != ''">
-                and jri.EQU_CATEGORY = #{dto.equCategory}
+                and equCategoryCode = #{dto.equCategory}
             </if>
             <if test="dto.equDefine != null and dto.equDefine != ''">
-                and jri.EQU_DEFINE = #{dto.equDefine}
+                and equDefineCode = #{dto.equDefine}
             </if>
             <if test="dto.status != null and dto.status != ''">
-                and ur.status = #{dto.status}
+                and status = #{dto.status}
             </if>
             <if test="dto.applicationDate != null">
-                and ur.create_date like concat('%',DATE_FORMAT(#{dto.applicationDate},'%Y-%m-%d'),'%')
+                and create_date like concat('%',DATE_FORMAT(#{dto.applicationDate},'%Y-%m-%d'),'%')
             </if>
             <if test="dto.equCode != null and dto.equCode != ''">
-                and jri.EQU_CODE like concat('%',#{dto.equCode},'%')
+                and equCode like concat('%',#{dto.equCode},'%')
             </if>
             <if test="dto.code96333 != null and dto.code96333 != ''">
-                and other.CODE96333 like concat('%',#{dto.code96333},'%')
+                and code96333 like concat('%',#{dto.code96333},'%')
             </if>
             <if test="dto.supervisoryCode != null and dto.supervisoryCode != ''">
-                and other.supervisory_code like concat('%',#{dto.supervisoryCode},'%')
+                and supervisoryCode like concat('%',#{dto.supervisoryCode},'%')
             </if>
             <if test="dto.fullAddress != null and dto.fullAddress != ''">
-                AND (
-                use."PROVINCE_NAME" LIKE CONCAT('%', #{dto.fullAddress}, '%')
-                OR use."CITY_NAME" LIKE CONCAT('%', #{dto.fullAddress}, '%')
-                OR use."COUNTY_NAME" LIKE CONCAT('%', #{dto.fullAddress}, '%')
-                OR use."STREET_NAME" LIKE CONCAT('%', #{dto.fullAddress}, '%')
-                )
+              AND fullAddress LIKE CONCAT('%', #{dto.fullAddress}, '%')
             </if>
             <if test="dto.receiveCompanyCode != null and dto.receiveCompanyCode != ''">
-                AND ur.receive_company_code = #{dto.receiveCompanyCode}
+                AND receive_company_code = #{dto.receiveCompanyCode}
             </if>
             <if test="dto.useUnitName != null and dto.useUnitName != ''">
-                and ur.use_unit_name like concat('%',#{dto.useUnitName},'%')
+                and useUnitName like concat('%',#{dto.useUnitName},'%')
             </if>
             <if test="dto.applyNo != null and dto.applyNo != ''">
-                and ur.apply_no like concat('%',#{dto.applyNo},'%')
+                and applyNo like concat('%',#{dto.applyNo},'%')
             </if>
             <if test="dto.useRegistrationCode != null and dto.useRegistrationCode != ''">
-                and ur.use_registration_code like concat('%',#{dto.useRegistrationCode},'%')
+                and useRegistrationCode like concat('%',#{dto.useRegistrationCode},'%')
             </if>
             <if test="dto.useUnitCode != null and dto.useUnitCode != ''">
-                and ur.use_unit_credit_code = #{dto.useUnitCode}
+                and use_unit_credit_code = #{dto.useUnitCode}
             </if>
-<!--            <if test="roleIds != null and dto.dataType == 'supervision'">-->
-<!--                <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>-->
-<!--                    instance_status like concat('%',#{role},'%')-->
-<!--                </foreach>-->
-<!--            </if>-->
             <if test="dto.dataType == 'supervision' ">
-                AND (ur.receive_company_code = #{dto.receiveCompanyCode} or ur.transfer_to_user_ids LIKE concat ('%',
+                AND (receive_company_code = #{dto.receiveCompanyCode} or transfer_to_user_ids LIKE concat ('%',
                 #{dto.currentUserId}, '%'))
-                AND ur.status  <![CDATA[<>]]>  '使用单位待提交'
+                AND status  <![CDATA[<>]]>  '使用单位待提交'
             </if>
             <if test="dto.dataType == 'company' ">
-                AND (ur.use_unit_credit_code = #{dto.unitCode} or ur.transfer_to_user_ids LIKE concat ('%',
-                #{dto.currentUserId}, '%'))
+                AND (use_unit_credit_code = #{dto.unitCode} or transfer_to_user_ids LIKE concat ('%',#{dto.currentUserId}, '%'))
             </if>
-            GROUP BY re.equip_transfer_id
         </where>
         order by
-        <if test="sort != null">
-            ur.${sort.field} ${sort.sortType},
-        </if>
-        ur.create_date DESC, ur.apply_no DESC
+        <choose>
+            <when test="sort != null">
+                ${sort.field} ${sort.sortType}
+            </when>
+            <otherwise>
+                create_date DESC, applyNo DESC
+            </otherwise>
+        </choose>
     </select>
 
     <select id="queryRegistrationInIds" resultType="com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.RegistrationVo">

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

@@ -114,7 +114,7 @@ public class JgUseRegistrationController extends BaseController {
         Page<Map<String, Object>> list = jgUseRegistrationServiceImpl.getList(dto, sort, page, dto.getRoleIds());
         list.getRecords().forEach(x -> {
             x.put("companyType", info.getCompany().getCompanyType());
-            x.put("regTypeDesc", "1".equals(x.get("regType")) ? "历史登记" : "新增登记");
+            x.put("regType", "1".equals(x.get("regType")) ? "历史登记" : "新增登记");
         });
         return ResponseHelper.buildResponse(list);
     }

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

@@ -2011,6 +2011,30 @@ public class CommonServiceImpl implements ICommonService {
         return optionalSortMap.orElse(null);
     }
 
+    /**
+     * 排序字段不转下滑线 排序  ：页面列表排序功能支持，将 "字段,ascend" 或 "字段,descend" 转化为对应JSONObject
+     *
+     * @param sort "字段,ascend" 或 "字段,descend"
+     * @return JSONObject
+     */
+    public SortVo sortFieldConversionNoToUnderline(String sort) {
+        Optional<String> optionalSort = Optional.ofNullable(sort);
+        Optional<SortVo> optionalSortMap = optionalSort.filter(s -> !s.isEmpty())
+                .map(s -> {
+                    String[] sortParts = s.split(",");
+                    if (sortParts.length == 2) {
+                        String field = sortParts[0];
+                        String sortSituation = sortParts[1].contains("asc") ? "ASC" : "DESC";
+                        return SortVo.builder()
+                                .field(field)
+                                .sortType(sortSituation)
+                                .build();
+                    }
+                    return null;
+                });
+        return optionalSortMap.orElse(null);
+    }
+
     @Override
     public void fightUseFlagGenerate(UseFlagParamDto useFlagParamDto, HttpServletResponse response) {
         Objects.requireNonNull(useFlagParamDto, "参数不能为空");

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

@@ -1144,7 +1144,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         // 维保备案
         Map<String, Object> maintenanceDetail = jgUseRegistrationMapper.getMaintenanceDetail(record);
         if (!ObjectUtils.isEmpty(maintenanceDetail)) {
-            business = business + ",维保备案";
+            business = business + ",维保合同备案";
             objMap.putAll(maintenanceDetail);
             objMap.put("maintenanceContract", JSON.parse(Optional.ofNullable(maintenanceDetail.get("maintenanceContract")).orElse("").toString()));
             objMap.put("maintOtherAccessories", JSON.parse(Optional.ofNullable(maintenanceDetail.get("maintOtherAccessories")).orElse("").toString()));

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

@@ -275,7 +275,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     public Page<Map<String, Object>> getList(JgUseRegistrationDto dto, String sort, Page<Map<String, Object>> page, List<String> roleIds) {
-        SortVo sortMap = commonServiceImpl.sortFieldConversion(sort);
+        SortVo sortMap = commonServiceImpl.sortFieldConversionNoToUnderline(sort);
         return this.baseMapper.getListPage(page, sortMap, dto, roleIds);
     }
 

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

@@ -218,7 +218,7 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
         // 已去重行数据为集合，填充每种流程状态下单据的数量及将code->name
         return countVoSet.stream().map(c -> {
             JgBizCountBaseVo vo = new JgBizCountBaseVo();
-            vo.setBizGroup("维保备案");
+            vo.setBizGroup("维保合同备案");
             return buildJgBizCountBaseVo(countDataBOList, c, vo, mainLaunchesStatusList, false);
         }).collect(Collectors.toList());
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/superviseBusinessCategory.json

@@ -64,7 +64,7 @@
   ],
   "WBBA": [
     {
-      "name": "维保备案",
+      "name": "维保合同备案",
       "code": "WB_BA",
       "image": "upload/tzs/common/image/维保备案.png"
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/superviseBusinessCategory0715.json

@@ -62,7 +62,7 @@
   ],
   "WBBA": [
     {
-      "name": "维保备案",
+      "name": "维保合同备案",
       "code": "WB_BA",
       "image": "upload/tzs/common/image/维保备案.png"
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -92,19 +92,19 @@
   {
     "type": "106",
     "pageType": "draft",
-    "name": "维保备案",
+    "name": "维保合同备案",
     "url": "/mixuap?appId=1742358052905971713&id=1737347718667333633&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "106",
     "pageType": "edit",
-    "name": "维保备案",
+    "name": "维保合同备案",
     "url": "/mixuap?appId=1742358052905971713&id=1735612073380966402&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "106",
     "pageType": "look",
-    "name": "维保备案",
+    "name": "维保合同备案",
     "url": "/mixuap?appId=1742358052905971713&id=1735612073380966402&roleIds={roleIds}&userId={userId}&pageType=look"
   },
   {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/BusinessTypeEnum.java

@@ -20,7 +20,7 @@ public enum BusinessTypeEnum {
 
     JG_ADVICE_REMOVAL("105", "移装告知"),
 
-    JG_MAINTENANCE_RECORD("106", "维保备案"),
+    JG_MAINTENANCE_RECORD("106", "维保合同备案"),
 
     JG_USAGE_REGISTRATION("107", "使用登记"),
 

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java

@@ -2819,7 +2819,7 @@ public class JGDPStatisticsServiceImpl {
         // 维保备案
         Map<String, Object> maintenanceDetail = useRegistrationMapper.getMaintenanceDetail(record);
         if (!ObjectUtils.isEmpty(maintenanceDetail)) {
-            business = business + ",维保备案";
+            business = business + ",维保合同备案";
             objMap.putAll(maintenanceDetail);
             objMap.put("maintenanceContract", JSON.parse(Optional.ofNullable(maintenanceDetail.get("maintenanceContract")).orElse("").toString()));
             objMap.put("maintOtherAccessories", JSON.parse(Optional.ofNullable(maintenanceDetail.get("maintOtherAccessories")).orElse("").toString()));

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java

@@ -19,7 +19,7 @@ public enum ApplicationFormTypeEnum {
      * 申请单枚举
      */
     AZGZ("AZGZ", "GZ_AZ"),//安装告知
-    WBBA("WBBA", "WB_BA"),//维保备案
+    WBBA("WBBA", "WB_BA"),//维保合同备案
     SYDJ("SYDJ", "DJ_SY"),//使用登记
     SBYJ("SBYJ", "SB_YJ"),//设备移交
     GZGZ("GZGZ", "GZ_GZ"),//改造告知

pom.xml

@@ -292,30 +292,30 @@
 		<repository>
 			<id>Releases</id>
 			<name>Releases</name>
-			<url>http://113.142.68.105:8081/nexus/content/repositories/releases/</url>
+			<url>http://47.92.103.240:8081/nexus/content/repositories/releases/</url>
 		</repository>
 		<repository>
 			<id>com.e-iceblue</id>
 			<name>e-iceblue</name>
-			<url>http://113.142.68.105:8081/nexus/content/groups/public/</url>
+			<url>http://47.92.103.240:8081/nexus/content/groups/public/</url>
 		</repository>
 
 		<repository>
 			<id>Snapshots</id>
 			<name>Snapshots</name>
-			<url>http://113.142.68.105:8081/nexus/content/repositories/snapshots/</url>
+			<url>http://47.92.103.240:8081/nexus/content/repositories/snapshots/</url>
 		</repository>
 
 		<repository>
 			<id>thirdparty</id>
 			<name>thirdparty</name>
-			<url>http://113.142.68.105:8081/nexus/content/repositories/thirdparty/</url>
+			<url> http://47.92.103.240:8081/nexus/content/repositories/thirdparty/</url>
 		</repository>
 	</repositories>
 
 	<modules>
 		<module>amos-boot-biz-common</module>
-	    <module>amos-boot-system-tzs</module>
 		<module>amos-boot-data</module>
+		<module>amos-boot-system-tzs</module>
 	</modules>
 </project>
\ No newline at end of file