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-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