1.使用登记分页太慢问题处理

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/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);
     }