Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

blade-service-api/blade-desk-api/pom.xml

@@ -39,6 +39,12 @@
             <artifactId>fastjson</artifactId>
             <version>1.2.83</version>
         </dependency>
+        <!-- 添加Hutool依赖-->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.16</version>
+        </dependency>
     </dependencies>
 
 </project>

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/CertificateMaintenanceEntity.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.pojo.entity;
+package org.springblade.desk.jobtransfer.pojo.entity;
 
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/CertificateTypeEntity.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.pojo.entity;
+package org.springblade.desk.jobtransfer.pojo.entity;
 
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/CultivateDetailEntity.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.pojo.entity;
+package org.springblade.desk.jobtransfer.pojo.entity;
 
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/EquipmentMaintenanceEntity.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.pojo.entity;
+package org.springblade.desk.jobtransfer.pojo.entity;
 
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/PostHandleEntity.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.pojo.entity;
+package org.springblade.desk.jobtransfer.pojo.entity;
 
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/TrainingPlanEntity.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.pojo.entity;
+package org.springblade.desk.jobtransfer.pojo.entity;
 
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/CultivateStatusEnum.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.pojo.enums;
+package org.springblade.desk.jobtransfer.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/GenderEnum.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.pojo.enums;
+package org.springblade.desk.jobtransfer.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/MaintenanceStatusEnum.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.pojo.enums;
+package org.springblade.desk.jobtransfer.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/MarriageEnum.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.pojo.enums;
+package org.springblade.desk.jobtransfer.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/PostHandleStatusEnum.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.pojo.enums;
+package org.springblade.desk.jobtransfer.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/SkillEnum.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.pojo.enums;
+package org.springblade.desk.jobtransfer.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/StaffTypeEnum.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.pojo.enums;
+package org.springblade.desk.jobtransfer.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/TrainingStatusEnum.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.pojo.enums;
+package org.springblade.desk.jobtransfer.pojo.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CertificateMaintenanceExcel.java

@@ -1,10 +1,8 @@
-package org.springblade.desk.jobTransfer.pojo.excel;
+package org.springblade.desk.jobtransfer.pojo.excel;
 
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 import com.alibaba.excel.annotation.ExcelProperty;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CertificateMaintenanceImport.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.pojo.excel;
+package org.springblade.desk.jobtransfer.pojo.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CertificateTypeExcel.java

@@ -1,11 +1,8 @@
-package org.springblade.desk.jobTransfer.pojo.excel;
+package org.springblade.desk.jobtransfer.pojo.excel;
 
 
 import lombok.Data;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CultivateDetailExcel.java

@@ -1,9 +1,8 @@
-package org.springblade.desk.jobTransfer.pojo.excel;
+package org.springblade.desk.jobtransfer.pojo.excel;
 
 
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 import com.alibaba.excel.annotation.ExcelProperty;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/EquipmentMaintenanceExcel.java

@@ -1,9 +1,8 @@
-package org.springblade.desk.jobTransfer.pojo.excel;
+package org.springblade.desk.jobtransfer.pojo.excel;
 
 
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 import com.alibaba.excel.annotation.ExcelProperty;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/EquipmentMaintenanceImport.java

@@ -0,0 +1,42 @@
+package org.springblade.desk.jobtransfer.pojo.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 设备维护导入
+ *
+ * @author qyl
+ * @since 2026-01-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EquipmentMaintenanceImport extends BaseEntity {
+
+    /**
+     * 用户code
+     */
+    @ExcelProperty(index = 0)
+    private String userCode;
+    /**
+     * 设备编号
+     */
+    @ExcelProperty(index = 1)
+    private String deviceCode;
+    /**
+     * 设备有效期
+     */
+    @ExcelProperty(index = 2)
+    private Integer equipmentValidityPeriod;
+    /**
+     * 设备日期
+     */
+    @ExcelProperty(index = 3)
+    @DateTimeFormat("yyyy/MM/dd")
+    private Date equipmentDate;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/PostHandleExcel.java

@@ -1,9 +1,8 @@
-package org.springblade.desk.jobTransfer.pojo.excel;
+package org.springblade.desk.jobtransfer.pojo.excel;
 
 
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 import com.alibaba.excel.annotation.ExcelProperty;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/PostHandleImport.java

@@ -1,14 +1,11 @@
-package org.springblade.desk.jobTransfer.pojo.excel;
+package org.springblade.desk.jobtransfer.pojo.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
 
-import java.io.Serial;
 import java.util.Date;
 
 /**

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/TrainingPlanExcel.java

@@ -1,11 +1,8 @@
-package org.springblade.desk.jobTransfer.pojo.excel;
+package org.springblade.desk.jobtransfer.pojo.excel;
 
 
 import lombok.Data;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/CertificateLedgerQuery.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.pojo.request;
+package org.springblade.desk.jobtransfer.pojo.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/CultivateDetailQuery.java

@@ -1,12 +1,10 @@
-package org.springblade.desk.jobTransfer.pojo.request;
+package org.springblade.desk.jobtransfer.pojo.request;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springblade.core.mp.base.BaseEntity;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import java.time.LocalDate;
 import java.util.Date;
 
 /**

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/EquipmentMaintenanceQuery.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.pojo.request;
+package org.springblade.desk.jobtransfer.pojo.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/JobTransferSave.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.pojo.request;
+package org.springblade.desk.jobtransfer.pojo.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/PostHandleQuery.java

@@ -1,11 +1,7 @@
-package org.springblade.desk.jobTransfer.pojo.request;
+package org.springblade.desk.jobtransfer.pojo.request;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.Date;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CertificateLedgerVO.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.pojo.vo;
+package org.springblade.desk.jobtransfer.pojo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CertificateMaintenanceVO.java

@@ -1,10 +1,10 @@
-package org.springblade.desk.jobTransfer.pojo.vo;
+package org.springblade.desk.jobtransfer.pojo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.desk.jobTransfer.pojo.enums.MaintenanceStatusEnum;
+import org.springblade.desk.jobtransfer.pojo.enums.MaintenanceStatusEnum;
 
 import java.io.Serial;
 import java.time.LocalDate;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CertificateTypeVO.java

@@ -1,6 +1,6 @@
-package org.springblade.desk.jobTransfer.pojo.vo;
+package org.springblade.desk.jobtransfer.pojo.vo;
 
-import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CultivateDetailVO.java

@@ -1,11 +1,11 @@
-package org.springblade.desk.jobTransfer.pojo.vo;
+package org.springblade.desk.jobtransfer.pojo.vo;
 
-import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.desk.jobTransfer.pojo.enums.CultivateStatusEnum;
-import org.springblade.desk.jobTransfer.pojo.enums.StaffTypeEnum;
-import org.springblade.desk.jobTransfer.pojo.enums.TrainingStatusEnum;
+import org.springblade.desk.jobtransfer.pojo.enums.CultivateStatusEnum;
+import org.springblade.desk.jobtransfer.pojo.enums.StaffTypeEnum;
+import org.springblade.desk.jobtransfer.pojo.enums.TrainingStatusEnum;
 
 import java.io.Serial;
 

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/EquipmentMaintenanceListVO.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.pojo.vo;
+package org.springblade.desk.jobtransfer.pojo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/EquipmentMaintenanceVO.java

@@ -1,10 +1,10 @@
-package org.springblade.desk.jobTransfer.pojo.vo;
+package org.springblade.desk.jobtransfer.pojo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.desk.jobTransfer.pojo.enums.MaintenanceStatusEnum;
+import org.springblade.desk.jobtransfer.pojo.enums.MaintenanceStatusEnum;
 
 import java.io.Serial;
 import java.util.Calendar;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/PostHandleVO.java

@@ -1,10 +1,10 @@
-package org.springblade.desk.jobTransfer.pojo.vo;
+package org.springblade.desk.jobtransfer.pojo.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.desk.jobTransfer.pojo.enums.*;
+import org.springblade.desk.jobtransfer.pojo.enums.*;
 
 import java.io.Serial;
 import java.time.LocalDate;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/TrainingPlanVO.java

@@ -1,6 +1,6 @@
-package org.springblade.desk.jobTransfer.pojo.vo;
+package org.springblade.desk.jobtransfer.pojo.vo;
 
-import org.springblade.desk.jobTransfer.pojo.entity.TrainingPlanEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.TrainingPlanEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java

@@ -96,7 +96,7 @@ public class InspectionItem extends BaseEntity {
 	 */
     public static final String COL_CODE = "CODE";
     /**
-     * 特殊类型-[1]:测厚;[2]:测硬;[3]:尺寸;
+     * 特殊类型-[0]:普通;[1]:测厚;[2]:测硬;[3]:尺寸;
      */
     public static final String COL_SPECIAL_TYPE = "SPECIAL_TYPE";
 
@@ -186,7 +186,7 @@ public class InspectionItem extends BaseEntity {
 	@Schema(description = "[检验项目]编码")
 	private String code;
     /**
-     * 特殊类型-[1]:测厚;[2]:测硬;[3]:尺寸;
+     * 特殊类型-[0]:普通;[1]:测厚;[2]:测硬;[3]:尺寸;
      */
     @Schema(description = "特殊类型")
     private Integer specialType;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java

@@ -40,9 +40,9 @@ public class InspectionTask extends BaseEntity {
      */
     public static final String COL_NAME = "NAME";
     /**
-     * [工单]id
+     * [车间订单]id
      */
-    public static final String COL_WORK_ORDER_ID = "WORK_ORDER_ID";
+    public static final String COL_WO_ID = "WO_ID";
     /**
      * [制品]id
      */
@@ -68,9 +68,9 @@ public class InspectionTask extends BaseEntity {
      */
     public static final String COL_BATCH_NUMBER = "BATCH_NUMBER";
     /**
-     * [工单]编码
+     * [车间订单]编码
      */
-    public static final String COL_WORK_ORDER_CODE = "WORK_ORDER_CODE";
+    public static final String COL_WO_CODE = "WO_CODE";
     /**
      * [工序]编码
      */
@@ -156,9 +156,17 @@ public class InspectionTask extends BaseEntity {
      */
     public static final String COL_FROM_TYPE = "FROM_TYPE";
     /**
-     * 生产订单类型
+     * [生产订单]类型
      */
     public static final String COL_YIELD_ORDER_TYPE = "YIELD_ORDER_TYPE";
+    /**
+     * [生产订单]id
+     */
+    public static final String COL_YIELD_ORDER_ID = "YIELD_ORDER_ID";
+    /**
+     * 接收日期
+     */
+    public static final String COL_RECEIVE_DATE  = "RECEIVE_DATE";
 
     /**
      * [检验任务]编码
@@ -171,15 +179,15 @@ public class InspectionTask extends BaseEntity {
     @Schema(description = "[检验任务]类型")
     private Long inspectionTaskType;
     /**
-     * [检验任务]
+     * [检验任务]名称
      */
-    @Schema(description = "[检验任务]")
+    @Schema(description = "[检验任务]名称")
     private String name;
     /**
-     * [工单]id
+     * [车间订单]id
      */
-    @Schema(description = "[工单]id")
-    private Long workOrderId;
+    @Schema(description = "[车间订单]id")
+    private Long woId;
     /**
      * [制品]id
      */
@@ -211,10 +219,10 @@ public class InspectionTask extends BaseEntity {
     @Schema(description = "生产批次号")
     private Long batchNumber;
     /**
-     * [工单]编码
+     * [车间订单]编码
      */
-    @Schema(description = "[工单]编码")
-    private String workOrderCode;
+    @Schema(description = "[车间订单]编码")
+    private String woCode;
     /**
      * [工序]编码
      */
@@ -321,8 +329,18 @@ public class InspectionTask extends BaseEntity {
     @Schema(description = "来源类型")
     private Integer fromType;
     /**
-     * 生产订单类型
+     * [生产订单]类型
      */
-    @Schema(description = "生产订单类型")
+    @Schema(description = "[生产订单]类型")
     private Integer yieldOrderType;
+    /**
+     * [生产订单]id
+     */
+    @Schema(description = "[生产订单]id")
+    private Integer yieldOrderId;
+    /**
+     * 接收日期
+     */
+    @Schema(description = "接收日期")
+    private LocalDateTime receiveDate;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java

@@ -4,6 +4,8 @@
 package org.springblade.desk.quality.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -60,21 +62,25 @@ public class ReviewFault extends BaseEntity {
 	 * [生产处置单]id
 	 */
 	@Schema(description = "[生产处置单]id")
+    @JsonSerialize(using = ToStringSerializer.class)
 	private Long reviewSheetId;
 	/**
 	 * 故障类别[缺陷]id
 	 */
 	@Schema(description = "故障类别[缺陷]id")
+    @JsonSerialize(using = ToStringSerializer.class)
 	private Long ngType2Id;
 	/**
 	 * 问题大类[缺陷]id
 	 */
 	@Schema(description = "问题大类[缺陷]id")
+    @JsonSerialize(using = ToStringSerializer.class)
 	private Long ngType3Id;
 	/**
 	 * 问题小类[缺陷]id
 	 */
 	@Schema(description = "问题小类[缺陷]id")
+    @JsonSerialize(using = ToStringSerializer.class)
 	private Long ngType4Id;
 	/**
 	 * 比例

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java

@@ -4,10 +4,12 @@
 package org.springblade.desk.quality.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.desk.util.json.serializer.IntegerAllToStringSerializer;
 
 import java.io.Serial;
 import java.time.LocalDateTime;
@@ -19,14 +21,17 @@ import java.time.LocalDateTime;
  * qc_review_sheet_internal QcReviewSheetInternal 热表内部审理记录表
  * qc_review_sheet_internalredo QcReviewSheetInternalredo 热表内部审理记录表（返修）
  * qc_review_sheet_internalsj QcReviewSheetInternalsj 热表内部审理记录表（烧结）
+ * <p>
+ * <p>
+ * status 默认 -1
  *
  * @author Tom Shuo
  * @since 2026-01-06
  */
-@Data
 @TableName("QA_REVIEW_SHEET")
-@Schema(description = "ReviewSheet Entity对象")
+@Data
 @EqualsAndHashCode(callSuper = true)
+@Schema(description = "ReviewSheet Entity对象")
 public class ReviewSheet extends BaseEntity {
 
     @Serial
@@ -129,7 +134,7 @@ public class ReviewSheet extends BaseEntity {
      */
     public static final String COL_BIZ_TYPE = "BIZ_TYPE";
     /**
-     * 物料号
+     * 物料号/零件号
      */
     public static final String COL_PART_CODE = "PART_CODE";
     /**
@@ -194,6 +199,8 @@ public class ReviewSheet extends BaseEntity {
      * [生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式;
      */
     @Schema(description = "[生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式;")
+    @JsonSerialize(using = IntegerAllToStringSerializer.class)
+    // @JsonSerialize(using = ToStringSerializer.class)
     private Integer reviewOrderMode;
     /**
      * 名称
@@ -306,9 +313,9 @@ public class ReviewSheet extends BaseEntity {
     @Schema(description = "业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理;")
     private Integer bizType;
     /**
-     * 物料号
+     * 物料号/零件号
      */
-    @Schema(description = "物料号")
+    @Schema(description = "物料号/零件号")
     private String partCode;
     /**
      * 批次号
@@ -349,12 +356,12 @@ public class ReviewSheet extends BaseEntity {
      * 总数量
      */
     @Schema(description = "总数量")
-    private Short totalNum;
+    private Integer totalNum;
     /**
      * 返修数量
      */
     @Schema(description = "返修数量")
-    private Short reDoNum;
+    private Integer reDoNum;
     /**
      * 返修原因
      */
@@ -375,4 +382,34 @@ public class ReviewSheet extends BaseEntity {
      */
     @Schema(description = "[作业中心]id")
     private Long wcId;
+    /**
+     * 报废数量
+     */
+    @Schema(description = "报废数量")
+    private Integer scrapNum;
+    /**
+     * 报废数量
+     */
+    @Schema(description = "内部审理是否通过/驳回-[1]:通过;[2]:驳回;")
+    private Integer selfReviewFlag;
+    /**
+     * 不良原因
+     */
+    @Schema(description = "不良原因")
+    private String poorReason;
+    /**
+     * 不良描述
+     */
+    @Schema(description = "不良描述")
+    private String poorDesc;
+    /**
+     * 复制引用[车间订单]id
+     */
+    @Schema(description = "复制引用[车间订单]id")
+    private Long refWoId;
+    /**
+     * 是否已经保存-[1]:是;[0]否;
+     */
+    @Schema(description = "是否已经保存-[1]:是;[0]否;")
+    private Integer hasSaved;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java

@@ -95,6 +95,10 @@ public class WorkPlanItem extends BaseEntity {
 	 * [检验模板]id
 	 */
     public static final String COL_TEMPLATE_ID = "TEMPLATE_ID";
+    /**
+     * 特殊类型-[0]:普通;[1]:测厚;[2]:测硬;[3]:尺寸;
+     */
+    public static final String COL_SPECIAL_TYPE = "SPECIAL_TYPE";
 
 	/**
 	 * [作业计划]id
@@ -181,4 +185,9 @@ public class WorkPlanItem extends BaseEntity {
 	 */
 	@Schema(description = "[检验模板]id")
 	private Long templateId;
+    /**
+     * 特殊类型-[0]:普通;[1]:测厚;[2]:测硬;[3]:尺寸;
+     */
+    @Schema(description = "特殊类型-[0]:普通;[1]:测厚;[2]:测硬;[3]:尺寸;")
+    private Integer specialType;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java

@@ -85,9 +85,9 @@ public class WorkPlanItemDetail extends BaseEntity {
 	@Schema(description = "[工序检验项]id")
 	private Long workPlanItemId;
 	/**
-	 * 测量类型-[1]镀前;[2]:镀后;
+	 * 测量类型;
 	 */
-	@Schema(description = "测量类型-[1]镀前;[2]:镀后;")
+	@Schema(description = "测量类型")
 	private String testType;
 	/**
 	 * 尺寸
@@ -144,4 +144,9 @@ public class WorkPlanItemDetail extends BaseEntity {
 	 */
 	@Schema(description = "[量具]id")
 	private Long mtId;
+    /**
+     * 实际[量具]id
+     */
+    @Schema(description = "实际[量具]id")
+    private Long actMtId;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java

@@ -3,12 +3,14 @@ package org.springblade.desk.quality.pojo.request;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springblade.desk.quality.pojo.entity.InspectionTask;
 
 import java.time.LocalDate;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class InspectionTaskSearch extends InspectionTask {
 
     @Schema(description = "流程卡号")
@@ -25,12 +27,16 @@ public class InspectionTaskSearch extends InspectionTask {
     private String prodIdent;
     @Schema(description = "需求部门")
     private String needDeptName;
+    @Schema(description = "需求[部门]id")
+    private String needDeptId;
     @Schema(description = "批次号")
     private String batchNo;
     @Schema(description = "分批号")
     private String poBatchNo;
     @Schema(description = "当前工序")
     private Long currentProcessId;
+    @Schema(description = "上个工序")
+    private Long frontProcessId;
     @Schema(description = "下个工序")
     private Long nextProcessId;
     @Schema(description = "生产数量")

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/RemindMsgSearch.java

@@ -0,0 +1,16 @@
+package org.springblade.desk.quality.pojo.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springblade.desk.quality.pojo.entity.RemindMsg;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class RemindMsgSearch extends RemindMsg {
+
+    @Schema(description = "零件名称")
+    private String partName;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetErpSearch.java

@@ -1,13 +1,27 @@
 package org.springblade.desk.quality.pojo.request;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springblade.desk.quality.pojo.entity.ReviewSheet;
 
 /**
- * todo:
+ * ERP审理 搜索
  */
 @Data
-@EqualsAndHashCode()
-public class ReviewSheetErpSearch {
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ReviewSheetErpSearch extends ReviewSheet {
 
+    @Schema(description = "责任零件")
+    private String dutyPart;
+
+    private String createTimeStart;
+
+    private String createTimeEnd;
+
+    private String reviewTimeStart;
+
+    private String reviewTimeEnd;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetHisWOSearch.java

@@ -0,0 +1,15 @@
+package org.springblade.desk.quality.pojo.request;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * 历史已完成车间订单 搜索
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ToString(callSuper = true)
+public class ReviewSheetHisWOSearch {
+
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetInitSearch.java

@@ -1,14 +1,43 @@
 package org.springblade.desk.quality.pojo.request;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springblade.desk.quality.pojo.entity.ReviewSheet;
 
 /**
- * todo:
+ * 生产处置单 搜索
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class ReviewSheetInitSearch extends ReviewSheet {
 
+    @Schema(description = "单据编号")
+    private String docCode;
+    @Schema(description = "车间订单号")
+    private String woCode;
+    @Schema(description = "产品编号")
+    private String prodCode;
+    @Schema(description = "产品名称")
+    private String prodName;
+    @Schema(description = "产品型号名称")
+    private String prodTypeName;
+    @Schema(description = "生产标识")
+    private String prodIdent;
+    @Schema(description = "批次号")
+    private String batchNo;
+    @Schema(description = "流程卡号")
+    private String cardNo;
+    @Schema(description = "创建时间-开始")
+    private String createTimeStart;
+    @Schema(description = "创建时间-结束")
+    private String createTimeEnd;
+    @Schema(description = "审理时间-开始")
+    private String reviewTimeStart;
+    @Schema(description = "审理时间-结束")
+    private String reviewTimeEnd;
+    @Schema(description = "[外协厂商]名称")
+    private String oemName;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoScrapSearch.java

@@ -0,0 +1,33 @@
+package org.springblade.desk.quality.pojo.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springblade.desk.quality.pojo.entity.ReviewSheet;
+
+/**
+ * 返工审理 报废审理 搜索
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ReviewSheetRedoScrapSearch extends ReviewSheet {
+
+    @Schema(description = "创建提请时间-开始")
+    private String createTimeStart;
+    @Schema(description = "创建提请时间-结束")
+    private String createTimeEnd;
+    @Schema(description = "提请人员[用户]真名")
+    private String createUserRealName;
+    @Schema(description = "审理[用户]真名")
+    private String reviewUserRealName;
+    @Schema(description = "供应商代码")
+    private String oemCode;
+    @Schema(description = "供应商名称")
+    private String oemName;
+    @Schema(description = "审理时间-开始")
+    private String reviewTimeStart;
+    @Schema(description = "审理时间-结束")
+    private String reviewTimeEnd;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoSearch.java

@@ -1,13 +0,0 @@
-package org.springblade.desk.quality.pojo.request;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * todo:
- */
-@Data
-@EqualsAndHashCode()
-public class ReviewSheetRedoSearch {
-
-}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetScrapSearch.java

@@ -1,13 +0,0 @@
-package org.springblade.desk.quality.pojo.request;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * todo:
- */
-@Data
-@EqualsAndHashCode()
-public class ReviewSheetScrapSearch {
-
-}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetSelfSearch.java

@@ -1,13 +1,35 @@
 package org.springblade.desk.quality.pojo.request;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springblade.desk.quality.pojo.entity.ReviewSheet;
 
 /**
- * todo:
+ * 内部审理 搜索
  */
 @Data
-@EqualsAndHashCode()
-public class ReviewSheetSelfSearch {
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ReviewSheetSelfSearch extends ReviewSheet {
 
+    @Schema(description = "车间订单号")
+    private String woCode;
+    @Schema(description = "供应商名称")
+    private String oemName;
+    @Schema(description = "创建时间-开始")
+    private String createTimeStart;
+    @Schema(description = "创建时间-结束")
+    private String createTimeEnd;
+    @Schema(description = "审理时间-开始")
+    private String reviewTimeStart;
+    @Schema(description = "审理时间-结束")
+    private String reviewTimeEnd;
+    @Schema(description = "物料名称")
+    private String materialName;
+    @Schema(description = "需求数量")
+    private Long needQty;
+    @Schema(description = "故障原因")
+    private String faultReason;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ELeVO.java

@@ -0,0 +1,28 @@
+package org.springblade.desk.quality.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * [电子档案] todo:
+ */
+@Data
+@EqualsAndHashCode()
+public class ELeVO {
+
+    @Schema(description = "[车间订单]编号")
+    private String woCode = "";
+    @Schema(description = "[产品]编号")
+    private String prodCode = "";
+    @Schema(description = "[批次]编号")
+    private String batCode = "";
+    @Schema(description = "生产标识")
+    private String prodIdent = "";
+    @Schema(description = "加工[班组]名称")
+    private String workTeamSetName;
+    @Schema(description = "完工时间")
+    private String finishTime;
+    @Schema(description = "上传兰台时间")
+    private String uploadTime;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java

@@ -46,11 +46,11 @@ public class InspectionTaskListVO extends InspectionTask {
     @Schema(description = "车间订单号")
     private String woCode = "XXXX12345";
     @Schema(description = "零件号")
-    private String partCode = "XXXX12345";
+    private String partCode = "";
     @Schema(description = "生产标识")
     private String prodIdent = "XXXX12345";
     @Schema(description = "流程卡号")
-    private String cardNo = "XXXX12345";
+    private String cardNo = "";
     @Schema(description = "需求部门")
     private String needDeptName = "XXXX12345";
     @Schema(description = "批次号")
@@ -72,7 +72,7 @@ public class InspectionTaskListVO extends InspectionTask {
     @Schema(description = "生产数量")
     private Double poQty = 2002d;
     @Schema(description = "接收时间")
-    private LocalDateTime receiveDate = LocalDateTime.now();
+    private LocalDateTime receiveDate;
 
 
     @Schema(description = "订单-产品号")
@@ -106,5 +106,5 @@ public class InspectionTaskListVO extends InspectionTask {
     private String sameNo = "tank-1001";
     // todo:
     @Schema(description = "材料")
-    private String material  = "铜";
+    private String material = "铜";
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java

@@ -5,6 +5,7 @@ package org.springblade.desk.quality.pojo.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springblade.desk.quality.pojo.entity.ReviewDuty;
 
 import java.io.Serial;
@@ -17,6 +18,7 @@ import java.io.Serial;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class ReviewDutyVO extends ReviewDuty {
 	@Serial
 	private static final long serialVersionUID = 1L;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java

@@ -6,6 +6,7 @@ package org.springblade.desk.quality.pojo.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springblade.desk.quality.pojo.entity.ReviewFault;
 
 import java.io.Serial;
@@ -18,6 +19,7 @@ import java.io.Serial;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class ReviewFaultVO extends ReviewFault {
 	@Serial
 	private static final long serialVersionUID = 1L;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDetailVO.java

@@ -0,0 +1,46 @@
+/**
+ * Author: Tom Shuo
+ */
+package org.springblade.desk.quality.pojo.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springblade.desk.quality.pojo.entity.ReviewSheet;
+
+import java.io.Serial;
+import java.util.List;
+
+/**
+ * [生产处置单] 视图实体类 detail详情
+ *
+ * @author Tom Shuo
+ * @since 2026-01-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ReviewSheetDetailVO extends ReviewSheet {
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "问题故障list")
+    private List<ReviewFaultVO> faultList;
+    @Schema(description = "问题故障删除ids")
+    private String faultDeleteIds = "";
+    @Schema(description = "责任零件list")
+    private List<ReviewDutyVO> dutyList;
+    @Schema(description = "责任零件删除ids")
+    private String dutyDeleteIds = "";
+
+    @Schema(description = "发现[工序]名称")
+    private String findPrecessName;
+    @Schema(description = "流程卡号")
+    private String cardNo;
+    @Schema(description = "[物料]名称")
+    private String materialName;
+    @Schema(description = "提交类型")
+    private Integer submitType = 0;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDutyBatchVO.java

@@ -0,0 +1,18 @@
+package org.springblade.desk.quality.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 责任批号
+ */
+@Data
+@EqualsAndHashCode()
+public class ReviewSheetDutyBatchVO {
+
+    private String dutyBatch;
+
+    public ReviewSheetDutyBatchVO(String dutyBatch) {
+        this.dutyBatch = dutyBatch;
+    }
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDutyPartVO.java

@@ -0,0 +1,18 @@
+package org.springblade.desk.quality.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 责任零件
+ */
+@Data
+@EqualsAndHashCode()
+public class ReviewSheetDutyPartVO {
+
+    private String dutyPart;
+
+    public ReviewSheetDutyPartVO(String dutyPart) {
+        this.dutyPart = dutyPart;
+    }
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetErpVO.java

@@ -8,7 +8,7 @@ import org.springblade.desk.quality.pojo.entity.ReviewSheet;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ReviewSheetErpListVO extends ReviewSheet {
+public class ReviewSheetErpVO extends ReviewSheet {
 
     @Schema(description = "BaseEntityVO")
     private BaseEntityVO base;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetHisWOVO.java

@@ -0,0 +1,22 @@
+package org.springblade.desk.quality.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 历史已完成车间订单 WorkOrder Copy Entity
+ */
+@Data
+@EqualsAndHashCode()
+public class ReviewSheetHisWOVO {
+
+    @Schema(description = "车间订单id")
+    private Long woId;
+
+    @Schema(description = "车间订单编码")
+    private String woCode;
+
+    @Schema(description = "车间订单下拉显示信息")
+    private String woInfo;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitVO.java

@@ -8,7 +8,7 @@ import org.springblade.desk.quality.pojo.entity.ReviewSheet;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ReviewSheetSelfListVO extends ReviewSheet {
+public class ReviewSheetInitVO extends ReviewSheet {
 
     @Schema(description = "BaseEntityVO")
     private BaseEntityVO base;
@@ -33,7 +33,7 @@ public class ReviewSheetSelfListVO extends ReviewSheet {
     @Schema(description = "[生产处置单]模式 名称")
     private String reviewOrderModeName;
     @Schema(description = "打回[用户]真名")
-    private String  backUserRealName;
+    private String backUserRealName;
     @Schema(description = "审理状态 名称")
     private String reviewStatusName;
     @Schema(description = "审理[用户]真名")

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoListVO.java

@@ -1,24 +0,0 @@
-package org.springblade.desk.quality.pojo.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.desk.basic.pojo.vo.BaseEntityVO;
-import org.springblade.desk.quality.pojo.entity.ReviewSheet;
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ReviewSheetRedoListVO extends ReviewSheet {
-
-    @Schema(description = "BaseEntityVO")
-    private BaseEntityVO base;
-    @Schema(description = "审理状态 名称")
-    private String reviewStatusName;
-    @Schema(description = "审理[用户]真名")
-    private String reviewUserRealName;
-    @Schema(description = "打回[用户]真名")
-    private String  backUserRealName;
-    @Schema(description = "车间订单号")
-    private String woCode;
-
-}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoScrapVO.java

@@ -8,7 +8,7 @@ import org.springblade.desk.quality.pojo.entity.ReviewSheet;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ReviewSheetScrapListVO extends ReviewSheet {
+public class ReviewSheetRedoScrapVO extends ReviewSheet {
 
     @Schema(description = "BaseEntityVO")
     private BaseEntityVO base;
@@ -17,9 +17,7 @@ public class ReviewSheetScrapListVO extends ReviewSheet {
     @Schema(description = "审理[用户]真名")
     private String reviewUserRealName;
     @Schema(description = "打回[用户]真名")
-    private String  backUserRealName;
-    @Schema(description = "车间订单号")
-    private String woCode;
+    private String backUserRealName;
     @Schema(description = "供应商代码")
     private String oemCode;
     @Schema(description = "供应商名称")

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRelevantBatchVO.java

@@ -0,0 +1,18 @@
+package org.springblade.desk.quality.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 相关批号
+ */
+@Data
+@EqualsAndHashCode()
+public class ReviewSheetRelevantBatchVO {
+
+    private String relevantBatch;
+
+    public ReviewSheetRelevantBatchVO(String relevantBatch) {
+        this.relevantBatch = relevantBatch;
+    }
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRelevantPartVO.java

@@ -0,0 +1,18 @@
+package org.springblade.desk.quality.pojo.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 相关零件
+ */
+@Data
+@EqualsAndHashCode()
+public class ReviewSheetRelevantPartVO {
+
+    private String relevantPart;
+
+    public ReviewSheetRelevantPartVO(String relevantPart) {
+        this.relevantPart = relevantPart;
+    }
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetSelfVO.java

@@ -8,7 +8,7 @@ import org.springblade.desk.quality.pojo.entity.ReviewSheet;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ReviewSheetInitListVO extends ReviewSheet {
+public class ReviewSheetSelfVO extends ReviewSheet {
 
     @Schema(description = "BaseEntityVO")
     private BaseEntityVO base;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java

@@ -1,34 +0,0 @@
-/**
- * Author: Tom Shuo
- */
-package org.springblade.desk.quality.pojo.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.desk.quality.pojo.entity.ReviewSheet;
-
-import java.io.Serial;
-import java.util.List;
-
-/**
- * [生产处置单] 视图实体类 detail详情
- *
- * @author Tom Shuo
- * @since 2026-01-06
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class ReviewSheetVO extends ReviewSheet {
-	@Serial
-	private static final long serialVersionUID = 1L;
-
-    @Schema(description = "故障list")
-    private List<ReviewFaultVO> faultList;
-    @Schema(description = "故障删除ids")
-    private String faultDeleteIds = "";
-    @Schema(description = "责任零件list")
-	private List<ReviewDutyVO> dutyList;
-    @Schema(description = "责任零件删除ids")
-	private String dutyDeleteIds = "";
-}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/SupplyInspectionVO.java

@@ -21,6 +21,4 @@ public class SupplyInspectionVO extends SupplyInspection {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
-
-
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java

@@ -24,4 +24,7 @@ public class WorkPlanItemDetailVO extends WorkPlanItemDetail {
 
     @Schema(description = "[量具]名称")
     private String mtName = "标尺1";
+
+    @Schema(description = "实际[量具]名称")
+    private String actMtName = "游标卡尺QW";
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/deserializer/DateBeginOfDayDeserializer.java

@@ -0,0 +1,51 @@
+package org.springblade.desk.util.json.deserializer;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+
+import java.io.IOException;
+import java.util.Date;
+
+/**
+ * 自定义Date反序列化器：将yyyy-MM-dd字符串转为当天开始时间（00:00:00）的Date对象
+ */
+public class DateBeginOfDayDeserializer extends StdDeserializer<Date> {
+
+    // 固定日期格式
+    private static final String DATE_PATTERN = "yyyy-MM-dd";
+
+    // 无参构造（Jackson要求）
+    public DateBeginOfDayDeserializer() {
+        this(null);
+    }
+
+    // 带类型构造
+    public DateBeginOfDayDeserializer(Class<?> vc) {
+        super(vc);
+    }
+
+    @Override
+    public Date deserialize(JsonParser jsonParser, DeserializationContext ctx) throws IOException {
+        // 1. 获取JSON中的字符串值（如：2026-01-01）
+        String dateStr = jsonParser.getText().trim();
+
+        // 2. 空值处理（避免空指针）
+        if (dateStr.isEmpty() || dateStr.equals("null")) {
+            return null;
+        }
+        try {
+            // 3. Hutool解析字符串为DateTime
+            DateTime dateTime = DateUtil.parse(dateStr, DATE_PATTERN);
+            // 4. 转为当天开始时间（00:00:00）
+            DateTime beginOfDay = DateUtil.beginOfDay(dateTime);
+            // 5. 转换为java.util.Date（适配Oracle DATE 7）
+            return beginOfDay.toJdkDate();
+        } catch (Exception e) {
+            // 6. 解析失败时抛出友好异常
+            throw new IOException("日期格式错误，仅支持yyyy-MM-dd格式（如：2026-01-01）", e);
+        }
+    }
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/deserializer/DateEndOfDayDeserializer.java

@@ -0,0 +1,52 @@
+package org.springblade.desk.util.json.deserializer;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+
+import java.io.IOException;
+import java.util.Date;
+
+/**
+ * 自定义Date反序列化器：将yyyy-MM-dd字符串转为当天结束时间（23:59:59）的Date对象
+ */
+public class DateEndOfDayDeserializer extends StdDeserializer<Date> {
+
+    // 固定日期格式
+    private static final String DATE_PATTERN = "yyyy-MM-dd";
+
+    // 无参构造（Jackson要求）
+    public DateEndOfDayDeserializer() {
+        this(null);
+    }
+
+    // 带类型构造
+    public DateEndOfDayDeserializer(Class<?> vc) {
+        super(vc);
+    }
+
+    @Override
+    public Date deserialize(JsonParser jsonParser, DeserializationContext ctx) throws IOException {
+        // 1. 获取JSON中的字符串值（如：2026-01-01）
+        String dateStr = jsonParser.getText().trim();
+
+        // 2. 空值处理（避免空指针）
+        if (dateStr.isEmpty() || dateStr.equals("null")) {
+            return null;
+        }
+
+        try {
+            // 3. Hutool解析字符串为DateTime
+            DateTime dateTime = DateUtil.parse(dateStr, DATE_PATTERN);
+            // 4. 转为当天结束时间（23:59:59.999，不影响Oracle查询）
+            DateTime endOfDay = DateUtil.endOfDay(dateTime);
+            // 5. 转换为java.util.Date（适配Oracle DATE 7）
+            return endOfDay.toJdkDate();
+        } catch (Exception e) {
+            // 6. 解析失败时抛出友好异常
+            throw new IOException("日期格式错误，仅支持yyyy-MM-dd格式（如：2026-01-01）", e);
+        }
+    }
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/serializer/Integer0ToEmptyStringSerializer.java

@@ -0,0 +1,31 @@
+package org.springblade.desk.util.json.serializer;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;
+
+import java.io.IOException;
+
+/**
+ * 自定义Integer序列化器：0值 或 null 序列化为空字符串，其他值正常序列化
+ */
+public class Integer0ToEmptyStringSerializer extends StdScalarSerializer<Integer> {
+
+    /**
+     * 提供无参构造器，指定处理的类型为Integer
+     */
+    public Integer0ToEmptyStringSerializer() {
+        super(Integer.class);
+    }
+
+    @Override
+    public void serialize(Integer value, JsonGenerator gen, SerializerProvider provider)
+            throws IOException {
+        // 核心逻辑：判断值是否为null或0，是则写空字符串，否则写原数值
+        if (value == null || value == 0) {
+            gen.writeString(""); // 0或null时返回空字符串
+        } else {
+            gen.writeNumber(value); // 非0数值正常返回数字
+        }
+    }
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/serializer/IntegerAllToStringSerializer.java

@@ -0,0 +1,30 @@
+package org.springblade.desk.util.json.serializer;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;
+
+import java.io.IOException;
+
+/**
+ *
+ */
+public class IntegerAllToStringSerializer extends StdScalarSerializer<Integer> {
+
+    /**
+     *
+     */
+    public IntegerAllToStringSerializer() {
+        super(Integer.class);
+    }
+
+    @Override
+    public void serialize(Integer value, JsonGenerator gen, SerializerProvider provider)
+            throws IOException {
+        if (value == null || value == 0) {
+            gen.writeString("");
+        } else {
+            gen.writeString("" + value);
+        }
+    }
+}

blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/Dept.java

@@ -47,84 +47,87 @@ import java.io.Serializable;
 @Schema(description = "Dept对象")
 public class Dept implements Serializable {
 
-	@Serial
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 主键
-	 */
-	@JsonSerialize(using = ToStringSerializer.class)
-	@Schema(description = "主键")
-	@TableId(value = "id", type = IdType.ASSIGN_ID)
-	private Long id;
-
-	/**
-	 * 租户ID
-	 */
-	@Schema(description = "租户ID")
-	private String tenantId;
-
-	/**
-	 * 父主键
-	 */
-	@JsonSerialize(using = ToStringSerializer.class)
-	@Schema(description = "父主键")
-	private Long parentId;
-
-	/**
-	 * 机构名
-	 */
-	@Schema(description = "机构名")
-	private String deptName;
-
-	/**
-	 * 机构全称
-	 */
-	@Schema(description = "机构全称")
-	private String fullName;
-
-	/**
-	 * 祖级机构主键
-	 */
-	@Schema(description = "祖级机构主键")
-	private String ancestors;
-
-	/**
-	 * 部门主管id
-	 */
-	@Schema(description = "部门主管id")
-	private String leaderId;
-
-	/**
-	 * 机构类型
-	 */
-	@Schema(description = "机构类型")
-	private Integer deptCategory;
-
-	/**
-	 * 排序
-	 */
-	@Schema(description = "排序")
-	private Integer sort;
-
-	/**
-	 * 备注
-	 */
-	@Schema(description = "备注")
-	private String remark;
-
-	/**
-	 * 业务状态
-	 */
-	@Schema(description = "业务状态")
-	private Integer status;
-
-	/**
-	 * 是否已删除
-	 */
-	@TableLogic
-	@Schema(description = "是否已删除")
-	private Integer isDeleted;
-
-
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @Schema(description = "主键")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /**
+     * 租户ID
+     */
+    @Schema(description = "租户ID")
+    private String tenantId;
+
+    /**
+     * 父主键
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @Schema(description = "父主键")
+    private Long parentId;
+
+    /**
+     * 机构名
+     */
+    @Schema(description = "机构名")
+    private String deptName;
+
+    /**
+     * 机构全称
+     */
+    @Schema(description = "机构全称")
+    private String fullName;
+
+    /**
+     * 祖级机构主键
+     */
+    @Schema(description = "祖级机构主键")
+    private String ancestors;
+
+    /**
+     * 部门主管id
+     */
+    @Schema(description = "部门主管id")
+    private String leaderId;
+
+    /**
+     * 机构类型
+     */
+    @Schema(description = "机构类型")
+    private Integer deptCategory;
+
+    /**
+     * 排序
+     */
+    @Schema(description = "排序")
+    private Integer sort;
+
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remark;
+
+    /**
+     * 业务状态
+     */
+    @Schema(description = "业务状态")
+    private Integer status;
+
+    /**
+     * 是否已删除
+     */
+    @TableLogic
+    @Schema(description = "是否已删除")
+    private Integer isDeleted;
+    /**
+     * [部门]编码
+     */
+    @Schema(description = "[部门]编码")
+    private String deptCode;
 }

blade-service/blade-desk/pom.xml

@@ -71,13 +71,6 @@
             <version>4.6.0.RELEASE</version>
             <scope>compile</scope>
         </dependency>
-
-        <!-- 添加Hutool依赖-->
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.8.16</version>
-        </dependency>
         <!--老系统jar包-->
         <dependency>
             <groupId>com.videasoft</groupId>

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/config/RoleConfig.java

@@ -10,12 +10,27 @@ import org.springframework.stereotype.Component;
 public class RoleConfig {
 
     /**
-     * 工艺员角色id
+     * 工艺员[角色]id
      */
     private Long processEngineerId;
-
     /**
-     * 工艺员角色alias
+     * 工艺员[角色]alias
      */
     private String processEngineerAlias;
+    /**
+     * 热表检验员[角色]id
+     */
+    private Long rbCheckerId;
+    /**
+     * 热表检验员[角色]alias
+     */
+    private String rbCheckerAlias;
+    /**
+     * 烧结检验员[角色]id
+     */
+    private Long sjCheckerId;
+    /**
+     * 烧结检验员[角色]alias
+     */
+    private String sjCheckerAlias;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java

@@ -2,6 +2,9 @@ package org.springblade.desk.basic.constant;
 
 public interface BaseRequest {
 
+    String STATUS = "status";
+
+    String ID = "id";
     /**
      * 创建[用户]-真名
      */

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/RelTeamSetUserController.java

@@ -24,6 +24,7 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.desk.basic.constant.BAModuleConst;
 import org.springblade.desk.basic.excel.RelTeamSetUserExcel;
 import org.springblade.desk.basic.pojo.entity.RelTeamSetUser;
 import org.springblade.desk.basic.pojo.vo.RelTeamSetUserVO;
@@ -45,7 +46,7 @@ import java.util.stream.Collectors;
  * @since 2026-01-13
  */
 @RestController
-@RequestMapping("/RelTeamSetUser")
+@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/RelTeamSetUser")
 @Data
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
@@ -54,184 +55,184 @@ import java.util.stream.Collectors;
 public class RelTeamSetUserController extends BladeController {
 
     @Resource
-	private IRelTeamSetUserService service;
-
-	/**
-	 * [班组用户关联] 详情
-	 */
-	@GetMapping("/detail")
-	@ApiOperationSupport(order = 10)
-	@Operation(summary = "详情", description  = "传入RelTeamSetUser Obj")
-	public R<RelTeamSetUserVO> detail(RelTeamSetUser relTeamSetUser) {
-	    QueryWrapper<RelTeamSetUser> qw = Condition.getQueryWrapper(relTeamSetUser);
-		RelTeamSetUser detail = service.getOne(qw);
-		RelTeamSetUserVO detailVO = RelTeamSetUserWrapper.build().entityVO(detail);
-		service.setVOValue(detailVO);
-		return R.data(detailVO);
-	}
-
-	/**
-	 * [班组用户关联] list分页
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 20)
-	@Operation(summary = "list分页", description  = "传入RelTeamSetUser Obj")
-	public R<IPage<RelTeamSetUserVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> relTeamSetUser,
-	                                        Query query) {
+    private IRelTeamSetUserService service;
+
+    /**
+     * [班组用户关联] 详情
+     */
+    @GetMapping("/detail")
+    @ApiOperationSupport(order = 10)
+    @Operation(summary = "详情", description = "传入RelTeamSetUser Obj")
+    public R<RelTeamSetUserVO> detail(RelTeamSetUser relTeamSetUser) {
+        QueryWrapper<RelTeamSetUser> qw = Condition.getQueryWrapper(relTeamSetUser);
+        RelTeamSetUser detail = service.getOne(qw);
+        RelTeamSetUserVO detailVO = RelTeamSetUserWrapper.build().entityVO(detail);
+        service.setVOValue(detailVO);
+        return R.data(detailVO);
+    }
+
+    /**
+     * [班组用户关联] list分页
+     */
+    @GetMapping("/list")
+    @ApiOperationSupport(order = 20)
+    @Operation(summary = "list分页", description = "传入RelTeamSetUser Obj")
+    public R<IPage<RelTeamSetUserVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> relTeamSetUser,
+                                           Query query) {
         QueryWrapper<RelTeamSetUser> qw = Condition.getQueryWrapper(relTeamSetUser, RelTeamSetUser.class);
-		IPage<RelTeamSetUser> pages = service.page(Condition.getPage(query), qw);
-		IPage<RelTeamSetUserVO> pagesVO = RelTeamSetUserWrapper.build().pageVO(pages);
-		pagesVO.getRecords()
-               .stream()
-               .peek(service::setVOValue)
-               .collect(Collectors.toList());
-		return R.data(pagesVO);
-	}
-
-
-	/**
-	 * [班组用户关联] page分页
-	 */
-	@GetMapping("/page")
-	@ApiOperationSupport(order = 21)
-	@Operation(summary = "page分页", description  = "传入RelTeamSetUser Obj")
-	public R<IPage<RelTeamSetUserVO>> page(RelTeamSetUserVO relTeamSetUser, Query query) {
-		IPage<RelTeamSetUserVO> pagesVO = service.selectRelTeamSetUserPage(
-		    Condition.getPage(query), relTeamSetUser
-		);
-		return R.data(pagesVO);
-	}
-
-	/**
+        IPage<RelTeamSetUser> pages = service.page(Condition.getPage(query), qw);
+        IPage<RelTeamSetUserVO> pagesVO = RelTeamSetUserWrapper.build().pageVO(pages);
+        pagesVO.getRecords()
+                .stream()
+                .peek(service::setVOValue)
+                .collect(Collectors.toList());
+        return R.data(pagesVO);
+    }
+
+
+    /**
+     * [班组用户关联] page分页
+     */
+    @GetMapping("/page")
+    @ApiOperationSupport(order = 21)
+    @Operation(summary = "page分页", description = "传入RelTeamSetUser Obj")
+    public R<IPage<RelTeamSetUserVO>> page(RelTeamSetUserVO relTeamSetUser, Query query) {
+        IPage<RelTeamSetUserVO> pagesVO = service.selectRelTeamSetUserPage(
+                Condition.getPage(query), relTeamSetUser
+        );
+        return R.data(pagesVO);
+    }
+
+    /**
      * [班组用户关联] list下拉选择
      */
     @GetMapping("/listForSelect")
     @ApiOperationSupport(order = 22)
-    @Operation(summary = "list下拉选择", description  = "")
+    @Operation(summary = "list下拉选择", description = "")
     public R<List<RelTeamSetUserVO>> listForSelect() {
-         List<RelTeamSetUser> list = service.list();
-         List<RelTeamSetUserVO> listVO = RelTeamSetUserWrapper.build().listVO(list);
-         return R.data(listVO);
+        List<RelTeamSetUser> list = service.list();
+        List<RelTeamSetUserVO> listVO = RelTeamSetUserWrapper.build().listVO(list);
+        return R.data(listVO);
+    }
+
+    /**
+     * [班组用户关联] 新增一条
+     */
+    @PostMapping("/save")
+    @ApiOperationSupport(order = 30)
+    @Operation(summary = "新增一条", description = "传入RelTeamSetUser Obj")
+    public R save(@Valid @RequestBody RelTeamSetUser addOne) {
+        addOne.setId(null);
+        return R.status(service.save(addOne));
     }
 
-	/**
-	 * [班组用户关联] 新增一条
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 30)
-	@Operation(summary = "新增一条", description  = "传入RelTeamSetUser Obj")
-	public R save(@Valid @RequestBody RelTeamSetUser addOne) {
-	    addOne.setId(null);
-		return R.status(service.save(addOne));
-	}
-
-	/**
+    /**
      * [班组用户关联] 新增批量
      */
-     @PostMapping("/saveBat")
-     @ApiOperationSupport(order = 31)
-     @Operation(summary = "新增批量", description = "传入RelTeamSetUser List")
-     public R saveBat(@Valid @RequestBody List<RelTeamSetUser> addList) {
-         addList.forEach(one -> {
-             one.setId(null);
-         });
-         return R.status(service.saveBatch(addList));
-     }
-
-	/**
-	 * [班组用户关联] 修改一条
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 40)
-	@Operation(summary = "修改一条", description  = "传入RelTeamSetUser Obj")
-	public R update(@Valid @RequestBody RelTeamSetUser updateOne) {
-		return R.status(service.updateById(updateOne));
-	}
+    @PostMapping("/saveBat")
+    @ApiOperationSupport(order = 31)
+    @Operation(summary = "新增批量", description = "传入RelTeamSetUser List")
+    public R saveBat(@Valid @RequestBody List<RelTeamSetUser> addList) {
+        addList.forEach(one -> {
+            one.setId(null);
+        });
+        return R.status(service.saveBatch(addList));
+    }
+
+    /**
+     * [班组用户关联] 修改一条
+     */
+    @PostMapping("/update")
+    @ApiOperationSupport(order = 40)
+    @Operation(summary = "修改一条", description = "传入RelTeamSetUser Obj")
+    public R update(@Valid @RequestBody RelTeamSetUser updateOne) {
+        return R.status(service.updateById(updateOne));
+    }
 
     /**
      * [班组用户关联] 修改批量
      */
     @PostMapping("/updateBat")
     @ApiOperationSupport(order = 41)
-    @Operation(summary = "修改批量", description  = "传入RelTeamSetUser List")
+    @Operation(summary = "修改批量", description = "传入RelTeamSetUser List")
     public R updateBat(@Valid @RequestBody List<RelTeamSetUser> updateList) {
         return R.status(service.updateBatchById(updateList));
     }
 
-	/**
-	 * [班组用户关联] 新增或修改一条
-	 */
-	@PostMapping("/submit")
-	@ApiOperationSupport(order = 50)
-	@Operation(summary = "新增或修改一条", description  = "传入RelTeamSetUser Obj")
-	public R submit(@Valid @RequestBody RelTeamSetUser mergeOne) {
-		return R.status(service.saveOrUpdate(mergeOne));
-	}
-
-	/**
+    /**
+     * [班组用户关联] 新增或修改一条
+     */
+    @PostMapping("/submit")
+    @ApiOperationSupport(order = 50)
+    @Operation(summary = "新增或修改一条", description = "传入RelTeamSetUser Obj")
+    public R submit(@Valid @RequestBody RelTeamSetUser mergeOne) {
+        return R.status(service.saveOrUpdate(mergeOne));
+    }
+
+    /**
      * [班组用户关联] 新增或修改批量
      */
-     @PostMapping("/submitBat")
-     @ApiOperationSupport(order = 51)
-     @Operation(summary = "新增或修改批量", description = "传入RelTeamSetUser List")
-     public R submitBat(@Valid @RequestBody List<RelTeamSetUser> mergeList) {
-         return R.status(service.saveOrUpdateBatch(mergeList));
-     }
-
-	/**
-	 * [班组用户关联] 逻辑删除
-	 */
-	@PostMapping("/remove")
-	@ApiOperationSupport(order = 61)
-	@Operation(summary = "逻辑删除", description  = "传入ids")
-	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(service.deleteLogic(Func.toLongList(ids)));
-	}
-
-	/**
-	 * [班组用户关联] 导出Excel
-	 */
-	@GetMapping("/exportExcel")
-	@ApiOperationSupport(order = 70)
-	@Operation(summary = "导出Excel", description  = "传入RelTeamSetUser")
-	public void exportExcel(@Parameter(hidden = true) @RequestParam Map<String, Object> relTeamSetUser,
-	                                BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<RelTeamSetUser> qw = Condition.getQueryWrapper(relTeamSetUser, RelTeamSetUser.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(RelTeamSetUser::getTenantId, bladeUser.getTenantId());
-		//}
-		//queryWrapper.lambda().eq(RelTeamSetUserEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<RelTeamSetUserExcel> list = service.exportRelTeamSetUser(qw);
-		ExcelUtil.export(response, "[班组用户关联]数据" + DateUtil.time(),
-		                "[班组用户关联]数据表", list, RelTeamSetUserExcel.class);
-	}
-
-	/**
+    @PostMapping("/submitBat")
+    @ApiOperationSupport(order = 51)
+    @Operation(summary = "新增或修改批量", description = "传入RelTeamSetUser List")
+    public R submitBat(@Valid @RequestBody List<RelTeamSetUser> mergeList) {
+        return R.status(service.saveOrUpdateBatch(mergeList));
+    }
+
+    /**
+     * [班组用户关联] 逻辑删除
+     */
+    @PostMapping("/remove")
+    @ApiOperationSupport(order = 61)
+    @Operation(summary = "逻辑删除", description = "传入ids")
+    public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
+        return R.status(service.deleteLogic(Func.toLongList(ids)));
+    }
+
+    /**
+     * [班组用户关联] 导出Excel
+     */
+    @GetMapping("/exportExcel")
+    @ApiOperationSupport(order = 70)
+    @Operation(summary = "导出Excel", description = "传入RelTeamSetUser")
+    public void exportExcel(@Parameter(hidden = true) @RequestParam Map<String, Object> relTeamSetUser,
+                            BladeUser bladeUser, HttpServletResponse response) {
+        QueryWrapper<RelTeamSetUser> qw = Condition.getQueryWrapper(relTeamSetUser, RelTeamSetUser.class);
+        //if (!AuthUtil.isAdministrator()) {
+        //	queryWrapper.lambda().eq(RelTeamSetUser::getTenantId, bladeUser.getTenantId());
+        //}
+        //queryWrapper.lambda().eq(RelTeamSetUserEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+        List<RelTeamSetUserExcel> list = service.exportRelTeamSetUser(qw);
+        ExcelUtil.export(response, "[班组用户关联]数据" + DateUtil.time(),
+                "[班组用户关联]数据表", list, RelTeamSetUserExcel.class);
+    }
+
+    /**
      * [班组用户关联] 下载Excel模板
      */
-     @GetMapping("/downloadExcelTemplate")
-     @ApiOperationSupport(order = 71)
-     @Operation(summary = "下载Excel模板", description = "")
-     public ResponseEntity<org.springframework.core.io.Resource> downloadExcelTemplate() {
-            return ExcelExtUtil.downloadXlsTemplate(
-                    "Excel/QA/ImportTemplate-CycleTestItem.xls",
-                    "导入模版-周期试验项目.xls");
-     }
-
-     /**
-      * [班组用户关联] 导入Excel
-      */
-      @PostMapping("/importExcel")
-      @ApiOperationSupport(order = 72)
-      @Operation(summary = "导入Excel", description = "MultipartFile")
-      public R importExcel(@RequestParam("file") MultipartFile file) {
-          R checkR = ExcelExtUtil.importExcelCheck(file);
-          if (checkR != null) {
-              return checkR;
-          }
-          List<RelTeamSetUser> importList = ExcelUtil.read(
-                     file, 0, 1, RelTeamSetUser.class
-          );
-          return R.status(service.saveBatch(importList));
-      }
+    @GetMapping("/downloadExcelTemplate")
+    @ApiOperationSupport(order = 71)
+    @Operation(summary = "下载Excel模板", description = "")
+    public ResponseEntity<org.springframework.core.io.Resource> downloadExcelTemplate() {
+        return ExcelExtUtil.downloadXlsTemplate(
+                "Excel/QA/ImportTemplate-CycleTestItem.xls",
+                "导入模版-周期试验项目.xls");
+    }
+
+    /**
+     * [班组用户关联] 导入Excel
+     */
+    @PostMapping("/importExcel")
+    @ApiOperationSupport(order = 72)
+    @Operation(summary = "导入Excel", description = "MultipartFile")
+    public R importExcel(@RequestParam("file") MultipartFile file) {
+        R checkR = ExcelExtUtil.importExcelCheck(file);
+        if (checkR != null) {
+            return checkR;
+        }
+        List<RelTeamSetUser> importList = ExcelUtil.read(
+                file, 0, 1, RelTeamSetUser.class
+        );
+        return R.status(service.saveBatch(importList));
+    }
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/RequestUtil.java

@@ -1,5 +1,6 @@
 package org.springblade.desk.basic.util;
 
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -96,6 +97,28 @@ public class RequestUtil {
         return DateUtil.endOfDay(date);
     }
 
+    /**
+     *
+     * @param start
+     * @return 年月日 一天 开始的 Date
+     */
+    public static Date buildDateBeginOfDay(final String start) {
+        DateTime dt = new DateTime(start, PATTERN_DATE);
+        DateTime dtStart = DateUtil.beginOfDay(dt);
+        return dtStart.toJdkDate();
+    }
+
+    /**
+     *
+     * @param end
+     * @return 年月日 一天 开始的 Date
+     */
+    public static Date buildDateEndOfDay(final String end) {
+        DateTime dt = new DateTime(end, PATTERN_DATE);
+        DateTime dtEnd = DateUtil.endOfDay(dt);
+        return dtEnd.toJdkDate();
+    }
+
     /**
      * @param map
      * @param key

blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/RoleUtil.java

@@ -0,0 +1,52 @@
+package org.springblade.desk.basic.util;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springblade.core.secure.utils.AuthUtil;
+
+public class RoleUtil {
+
+    /**
+     * @param roleAlias 角色别名
+     * @return 登录用户是否有角色
+     */
+    public static Boolean hasRole(String roleAlias) {
+        if (StringUtils.isBlank(roleAlias)) {
+            throw new IllegalArgumentException("roleAlias参数错误");
+        }
+        return AuthUtil.getUserRole().contains(roleAlias);
+    }
+
+    /**
+     *
+     * @param roleAliasArray
+     * @return 登录用户是否有所有角色（逻辑与关系）
+     */
+    public static Boolean hasAllRole(String... roleAliasArray) {
+        if (roleAliasArray == null || roleAliasArray.length == 0) {
+            throw new IllegalArgumentException("roleAliasArray参数错误");
+        }
+        for (String roleAlias : roleAliasArray) {
+            if (!hasRole(roleAlias)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     *
+     * @param roleAliasArray
+     * @return 登录用户是否有任意角色（逻辑或关系）
+     */
+    public static Boolean hasAnyRole(String... roleAliasArray) {
+        if (roleAliasArray == null || roleAliasArray.length == 0) {
+            throw new IllegalArgumentException("roleAliasArray参数错误");
+        }
+        for (String roleAlias : roleAliasArray) {
+            if (hasRole(roleAlias)) {
+                return true;
+            }
+        }
+        return true;
+    }
+}

blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/IMeasurementRecordsServiceImpl.java

@@ -54,7 +54,7 @@ public class IMeasurementRecordsServiceImpl implements IMeasurementRecordsServic
             return processResponse(response, page);
 
         } catch (Exception e) {
-            log.error("获取量具库存记录数据接口调用失败: {}", e.getMessage(), e);
+            log.error("获取计量记录记录数据接口调用失败: {}", e.getMessage(), e);
             return page.setRecords(List.of()); // 返回空列表而不是null
         }
     }
@@ -91,11 +91,11 @@ public class IMeasurementRecordsServiceImpl implements IMeasurementRecordsServic
 
         try {
             JSONObject result = JSONObject.parseObject(responseBody);
-            if (result != null && result.getInteger("code") != null && result.getInteger("code").equals(200)) {
+            if (result != null && result.getBoolean("success")) {
                 JSONObject data = result.getJSONObject("data");
                 if (data != null) {
                     List<JSONObject> records = JSONArray.parseArray(data.toJSONString(), JSONObject.class);
-                    log.info("成功获取{}条量具库存记录", records != null ? records.size() : 0);
+                    log.info("成功获取{}条计量记录记录", records != null ? records.size() : 0);
                     return page.setRecords(records != null ? records : List.of());
                 }
             } else {

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDischargeRecController.java

@@ -25,40 +25,38 @@
  */
 package org.springblade.desk.energy.controller;
 
-import io.swagger.v3.oas.annotations.tags.Tag;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import lombok.AllArgsConstructor;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.annotation.IsAdmin;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.annotation.IsAdmin;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.util.ExcelExtUtil;
 import org.springblade.desk.energy.excel.BsDischargeRecExcel;
 import org.springblade.desk.energy.pojo.entity.BsDischargeRecEntity;
-import org.springblade.desk.energy.pojo.entity.BsDosingRecEntity;
 import org.springblade.desk.energy.pojo.vo.BsDischargeRecVO;
 import org.springblade.desk.energy.service.IBsDischargeRecService;
 import org.springblade.desk.energy.wrapper.BsDischargeRecWrapper;
 import org.springframework.core.io.Resource;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.tool.constant.BladeConstant;
-import java.util.Map;
-import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 槽液排放记录表 控制器
  *

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsInsTestController.java

@@ -45,7 +45,6 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.util.ExcelExtUtil;
 import org.springblade.desk.energy.excel.BsInsTestExcel;
-import org.springblade.desk.energy.pojo.entity.BsDosingRecEntity;
 import org.springblade.desk.energy.pojo.entity.BsInsTestEntity;
 import org.springblade.desk.energy.pojo.vo.BsInsTestVO;
 import org.springblade.desk.energy.service.IBsInsTestService;

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/JasperReportUtil.java

@@ -84,7 +84,6 @@ public class JasperReportUtil {
                         ((Map)params).put("subData_" + subReport.getDataParamName(), subData != null ? new JRBeanCollectionDataSource(subData) : null);
                     }
                 }
-
                 JasperPrint jp = JasperFillManager.fillReport(jr, (Map)params, new JRBeanCollectionDataSource((Collection)mainData));
                 mainData = null;
                 subData = null;

blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/EquipmentMaintenanceServiceImpl.java

@@ -1,54 +0,0 @@
-package org.springblade.desk.jobTransfer.service.impl;
-
-import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity;
-import org.springblade.desk.jobTransfer.pojo.excel.EquipmentMaintenanceExcel;
-import org.springblade.desk.jobTransfer.pojo.request.EquipmentMaintenanceQuery;
-import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceListVO;
-import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceVO;
-import org.springblade.desk.jobTransfer.mapper.EquipmentMaintenanceMapper;
-import org.springblade.desk.jobTransfer.service.IEquipmentMaintenanceService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseServiceImpl;
-
-import java.util.List;
-
-/**
- * 岗位设备维护 服务实现类
- *
- * @author qyl
- * @since 2026-01-08
- */
-@Service
-public class EquipmentMaintenanceServiceImpl extends BaseServiceImpl<EquipmentMaintenanceMapper, EquipmentMaintenanceEntity> implements IEquipmentMaintenanceService {
-
-    @Override
-    public IPage<EquipmentMaintenanceListVO> selectEquipmentMaintenancePage(IPage<EquipmentMaintenanceListVO> page, EquipmentMaintenanceQuery equipmentMaintenanceQuery) {
-        return page.setRecords(baseMapper.selectEquipmentMaintenancePage(page, equipmentMaintenanceQuery));
-    }
-
-
-    @Override
-    public List<EquipmentMaintenanceExcel> exportEquipmentMaintenance(Wrapper<EquipmentMaintenanceEntity> queryWrapper) {
-        List<EquipmentMaintenanceExcel> equipmentMaintenanceList = baseMapper.exportEquipmentMaintenance(queryWrapper);
-        //equipmentMaintenanceList.forEach(equipmentMaintenance -> {
-        //	equipmentMaintenance.setTypeName(DictCache.getValue(DictEnum.YES_NO, EquipmentMaintenance.getType()));
-        //});
-        return equipmentMaintenanceList;
-    }
-
-    @Override
-    public Boolean submitList(List<EquipmentMaintenanceEntity> equipmentMaintenanceEntities) {
-        boolean saved = this.saveOrUpdateBatch(equipmentMaintenanceEntities);
-        //更新状态
-        baseMapper.updateMaintenanceStatus();
-        return saved;
-    }
-
-    @Override
-    public void updateMaintenanceStatus() {
-        baseMapper.updateMaintenanceStatus();
-    }
-
-}

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateMaintenanceController.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.controller;
+package org.springblade.desk.jobtransfer.controller;
 
 import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
@@ -12,33 +12,26 @@ import lombok.AllArgsConstructor;
 import jakarta.validation.Valid;
 
 import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.annotation.IsAdmin;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.util.ExcelExtUtil;
-import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel;
-import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceImport;
-import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel;
-import org.springblade.desk.jobTransfer.pojo.excel.PostHandleImport;
-import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery;
-import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO;
-import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO;
-import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO;
-import org.springblade.system.cache.UserCache;
-import org.springblade.system.pojo.entity.UserInfo;
+import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceExcel;
+import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceImport;
+import org.springblade.desk.jobtransfer.pojo.request.CertificateLedgerQuery;
+import org.springblade.desk.jobtransfer.pojo.vo.CertificateLedgerVO;
+import org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.core.io.Resource;
 import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity;
-import org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO;
-import org.springblade.desk.jobTransfer.wrapper.CertificateMaintenanceWrapper;
-import org.springblade.desk.jobTransfer.service.ICertificateMaintenanceService;
+import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity;
+import org.springblade.desk.jobtransfer.pojo.vo.CertificateMaintenanceVO;
+import org.springblade.desk.jobtransfer.wrapper.CertificateMaintenanceWrapper;
+import org.springblade.desk.jobtransfer.service.ICertificateMaintenanceService;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.excel.util.ExcelUtil;

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateTypeController.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.controller;
+package org.springblade.desk.jobtransfer.controller;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
@@ -8,23 +8,21 @@ import lombok.AllArgsConstructor;
 import jakarta.validation.Valid;
 
 import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.annotation.IsAdmin;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.desk.jobTransfer.pojo.excel.CertificateTypeExcel;
+import org.springblade.desk.jobtransfer.pojo.excel.CertificateTypeExcel;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity;
-import org.springblade.desk.jobTransfer.pojo.vo.CertificateTypeVO;
-import org.springblade.desk.jobTransfer.wrapper.CertificateTypeWrapper;
-import org.springblade.desk.jobTransfer.service.ICertificateTypeService;
+import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity;
+import org.springblade.desk.jobtransfer.pojo.vo.CertificateTypeVO;
+import org.springblade.desk.jobtransfer.wrapper.CertificateTypeWrapper;
+import org.springblade.desk.jobtransfer.service.ICertificateTypeService;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.tool.constant.BladeConstant;
 
 import java.util.Map;
 import java.util.List;

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CultivateDetailController.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.controller;
+package org.springblade.desk.jobtransfer.controller;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
@@ -8,34 +8,27 @@ import jakarta.annotation.PostConstruct;
 import lombok.AllArgsConstructor;
 import jakarta.validation.Valid;
 
-import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.annotation.IsAdmin;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.desk.jobTransfer.pojo.enums.TrainingStatusEnum;
-import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel;
-import org.springblade.desk.jobTransfer.pojo.excel.PostHandleExcel;
-import org.springblade.desk.jobTransfer.pojo.request.CultivateDetailQuery;
-import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO;
+import org.springblade.desk.jobtransfer.pojo.enums.TrainingStatusEnum;
+import org.springblade.desk.jobtransfer.pojo.excel.CultivateDetailExcel;
+import org.springblade.desk.jobtransfer.pojo.request.CultivateDetailQuery;
 import org.springframework.beans.BeanUtils;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity;
-import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO;
-import org.springblade.desk.jobTransfer.wrapper.CultivateDetailWrapper;
-import org.springblade.desk.jobTransfer.service.ICultivateDetailService;
+import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity;
+import org.springblade.desk.jobtransfer.pojo.vo.CultivateDetailVO;
+import org.springblade.desk.jobtransfer.wrapper.CultivateDetailWrapper;
+import org.springblade.desk.jobtransfer.service.ICultivateDetailService;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.tool.constant.BladeConstant;
 
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.Map;
 import java.util.List;
 
 import jakarta.servlet.http.HttpServletResponse;

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/EquipmentMaintenanceController.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.controller;
+package org.springblade.desk.jobtransfer.controller;
 
 import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
@@ -12,34 +12,34 @@ import lombok.AllArgsConstructor;
 import jakarta.validation.Valid;
 
 import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.annotation.IsAdmin;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity;
-import org.springblade.desk.jobTransfer.pojo.excel.EquipmentMaintenanceExcel;
-import org.springblade.desk.jobTransfer.pojo.excel.EquipmentMaintenanceExcel;
-import org.springblade.desk.jobTransfer.pojo.request.EquipmentMaintenanceQuery;
-import org.springblade.desk.jobTransfer.pojo.vo.*;
+import org.springblade.desk.basic.util.ExcelExtUtil;
+import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceImport;
+import org.springblade.desk.jobtransfer.pojo.excel.EquipmentMaintenanceExcel;
+import org.springblade.desk.jobtransfer.pojo.excel.EquipmentMaintenanceImport;
+import org.springblade.desk.jobtransfer.pojo.request.EquipmentMaintenanceQuery;
+import org.springblade.desk.jobtransfer.pojo.vo.*;
 import org.springframework.beans.BeanUtils;
+import org.springframework.core.io.Resource;
+import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity;
-import org.springblade.desk.jobTransfer.wrapper.EquipmentMaintenanceWrapper;
-import org.springblade.desk.jobTransfer.service.IEquipmentMaintenanceService;
+import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity;
+import org.springblade.desk.jobtransfer.wrapper.EquipmentMaintenanceWrapper;
+import org.springblade.desk.jobtransfer.service.IEquipmentMaintenanceService;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.tool.constant.BladeConstant;
 
 import java.util.ArrayList;
-import java.util.Map;
 import java.util.List;
 
 import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 岗位设备维护 控制器
@@ -172,6 +172,35 @@ public class EquipmentMaintenanceController extends BladeController {
         ExcelUtil.export(response, "岗位设备维护数据" + DateUtil.time(), "岗位设备维护数据表", excels, EquipmentMaintenanceExcel.class);
     }
 
+    /**
+     * 下载Excel模板
+     */
+    @GetMapping("/downloadExcelTemplate")
+    @ApiOperationSupport(order = 10)
+    @Operation(summary = "下载Excel模板", description = "")
+    public ResponseEntity<Resource> downloadExcelTemplate() {
+        return ExcelExtUtil.downloadXlsTemplate(
+                "Excel/jobTransfer/设备维护导入模板.xls",
+                "设备维护导入模板.xls");
+    }
+
+    /**
+     * 导入Excel
+     */
+    @PostMapping("/importExcel")
+    @ApiOperationSupport(order = 11)
+    @Operation(summary = "导入Excel", description = "MultipartFile")
+    public R importExcel(@RequestParam("file") MultipartFile file) {
+        R checkR = ExcelExtUtil.importExcelCheck(file);
+        if (checkR != null) {
+            return checkR;
+        }
+        List<EquipmentMaintenanceImport> importList = ExcelUtil.read(
+                file, 0, 1, EquipmentMaintenanceImport.class
+        );
+        return equipmentMaintenanceService.saveExcelData(importList);
+    }
+
     @PostConstruct // 项目启动后立即执行一次
     public void init() {
         updateMaintenanceStatus();

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/PostHandleController.java

@@ -1,6 +1,5 @@
-package org.springblade.desk.jobTransfer.controller;
+package org.springblade.desk.jobtransfer.controller;
 
-import io.micrometer.core.instrument.binder.BaseUnits;
 import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -11,35 +10,30 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import jakarta.validation.Valid;
 
-import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.annotation.IsAdmin;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.util.ExcelExtUtil;
-import org.springblade.desk.jobTransfer.pojo.excel.PostHandleExcel;
-import org.springblade.desk.jobTransfer.pojo.excel.PostHandleImport;
-import org.springblade.desk.jobTransfer.pojo.request.JobTransferSave;
-import org.springblade.desk.jobTransfer.pojo.request.PostHandleQuery;
+import org.springblade.desk.jobtransfer.pojo.excel.PostHandleExcel;
+import org.springblade.desk.jobtransfer.pojo.excel.PostHandleImport;
+import org.springblade.desk.jobtransfer.pojo.request.JobTransferSave;
+import org.springblade.desk.jobtransfer.pojo.request.PostHandleQuery;
 import org.springframework.beans.BeanUtils;
 import org.springframework.core.io.Resource;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity;
-import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO;
-import org.springblade.desk.jobTransfer.wrapper.PostHandleWrapper;
-import org.springblade.desk.jobTransfer.service.IPostHandleService;
+import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity;
+import org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO;
+import org.springblade.desk.jobtransfer.wrapper.PostHandleWrapper;
+import org.springblade.desk.jobtransfer.service.IPostHandleService;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.excel.util.ExcelUtil;
 
 import java.util.ArrayList;
-import java.util.Map;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.multipart.MultipartFile;

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/TrainingPlanController.java

@@ -1,4 +1,4 @@
-package org.springblade.desk.jobTransfer.controller;
+package org.springblade.desk.jobtransfer.controller;
 
 import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
@@ -11,27 +11,22 @@ import lombok.AllArgsConstructor;
 import jakarta.validation.Valid;
 
 import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.annotation.IsAdmin;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity;
-import org.springblade.desk.jobTransfer.pojo.enums.TrainingStatusEnum;
-import org.springblade.desk.jobTransfer.pojo.excel.TrainingPlanExcel;
+import org.springblade.desk.jobtransfer.pojo.excel.TrainingPlanExcel;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.jobTransfer.pojo.entity.TrainingPlanEntity;
-import org.springblade.desk.jobTransfer.pojo.vo.TrainingPlanVO;
-import org.springblade.desk.jobTransfer.wrapper.TrainingPlanWrapper;
-import org.springblade.desk.jobTransfer.service.ITrainingPlanService;
+import org.springblade.desk.jobtransfer.pojo.entity.TrainingPlanEntity;
+import org.springblade.desk.jobtransfer.pojo.vo.TrainingPlanVO;
+import org.springblade.desk.jobtransfer.wrapper.TrainingPlanWrapper;
+import org.springblade.desk.jobtransfer.service.ITrainingPlanService;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.tool.constant.BladeConstant;
 
-import java.util.Date;
 import java.util.Map;
 import java.util.List;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateMaintenanceMapper.java

@@ -1,10 +1,9 @@
-package org.springblade.desk.jobTransfer.mapper;
+package org.springblade.desk.jobtransfer.mapper;
 
-import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity;
-import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel;
-import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery;
-import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO;
-import org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO;
+import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity;
+import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceExcel;
+import org.springblade.desk.jobtransfer.pojo.request.CertificateLedgerQuery;
+import org.springblade.desk.jobtransfer.pojo.vo.CertificateLedgerVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateMaintenanceMapper.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.desk.jobTransfer.mapper.CertificateMaintenanceMapper">
+<mapper namespace="org.springblade.desk.jobtransfer.mapper.CertificateMaintenanceMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="mesCertificateMaintenanceResultMap"
-               type="org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity">
+               type="org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity">
         <result column="ID" property="id"/>
         <result column="TENANT_ID" property="tenantId"/>
         <result column="CREATE_USER" property="createUser"/>
@@ -23,16 +23,16 @@
         <result column="MAINTENANCE_STATUS" property="maintenanceStatus"/>
     </resultMap>
     <!-- 结果映射：一对多关系 -->
-    <!--    <resultMap id="certificateLedgerMap" type="org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO">-->
+    <!--    <resultMap id="certificateLedgerMap" type="vo.org.springblade.desk.jobtransfer.pojo.CertificateLedgerVO">-->
     <!--        &lt;!&ndash; 人员岗位数据映射 &ndash;&gt;-->
     <!--        <association property="postHandleVO" resultMap="postHandleMap"/>-->
     <!--        &lt;!&ndash; 岗位证书数据集合映射 &ndash;&gt;-->
     <!--        <collection property="certificateMaintenanceVOList"-->
-    <!--                    ofType="org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO"-->
+    <!--                    ofType="vo.org.springblade.desk.jobtransfer.pojo.CertificateMaintenanceVO"-->
     <!--                    resultMap="certificateMaintenanceMap"/>-->
     <!--    </resultMap>-->
 
-    <resultMap id="certificateLedgerMap" type="org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO">
+    <resultMap id="certificateLedgerMap" type="org.springblade.desk.jobtransfer.pojo.vo.CertificateLedgerVO">
         <!-- 定义主键 -->
         <id property="postHandleVO.id" column="ID"/>
 
@@ -41,14 +41,14 @@
 
         <!-- 岗位证书数据集合映射 -->
         <collection property="certificateMaintenanceVOList"
-                    ofType="org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO"
+                    ofType="org.springblade.desk.jobtransfer.pojo.vo.CertificateMaintenanceVO"
                     resultMap="certificateMaintenanceMap">
             <!-- 明确指定关联关系 -->
             <id property="id" column="cm_id"/>
         </collection>
     </resultMap>
     <!-- 岗位处理表映射 -->
-    <resultMap id="postHandleMap" type="org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO">
+    <resultMap id="postHandleMap" type="org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO">
         <!-- 映射主表 MES_POST_HANDLE 的所有字段 -->
         <id column="ID" property="id"/>
         <result column="TENANT_ID" property="tenantId"/>
@@ -92,7 +92,7 @@
     </resultMap>
 
     <!-- 证书维护表映射 -->
-    <resultMap id="certificateMaintenanceMap" type="org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO">
+    <resultMap id="certificateMaintenanceMap" type="org.springblade.desk.jobtransfer.pojo.vo.CertificateMaintenanceVO">
         <id property="id" column="cm_id"/>
         <result property="phId" column="cm_ph_id"/>
         <result property="createTime" column="cm_create_time"/>
@@ -159,7 +159,7 @@
     </select>
 
     <select id="exportCertificateMaintenance"
-            resultType="org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel">
+            resultType="org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceExcel">
         SELECT *
         FROM MES_CERTIFICATE_MAINTENANCE ${ew.customSqlSegment}
     </select>

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateTypeMapper.java

@@ -1,8 +1,8 @@
-package org.springblade.desk.jobTransfer.mapper;
+package org.springblade.desk.jobtransfer.mapper;
 
-import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity;
-import org.springblade.desk.jobTransfer.pojo.excel.CertificateTypeExcel;
-import org.springblade.desk.jobTransfer.pojo.vo.CertificateTypeVO;
+import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity;
+import org.springblade.desk.jobtransfer.pojo.excel.CertificateTypeExcel;
+import org.springblade.desk.jobtransfer.pojo.vo.CertificateTypeVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateTypeMapper.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.desk.jobTransfer.mapper.CertificateTypeMapper">
+<mapper namespace="org.springblade.desk.jobtransfer.mapper.CertificateTypeMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="mesCertificateTypeResultMap"
-               type="org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity">
+               type="org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity">
         <result column="ID" property="id"/>
         <result column="TENANT_ID" property="tenantId"/>
         <result column="CREATE_USER" property="createUser"/>
@@ -28,7 +28,7 @@
     </select>
 
 
-    <select id="exportCertificateType" resultType="org.springblade.desk.jobTransfer.pojo.excel.CertificateTypeExcel">
+    <select id="exportCertificateType" resultType="org.springblade.desk.jobtransfer.pojo.excel.CertificateTypeExcel">
         SELECT *
         FROM MES_CERTIFICATE_TYPE ${ew.customSqlSegment}
     </select>

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CultivateDetailMapper.java

@@ -1,9 +1,9 @@
-package org.springblade.desk.jobTransfer.mapper;
+package org.springblade.desk.jobtransfer.mapper;
 
-import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity;
-import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel;
-import org.springblade.desk.jobTransfer.pojo.request.CultivateDetailQuery;
-import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO;
+import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity;
+import org.springblade.desk.jobtransfer.pojo.excel.CultivateDetailExcel;
+import org.springblade.desk.jobtransfer.pojo.request.CultivateDetailQuery;
+import org.springblade.desk.jobtransfer.pojo.vo.CultivateDetailVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CultivateDetailMapper.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.desk.jobTransfer.mapper.CultivateDetailMapper">
+<mapper namespace="org.springblade.desk.jobtransfer.mapper.CultivateDetailMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="mesCultivateDetailResultMap"
-               type="org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity">
+               type="org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity">
         <result column="ID" property="id"/>
         <result column="TENANT_ID" property="tenantId"/>
         <result column="CREATE_USER" property="createUser"/>
@@ -26,7 +26,7 @@
     </resultMap>
 
     <!-- CultivateDetailVO 结果映射 -->
-    <resultMap id="CultivateDetailVOResultMap" type="org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO">
+    <resultMap id="CultivateDetailVOResultMap" type="org.springblade.desk.jobtransfer.pojo.vo.CultivateDetailVO">
         <!-- 基础字段映射 -->
         <id property="id" column="id"/>
         <result property="tenantId" column="tenant_id"/>
@@ -117,7 +117,7 @@
     </select>
 
 
-    <select id="exportCultivateDetail" resultType="org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel">
+    <select id="exportCultivateDetail" resultType="org.springblade.desk.jobtransfer.pojo.excel.CultivateDetailExcel">
         SELECT *
         FROM MES_CULTIVATE_DETAIL ${ew.customSqlSegment}
     </select>

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/EquipmentMaintenanceMapper.java

@@ -1,10 +1,9 @@
-package org.springblade.desk.jobTransfer.mapper;
+package org.springblade.desk.jobtransfer.mapper;
 
-import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity;
-import org.springblade.desk.jobTransfer.pojo.excel.EquipmentMaintenanceExcel;
-import org.springblade.desk.jobTransfer.pojo.request.EquipmentMaintenanceQuery;
-import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceListVO;
-import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceVO;
+import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity;
+import org.springblade.desk.jobtransfer.pojo.excel.EquipmentMaintenanceExcel;
+import org.springblade.desk.jobtransfer.pojo.request.EquipmentMaintenanceQuery;
+import org.springblade.desk.jobtransfer.pojo.vo.EquipmentMaintenanceListVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/EquipmentMaintenanceMapper.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.desk.jobTransfer.mapper.EquipmentMaintenanceMapper">
+<mapper namespace="org.springblade.desk.jobtransfer.mapper.EquipmentMaintenanceMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="mesEquipmentMaintenanceResultMap"
-               type="org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity">
+               type="org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity">
         <result column="ID" property="id"/>
         <result column="TENANT_ID" property="tenantId"/>
         <result column="CREATE_USER" property="createUser"/>
@@ -20,7 +20,7 @@
         <result column="EQUIPMENT_DATE" property="equipmentDate"/>
         <result column="MAINTENANCE_STATUS" property="maintenanceStatus"/>
     </resultMap>
-    <resultMap id="equipmentMaintenanceMap" type="org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceListVO">
+    <resultMap id="equipmentMaintenanceMap" type="org.springblade.desk.jobtransfer.pojo.vo.EquipmentMaintenanceListVO">
         <!-- 定义主键 -->
         <id property="postHandleVO.id" column="ID"/>
 
@@ -29,14 +29,14 @@
 
         <!-- 设备维护数据集合映射 -->
         <collection property="equipmentMaintenanceVOList"
-                    ofType="org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceVO"
+                    ofType="org.springblade.desk.jobtransfer.pojo.vo.EquipmentMaintenanceVO"
                     resultMap="equipmentMap">
             <!-- 明确指定关联关系 -->
             <id property="id" column="em_id"/>
         </collection>
     </resultMap>
     <!-- 岗位处理表映射 -->
-    <resultMap id="postHandleMap" type="org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO">
+    <resultMap id="postHandleMap" type="org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO">
         <!-- 映射主表 MES_POST_HANDLE 的所有字段 -->
         <id column="ID" property="id"/>
         <result column="TENANT_ID" property="tenantId"/>
@@ -80,7 +80,7 @@
     </resultMap>
 
     <!-- 证书维护表映射 -->
-    <resultMap id="equipmentMap" type="org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceVO">
+    <resultMap id="equipmentMap" type="org.springblade.desk.jobtransfer.pojo.vo.EquipmentMaintenanceVO">
         <id property="id" column="em_id"/>
         <result property="phId" column="em_ph_id"/>
         <result column="equipment_id" property="equipmentId"/>
@@ -148,7 +148,7 @@
 
 
     <select id="exportEquipmentMaintenance"
-            resultType="org.springblade.desk.jobTransfer.pojo.excel.EquipmentMaintenanceExcel">
+            resultType="org.springblade.desk.jobtransfer.pojo.excel.EquipmentMaintenanceExcel">
         SELECT *
         FROM MES_EQUIPMENT_MAINTENANCE ${ew.customSqlSegment}
     </select>