工序组相关问题修改

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/group/ProcessGroupPageReqVO.java

@@ -36,4 +36,9 @@ public class ProcessGroupPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "field", example = "field")
+    private String field;
+
+    @Schema(description = "order", example = "order")
+    private String order;
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/group/ProcessGroupSaveReqVO.java

@@ -24,15 +24,12 @@ public class ProcessGroupSaveReqVO {
     private Boolean isDefault;
 
     @Schema(description = "排序优先级", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "排序优先级不能为空")
     private Short sort;
 
     @Schema(description = "明细，工序 ID 逗号分隔", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "明细，工序 ID 逗号分隔不能为空")
     private String items;
 
     @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "随便")
-    @NotEmpty(message = "描述不能为空")
     private String description;
 
     @Schema(description = "工序集合", requiredMode = Schema.RequiredMode.REQUIRED, example = "{}，{}")

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/vo/group/ProcessListSaveReqVO.java

@@ -23,18 +23,14 @@ public class ProcessListSaveReqVO {
     private Boolean isDefault;
 
     @Schema(description = "排序优先级", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "排序优先级")
     private Short sort;
 
     @Schema(description = "明细，工序 ID 逗号分隔", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "明细，工序 ID 逗号分隔不能为空")
     private String items;
 
     @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "随便")
-    @NotEmpty(message = "描述不能为空")
     private String description;
 
     @Schema(description = "工序列表", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "待添加的工序")
     private List<ProcessRespVO> lists;
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/process/ProcessGroupMapper.java

@@ -20,7 +20,7 @@ import java.util.List;
 public interface ProcessGroupMapper extends BaseMapperX<ProcessGroupDO> {
 
     default PageResult<ProcessGroupDO> selectPage(ProcessGroupPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ProcessGroupDO>()
+        LambdaQueryWrapperX<ProcessGroupDO> queryWrapper = new LambdaQueryWrapperX<ProcessGroupDO>()
                 .likeIfPresent(ProcessGroupDO::getName, reqVO.getName())
                 .eqIfPresent(ProcessGroupDO::getIsDefault, reqVO.getIsDefault())
                 .eqIfPresent(ProcessGroupDO::getSort, reqVO.getSort())
@@ -28,7 +28,24 @@ public interface ProcessGroupMapper extends BaseMapperX<ProcessGroupDO> {
                 .eqIfPresent(ProcessGroupDO::getOrganId, reqVO.getOrganId())
                 .eqIfPresent(ProcessGroupDO::getDescription, reqVO.getDescription())
                 .betweenIfPresent(ProcessGroupDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(ProcessGroupDO::getId));
+                .orderByDesc(ProcessGroupDO::getSort);
+
+        if (reqVO.getOrder() == null) {
+            queryWrapper.orderByDesc(ProcessGroupDO::getSort);
+        }else {
+            if (reqVO.getOrder().equals("ascend")) {
+                switch (reqVO.getField()) {
+                    case "name" -> queryWrapper.orderByAsc(ProcessGroupDO::getName);
+                    case "sort" -> queryWrapper.orderByAsc(ProcessGroupDO::getSort);
+                }
+            }else if (reqVO.getOrder().equals("descend")) {
+                switch (reqVO.getField()) {
+                    case "name" -> queryWrapper.orderByDesc(ProcessGroupDO::getName);
+                    case "sort" -> queryWrapper.orderByDesc(ProcessGroupDO::getSort);
+                }
+            }
+        }
+        return selectPage(reqVO, queryWrapper);
     }
 
     ProcessDO selectOneById(@Param("id") Long id, @Param("organId") Long organId);

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessGroupServiceImpl.java

@@ -184,7 +184,7 @@ public class ProcessGroupServiceImpl implements ProcessGroupService {
     private String checkProcessGroupExists(String userLists) {
         // 检查输入是否为空或仅包含空白字符
         if (userLists == null || userLists.trim().isEmpty()) {
-            return "[]"; // 统一返回空列表格式化字符串
+            return ""; // 统一返回空列表格式化字符串
         }
 
         List<String> itemsList = Arrays.stream(userLists.split(","))
@@ -194,7 +194,7 @@ public class ProcessGroupServiceImpl implements ProcessGroupService {
 
         // 如果列表为空，直接返回空字符串，表示没有有效的进程ID
         if (itemsList.isEmpty()) {
-            return "[]";
+            return "";
         }
 
         StringBuilder itemsBuilder = new StringBuilder();
@@ -229,7 +229,7 @@ public class ProcessGroupServiceImpl implements ProcessGroupService {
         }
 
         // 返回格式化的列表字符串
-        return itemsBuilder.length() > 0 ? itemsBuilder.toString() : "[]";
+        return itemsBuilder.length() > 0 ? itemsBuilder.toString() : "";
     }
 
     //    批量更新工序组默认