feat:新增commomn模块

pom.xml

@@ -25,6 +25,7 @@
         <module>yudao-module-erp</module>
         <module>yudao-module-mes</module>
         <module>yudao-module-iot</module>
+        <module>yudao-module-common</module>
     </modules>
     <name>${project.artifactId}</name>
     <description>芋道项目基础脚手架</description>

yudao-module-common/pom.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>cn.iocoder.boot</groupId>
+        <artifactId>yudao</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <modules>
+        <module>yudao-module-common-api</module>
+        <module>yudao-module-common-biz</module>
+    </modules>
+    <artifactId>yudao-module-common</artifactId>
+    <packaging>pom</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        common 模块下，存放通用的业务逻辑和工具类，供其他模块调用。
+    </description>
+
+</project>

yudao-module-common/yudao-module-common-api/pom.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>yudao-module-common</artifactId>
+        <groupId>cn.iocoder.boot</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>yudao-module-common-api</artifactId>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>common 模块 API，暴露给其它模块调用</description>
+
+    <dependencies>
+        <!-- 核心库 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-common</artifactId>
+        </dependency>
+
+        <!-- Validation -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+</project>

yudao-module-common/yudao-module-common-biz/pom.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>yudao-module-common</artifactId>
+        <groupId>cn.iocoder.boot</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>yudao-module-common-biz</artifactId>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>common 模块业务实现</description>
+
+    <dependencies>
+        <!-- 模块自身 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-common-api</artifactId>
+            <version>${revision}</version> <!-- 添加这一行 -->
+        </dependency>
+
+        <!-- 框架相关 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-mybatis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <!-- 业务组件 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-biz-data-permission</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-biz-ip</artifactId>
+        </dependency>
+
+        <!-- 工具类 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-spring-boot-starter-excel</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipe/RecipeController.java

@@ -71,21 +71,22 @@ public class RecipeController {
         return success(BeanUtils.toBean(recipe, RecipeRespVO.class));
     }
 
-//    @GetMapping("/page")
+    //    @GetMapping("/page")
 //    @Operation(summary = "获得配方管理主分页")
 //    @PreAuthorize("@ss.hasPermission('iot:recipe:query')")
 //    public CommonResult<PageResult<RecipeRespVO>> getRecipePage(@Valid RecipePageReqVO pageReqVO) {
 //        PageResult<RecipeDO> pageResult = recipeService.getRecipePage(pageReqVO);
 //        return success(BeanUtils.toBean(pageResult, RecipeRespVO.class));
 //    }
-@GetMapping("/page")
-@Operation(summary = "获得配方管理主分页")
-@PreAuthorize("@ss.hasPermission('iot:recipe:query')")
-public CommonResult<PageResult<RecipeRespVO>> getRecipePage(@Valid RecipePageReqVO pageReqVO) {
-    // 直接调用实现类的方法，无类型转换
-    PageResult<RecipeRespVO> pageResult = recipeService.getRecipePageWithDeviceId(pageReqVO);
-    return success(pageResult);
-}
+    @GetMapping("/page")
+    @Operation(summary = "获得配方管理主分页")
+    @PreAuthorize("@ss.hasPermission('iot:recipe:query')")
+    public CommonResult<PageResult<RecipeRespVO>> getRecipePage(@Valid RecipePageReqVO pageReqVO) {
+
+        // 直接调用实现类的方法，无类型转换
+        PageResult<RecipeRespVO> pageResult = recipeService.getRecipePageWithDeviceId(pageReqVO);
+        return success(pageResult);
+    }
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出配方管理主 Excel")

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/vo/MoldRepairRespVO.java

@@ -82,8 +82,8 @@ public class MoldRepairRespVO {
     private String confirmBy;
 
     @Schema(description = "单据状态", example = "1")
-    @ExcelProperty(value = "单据状态 0-待完成 1-已完成")
-    @DictFormat("mes_mold_record_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
+//    @ExcelProperty(value = "单据状态 0-待完成 1-已完成")
+//    @DictFormat("mes_mold_record_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
     private Integer status;
 
     @Schema(description = "单据状态", example = "1")

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldtaskmanagement/MoldTaskManagementController.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.mes.controller.admin.moldtaskmanagement;
 
 import cn.iocoder.yudao.module.mes.controller.admin.planmaintenance.vo.PlanMaintenanceRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.zjtask.vo.ZjTaskRespVO;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import org.springframework.web.bind.annotation.*;
@@ -98,18 +99,33 @@ public class MoldTaskManagementController {
     @Operation(summary = "导出任务管理 Excel")
     @PreAuthorize("@ss.hasPermission('mes:mold-task-management:export')")
     @ApiAccessLog(operateType = EXPORT)
-    public void exportMoldTaskManagementExcel(@Valid MoldTaskManagementPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
+    public void exportMoldTaskManagementExcel(@Valid MoldTaskManagementPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<MoldTaskManagementDO> list = moldtaskManagementService.getMoldTaskManagementPage(pageReqVO).getList();
         List<MoldTaskManagementRespVO> moldtaskManagementRespVOList = BeanUtils.toBean(list, MoldTaskManagementRespVO.class);
 
-        for (MoldTaskManagementRespVO planMaintenanceRespVO : moldtaskManagementRespVOList) {
-            AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(planMaintenanceRespVO.getCreator()));
-            planMaintenanceRespVO.setCreatorName( "(" + user.getUsername()+ ")" + user.getNickname());
+        for (MoldTaskManagementRespVO moldTaskManagementRespVO : moldtaskManagementRespVOList) {
+            AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(moldTaskManagementRespVO.getCreator()));
+            moldTaskManagementRespVO.setCreatorName("(" + user.getUsername() + ")" + user.getNickname());
+
+            // 修复：使用实例方法而不是静态方法
+            if (moldTaskManagementRespVO.getTaskType() != null) {
+                switch (moldTaskManagementRespVO.getTaskType()) {
+                    case 1:
+                        moldTaskManagementRespVO.setTaskTypeName("点检");
+                        break;
+                    case 2:
+                        moldTaskManagementRespVO.setTaskTypeName("保养");
+                        break;
+                    default:
+                        moldTaskManagementRespVO.setTaskTypeName(null);
+                        break;
+                }
+            }
         }
-        // 导出 Excel
-        ExcelUtils.write(response, "模具类型.xls", "数据", MoldTaskManagementRespVO.class,moldtaskManagementRespVOList);
+
+        // 修复：使用正确的Excel文件名
+        ExcelUtils.write(response, "任务管理.xls", "数据", MoldTaskManagementRespVO.class, moldtaskManagementRespVOList);
     }
 
 

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldtaskmanagement/vo/MoldTaskManagementRespVO.java

@@ -29,11 +29,15 @@ public class MoldTaskManagementRespVO extends BaseDO {
     private String name;
 
     @Schema(description = "类型(1-点检 2-保养)", example = "2")
-    @ExcelProperty("类型(1-点检 2-保养)")
+//    @ExcelProperty("类型(1-点检 2-保养)")
     private Integer taskType;
 
+    @Schema(description = "类型(1-点检 2-保养)", example = "2")
+    @ExcelProperty("类型")
+    private String taskTypeName;
+
     @Schema(description = "模具列表")
-    @ExcelProperty("模具列表")
+//    @ExcelProperty("模具列表")
     private String moldList;
 
     @Schema(description = "项目表单")
@@ -55,7 +59,7 @@ public class MoldTaskManagementRespVO extends BaseDO {
     private String cronExpression;
 
     @Schema(description = "可操作人")
-    @ExcelProperty("可操作人")
+//    @ExcelProperty("可操作人")
     private String operableUsers;
 
     @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED)

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjitem/vo/ZjItemPageReqVO.java

@@ -43,4 +43,7 @@ public class ZjItemPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "ids集合导出用")
+    private String ids;
+
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjschema/vo/ZjSchemaPageReqVO.java

@@ -37,4 +37,7 @@ public class ZjSchemaPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "ids集合导出用")
+    private String ids;
+
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/ZjTaskController.java

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.mes.controller.admin.zjtask;
 
+import cn.iocoder.yudao.module.mes.controller.admin.moldrepair.vo.MoldRepairRespVO;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -83,13 +85,30 @@ public class ZjTaskController {
     @Operation(summary = "导出质量管理-检验任务 Excel")
     @PreAuthorize("@ss.hasPermission('mes:zj-task:export')")
     @ApiAccessLog(operateType = EXPORT)
-    public void exportZjTaskExcel(@Valid ZjTaskPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
+    public void exportZjTaskExcel(@Valid ZjTaskPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<ZjTaskDO> list = zjTaskService.getZjTaskPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "质量管理-检验任务.xls", "数据", ZjTaskRespVO.class,
-                        BeanUtils.toBean(list, ZjTaskRespVO.class));
+        List<ZjTaskRespVO> zjTaskRespVOList = BeanUtils.toBean(list, ZjTaskRespVO.class);
+        for (ZjTaskRespVO zjTaskRespVO : zjTaskRespVOList) {
+            if (zjTaskRespVO.getResult() != null) {
+                switch (zjTaskRespVO.getResult()) {
+                    case "0":
+                        zjTaskRespVO.setResultName(null);
+                        break;
+                    case "1":
+                        zjTaskRespVO.setResultName("通过");
+                        break;
+                    case "2":
+                        zjTaskRespVO.setResultName("不通过");
+                        break;
+                    default:
+                        zjTaskRespVO.setResultName(null);
+                        break;
+                }
+            }
+        }
+        // 使用处理后的zjTaskRespVOList进行导出
+        ExcelUtils.write(response, "质量管理-检验任务.xls", "数据", ZjTaskRespVO.class, zjTaskRespVOList);
     }
 
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskPageReqVO.java

@@ -65,4 +65,7 @@ public class ZjTaskPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] executeTime;
 
+    @Schema(description = "ids集合导出用")
+    private String ids;
+
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/vo/ZjTaskRespVO.java

@@ -75,9 +75,13 @@ public class ZjTaskRespVO {
     private Integer status;
 
     @Schema(description = "结果")
-    @ExcelProperty("结果（0=待完成，1=通过，2=不通过）")
+//    @ExcelProperty("结果（0=待完成，1=通过，2=不通过）")
     private String result;
 
+    @Schema(description = "结果")
+    @ExcelProperty("结果")
+    private String resultName;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     @ColumnWidth(20)

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtype/vo/ZjTypePageReqVO.java

@@ -28,4 +28,7 @@ public class ZjTypePageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "ids集合导出用")
+    private String ids;
+
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjitem/ZjItemMapper.java

@@ -1,11 +1,14 @@
 package cn.iocoder.yudao.module.mes.dal.mysql.zjitem;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.zjitem.ZjItemDO;
+import com.alibaba.excel.util.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.mes.controller.admin.zjitem.vo.*;
 
@@ -18,7 +21,8 @@ import cn.iocoder.yudao.module.mes.controller.admin.zjitem.vo.*;
 public interface ZjItemMapper extends BaseMapperX<ZjItemDO> {
 
     default PageResult<ZjItemDO> selectPage(ZjItemPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ZjItemDO>()
+        LambdaQueryWrapperX<ZjItemDO> zjItemDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>();
+        zjItemDOLambdaQueryWrapperX
                 .eqIfPresent(ZjItemDO::getZjType, reqVO.getZjType())
                 .likeIfPresent(ZjItemDO::getName, reqVO.getName())
                 .likeIfPresent(ZjItemDO::getRemark, reqVO.getRemark())
@@ -28,7 +32,18 @@ public interface ZjItemMapper extends BaseMapperX<ZjItemDO> {
                 .eqIfPresent(ZjItemDO::getUpperVal, reqVO.getUpperVal())
                 .eqIfPresent(ZjItemDO::getLowerVal, reqVO.getLowerVal())
                 .betweenIfPresent(ZjItemDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(ZjItemDO::getId));
+                .orderByDesc(ZjItemDO::getId);
+
+        // 单独处理 ids 条件
+        if (StringUtils.isNotBlank(reqVO.getIds())) {
+            List<Long> idList = Arrays.stream(reqVO.getIds().split(","))
+                    .map(String::trim)
+                    .map(Long::valueOf)
+                    .collect(Collectors.toList());
+            zjItemDOLambdaQueryWrapperX.in(ZjItemDO::getId, idList);
+        }
+
+        return selectPage(reqVO,zjItemDOLambdaQueryWrapperX );
     }
 
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjschema/ZjSchemaMapper.java

@@ -1,11 +1,14 @@
 package cn.iocoder.yudao.module.mes.dal.mysql.zjschema;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.zjschema.ZjSchemaDO;
+import com.alibaba.excel.util.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.mes.controller.admin.zjschema.vo.*;
 
@@ -18,7 +21,8 @@ import cn.iocoder.yudao.module.mes.controller.admin.zjschema.vo.*;
 public interface ZjSchemaMapper extends BaseMapperX<ZjSchemaDO> {
 
     default PageResult<ZjSchemaDO> selectPage(ZjSchemaPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ZjSchemaDO>()
+        LambdaQueryWrapperX<ZjSchemaDO> zjSchemaDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>();
+        zjSchemaDOLambdaQueryWrapperX
                 .eqIfPresent(ZjSchemaDO::getType, reqVO.getType())
                 .likeIfPresent(ZjSchemaDO::getName, reqVO.getName())
                 .eqIfPresent(ZjSchemaDO::getRemark, reqVO.getRemark())
@@ -26,9 +30,21 @@ public interface ZjSchemaMapper extends BaseMapperX<ZjSchemaDO> {
                 .eqIfPresent(ZjSchemaDO::getVal, reqVO.getVal())
                 .eqIfPresent(ZjSchemaDO::getItem, reqVO.getItem())
                 .betweenIfPresent(ZjSchemaDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(ZjSchemaDO::getId));
+                .orderByDesc(ZjSchemaDO::getId);
+
+        if (StringUtils.isNotBlank(reqVO.getIds())) {
+            List<Long> idList = Arrays.stream(reqVO.getIds().split(","))
+                    .map(String::trim)
+                    .map(Long::valueOf)
+                    .collect(Collectors.toList());
+            zjSchemaDOLambdaQueryWrapperX.in(ZjSchemaDO::getId, idList);
+        }
+
+        return selectPage(reqVO, zjSchemaDOLambdaQueryWrapperX);
     }
 
+
+
     default ZjSchemaDO selectByName(String name) {
         return selectOne(new LambdaQueryWrapperX<ZjSchemaDO>()
                 .eq(ZjSchemaDO::getName, name));

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjtask/ZjTaskMapper.java

@@ -1,11 +1,14 @@
 package cn.iocoder.yudao.module.mes.dal.mysql.zjtask;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.zjtask.ZjTaskDO;
+import com.alibaba.excel.util.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.mes.controller.admin.zjtask.vo.*;
 
@@ -18,7 +21,8 @@ import cn.iocoder.yudao.module.mes.controller.admin.zjtask.vo.*;
 public interface ZjTaskMapper extends BaseMapperX<ZjTaskDO> {
 
     default PageResult<ZjTaskDO> selectPage(ZjTaskPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ZjTaskDO>()
+        LambdaQueryWrapperX<ZjTaskDO> zjTaskDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>();
+        zjTaskDOLambdaQueryWrapperX
                 .eqIfPresent(ZjTaskDO::getCode, reqVO.getCode())
                 .likeIfPresent(ZjTaskDO::getName, reqVO.getName())
                 .eqIfPresent(ZjTaskDO::getType, reqVO.getType())
@@ -34,7 +38,17 @@ public interface ZjTaskMapper extends BaseMapperX<ZjTaskDO> {
                 .eqIfPresent(ZjTaskDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(ZjTaskDO::getResult, reqVO.getResult())
                 .betweenIfPresent(ZjTaskDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(ZjTaskDO::getId));
+                .orderByDesc(ZjTaskDO::getId);
+
+        if (StringUtils.isNotBlank(reqVO.getIds())) {
+            List<Long> idList = Arrays.stream(reqVO.getIds().split(","))
+                    .map(String::trim)
+                    .map(Long::valueOf)
+                    .collect(Collectors.toList());
+            zjTaskDOLambdaQueryWrapperX.in(ZjTaskDO::getId, idList);
+        }
+
+        return selectPage(reqVO,zjTaskDOLambdaQueryWrapperX );
     }
 
 }

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/zjtype/ZjTypeMapper.java

@@ -1,11 +1,14 @@
 package cn.iocoder.yudao.module.mes.dal.mysql.zjtype;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.moldrepair.MoldRepairDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.zjtype.ZjTypeDO;
+import com.alibaba.excel.util.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.mes.controller.admin.zjtype.vo.*;
 
@@ -18,12 +21,23 @@ import cn.iocoder.yudao.module.mes.controller.admin.zjtype.vo.*;
 public interface ZjTypeMapper extends BaseMapperX<ZjTypeDO> {
 
     default PageResult<ZjTypeDO> selectPage(ZjTypePageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ZjTypeDO>()
+        LambdaQueryWrapperX<ZjTypeDO> zjTypeDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>();
+        zjTypeDOLambdaQueryWrapperX
                 .eqIfPresent(ZjTypeDO::getCode, reqVO.getCode())
                 .likeIfPresent(ZjTypeDO::getName, reqVO.getName())
                 .likeIfPresent(ZjTypeDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(ZjTypeDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(ZjTypeDO::getId));
+                .orderByDesc(ZjTypeDO::getId);
+
+        if (StringUtils.isNotBlank(reqVO.getIds())) {
+            List<Long> idList = Arrays.stream(reqVO.getIds().split(","))
+                    .map(String::trim)
+                    .map(Long::valueOf)
+                    .collect(Collectors.toList());
+            zjTypeDOLambdaQueryWrapperX.in(ZjTypeDO::getId, idList);
+        }
+
+        return selectPage(reqVO,zjTypeDOLambdaQueryWrapperX );
     }
 
 }