Merge branch 'master' into develop-QA

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/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,4 +1,4 @@
-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;
@@ -71,11 +71,13 @@ public class CultivateDetailQuery extends BaseEntity {
     /**
      * 开始时间
      */
+    @Schema(description = "开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date startTime;
     /**
      * 结束时间
      */
+    @Schema(description = "结束时间")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endTime;
 }

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;
@@ -39,4 +39,9 @@ public class EquipmentMaintenanceQuery {
      */
     @Schema(description = "维护状态(1正常,2到期,3离职)")
     private Short maintenanceStatus;
+    /**
+     * 多能工
+     */
+    @Schema(description = "多能工")
+    private Boolean pleuripotent;
 }

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

@@ -0,0 +1,22 @@
+package org.springblade.desk.jobtransfer.pojo.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 转岗功能保存实体类
+ */
+@Data
+public class JobTransferSave {
+    @Schema(description = "人员岗位管理ID", required = true)
+    private Long phId;
+
+    @Schema(description = "人员岗位管理状态1实习-培训中,2转岗中,3正常,4下岗中,5离职,6转岗培训合格,7下岗培训合格，8实习培训合格，9培训不合格", required = true)
+    private Short phStatus;
+
+    @Schema(description = "新班组ID", required = true)
+    private Long deptId;
+
+    @Schema(description = "新岗位", required = true)
+    private String station;
+}

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;
@@ -44,8 +40,8 @@ public class PostHandleQuery {
     /**
      * 状态
      */
-    @Schema(description = "状态")
+    @Schema(description = "多个状态（1,2,3,4）")
-    private Integer phStatus;
+    private String phStatus;
     /**
      * 入职时间
      */

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.CultivateStatusEnum;
-import org.springblade.desk.jobTransfer.pojo.enums.StaffTypeEnum;
+import org.springblade.desk.jobtransfer.pojo.enums.StaffTypeEnum;
-import org.springblade.desk.jobTransfer.pojo.enums.TrainingStatusEnum;
+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/order/pojo/entity/YieldPlan.java

@@ -66,7 +66,7 @@ public class YieldPlan extends BaseEntity {
 	 * 使用部门
 	 */
 	@TableField(value = "USE_DEPT")
-	private String useDept;
+	private Long useDept;
 
 	/**
 	 * 数量
@@ -90,7 +90,7 @@ public class YieldPlan extends BaseEntity {
 	 * 计划员
 	 */
 	@TableField(value = "PLAN_USER")
-	private String planUser;
+	private Long planUser;
 
 	/**
 	 * 计划下达时间

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/request/PlateGoodsApplySave.java

@@ -22,4 +22,10 @@ public class PlateGoodsApplySave {
 	 * 化验含量明细
 	 */
 	private List<PlateGoodsApplyDetail> detailList;
+
+
+	/**
+	 * 本次添加相关的需求单ID列表
+	 */
+	private List<Long> recordIdList;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/YieldPlanVo.java

@@ -27,4 +27,9 @@ public class YieldPlanVo extends YieldPlan {
 	 * 状态名称
 	 */
 	String statusName;
+
+	/**
+	 * 计划员名称
+	 */
+	String planUserName;
 }

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClient.java

@@ -0,0 +1,31 @@
+package org.springblade.scheduling.feign;
+
+import org.springblade.core.tool.api.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * TODO：功能描述
+ *
+ * @author sjx
+ * @version 1.0
+ * @BelongsProject jonhon-mes-svr
+ * @BelongsPackage org.springblade.scheduling.feign
+ * @since 2026-01-16  10:06
+ */
+@FeignClient(
+        value = "blade-scheduling"
+)
+public interface IWorkOrderClient {
+    String API_PREFIX = "/feign/client/workOrder";
+
+    String SCHEDULING = API_PREFIX + "/scheduling";
+
+    /**
+     * 排产
+     *
+     */
+    @GetMapping(SCHEDULING)
+    R<Void> scheduling();
+}

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/feign/IWorkOrderClientFallback.java

@@ -0,0 +1,43 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.scheduling.feign;
+
+import org.springblade.core.tool.api.R;
+import org.springframework.stereotype.Component;
+
+/**
+ * Feign失败配置
+ *
+ * @author Chill
+ */
+@Component
+public class IWorkOrderClientFallback implements IWorkOrderClient {
+
+	@Override
+	public R<Void> scheduling() {
+		return R.fail("获取数据失败");
+	}
+}

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipAbilityEntity.java

@@ -120,7 +120,7 @@ public class EquipAbilityEntity extends BaseEntity {
 	 * 轮次间隔（分钟）
 	 */
 	@Schema(description = "轮次间隔（分钟）")
-	@JsonSerialize(using = ToStringSerializer.class)
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private BigDecimal interval;
 
 	/**

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PersonAbilityEntity.java

@@ -26,6 +26,8 @@
 package org.springblade.scheduling.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -53,6 +55,7 @@ public class PersonAbilityEntity extends BaseEntity {
 	 * 作业中心Id
 	 */
 	@Schema(description = "作业中心Id")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Long workCenterId;
 
 	/**
@@ -65,6 +68,7 @@ public class PersonAbilityEntity extends BaseEntity {
 	 * 工序编码
 	 */
 	@Schema(description = "工序编码")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Long processId;
 
 	/**
@@ -77,6 +81,7 @@ public class PersonAbilityEntity extends BaseEntity {
 	 * 工艺能力Id
 	 */
 	@Schema(description = "工艺能力Id")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Long craftId;
 
 	/**
@@ -103,4 +108,19 @@ public class PersonAbilityEntity extends BaseEntity {
 	@Schema(description = "0-按单个零件统计 1-按订单统计")
 	private String type;
 
+	/**
+	 * 证书ID
+	 */
+	private Long certificateId;
+
+	/**
+	 * 证书名称
+	 */
+	private String certificateName;
+
+	/**
+	 * 生产标识
+	 */
+	private String productIdent;
+
 }

blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkPlanEntity.java

@@ -264,4 +264,9 @@ public class WorkPlanEntity extends BaseEntity {
 	@Schema(description = "占用设备资源ID")
 	private String personResourceIds;
 
+	/**
+	 * 班组人员
+	 */
+	private String teamMembers;
+
 }

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 io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.AllArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
-
+import lombok.AllArgsConstructor;
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.secure.annotation.IsAdmin;
+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/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.CertificateMaintenanceExcel;
-import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceImport;
+import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceImport;
-import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel;
+import org.springblade.desk.jobtransfer.pojo.request.CertificateLedgerQuery;
-import org.springblade.desk.jobTransfer.pojo.excel.PostHandleImport;
+import org.springblade.desk.jobtransfer.pojo.vo.CertificateLedgerVO;
-import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery;
+import org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO;
-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.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.entity.CertificateMaintenanceEntity;
-import org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO;
+import org.springblade.desk.jobtransfer.pojo.vo.CertificateMaintenanceVO;
-import org.springblade.desk.jobTransfer.wrapper.CertificateMaintenanceWrapper;
+import org.springblade.desk.jobtransfer.wrapper.CertificateMaintenanceWrapper;
-import org.springblade.desk.jobTransfer.service.ICertificateMaintenanceService;
+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;
@@ -187,7 +180,7 @@ public class CertificateMaintenanceController extends BladeController {
     @Operation(summary = "下载Excel模板", description = "")
     public ResponseEntity<Resource> downloadExcelTemplate() {
         return ExcelExtUtil.downloadXlsTemplate(
-                "Excel/jobTransfer/证书维护导入模板.xls",
+                "Excel/jobtransfer/证书维护导入模板.xls",
                 "证书维护导入模板.xls");
     }
 

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.entity.CertificateTypeEntity;
-import org.springblade.desk.jobTransfer.pojo.vo.CertificateTypeVO;
+import org.springblade.desk.jobtransfer.pojo.vo.CertificateTypeVO;
-import org.springblade.desk.jobTransfer.wrapper.CertificateTypeWrapper;
+import org.springblade.desk.jobtransfer.wrapper.CertificateTypeWrapper;
-import org.springblade.desk.jobTransfer.service.ICertificateTypeService;
+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.enums.TrainingStatusEnum;
-import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel;
+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.request.CultivateDetailQuery;
-import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO;
 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.entity.CultivateDetailEntity;
-import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO;
+import org.springblade.desk.jobtransfer.pojo.vo.CultivateDetailVO;
-import org.springblade.desk.jobTransfer.wrapper.CultivateDetailWrapper;
+import org.springblade.desk.jobtransfer.wrapper.CultivateDetailWrapper;
-import org.springblade.desk.jobTransfer.service.ICultivateDetailService;
+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,31 +12,25 @@ 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.excel.EquipmentMaintenanceExcel;
+import org.springblade.desk.jobtransfer.pojo.vo.*;
-import org.springblade.desk.jobTransfer.pojo.request.EquipmentMaintenanceQuery;
-import org.springblade.desk.jobTransfer.pojo.vo.*;
 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.EquipmentMaintenanceEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity;
-import org.springblade.desk.jobTransfer.wrapper.EquipmentMaintenanceWrapper;
+import org.springblade.desk.jobtransfer.wrapper.EquipmentMaintenanceWrapper;
-import org.springblade.desk.jobTransfer.service.IEquipmentMaintenanceService;
+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;

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,34 +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.PostHandleExcel;
-import org.springblade.desk.jobTransfer.pojo.excel.PostHandleImport;
+import org.springblade.desk.jobtransfer.pojo.excel.PostHandleImport;
-import org.springblade.desk.jobTransfer.pojo.request.PostHandleQuery;
+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.entity.PostHandleEntity;
-import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO;
+import org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO;
-import org.springblade.desk.jobTransfer.wrapper.PostHandleWrapper;
+import org.springblade.desk.jobtransfer.wrapper.PostHandleWrapper;
-import org.springblade.desk.jobTransfer.service.IPostHandleService;
+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;
@@ -81,7 +76,7 @@ public class PostHandleController extends BladeController {
             @Parameter(name = "station", description = "所属岗位", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
             @Parameter(name = "inJobDate", description = "入职时间", in = ParameterIn.QUERY, schema = @Schema(type = "string", format = "date")),
             @Parameter(name = "skill", description = "技能等级", in = ParameterIn.QUERY, schema = @Schema(type = "integer")),
-            @Parameter(name = "phStatus", description = "状态", in = ParameterIn.QUERY, schema = @Schema(type = "integer")),
+            @Parameter(name = "phStatus", description = "状态", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
             @Parameter(name = "conExpDate", description = "合同到期日期", in = ParameterIn.QUERY, schema = @Schema(type = "string", format = "date")),
     })
     public R<IPage<PostHandleVO>> page(@Parameter(hidden = true) PostHandleQuery postHandleQuery, Query query) {
@@ -242,8 +237,8 @@ public class PostHandleController extends BladeController {
     @PostMapping("/jobTransfer")
     @ApiOperationSupport(order = 13)
     @Operation(summary = "转岗", description = "传入postHandle")
-    public R jobTransfer(@Valid @RequestBody PostHandleEntity postHandle) {
+    public R jobTransfer(@Valid @RequestBody JobTransferSave jobTransferSave) {
-        return postHandleService.jobTransfer(postHandle);
+        return postHandleService.jobTransfer(jobTransferSave);
     }
 
     /**

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.excel.TrainingPlanExcel;
-import org.springblade.desk.jobTransfer.pojo.enums.TrainingStatusEnum;
-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.entity.TrainingPlanEntity;
-import org.springblade.desk.jobTransfer.pojo.vo.TrainingPlanVO;
+import org.springblade.desk.jobtransfer.pojo.vo.TrainingPlanVO;
-import org.springblade.desk.jobTransfer.wrapper.TrainingPlanWrapper;
+import org.springblade.desk.jobtransfer.wrapper.TrainingPlanWrapper;
-import org.springblade.desk.jobTransfer.service.ITrainingPlanService;
+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.entity.CertificateMaintenanceEntity;
-import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel;
+import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceExcel;
-import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery;
+import org.springblade.desk.jobtransfer.pojo.request.CertificateLedgerQuery;
-import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO;
+import org.springblade.desk.jobtransfer.pojo.vo.CertificateLedgerVO;
-import org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO;
 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.entity.CertificateTypeEntity;
-import org.springblade.desk.jobTransfer.pojo.excel.CertificateTypeExcel;
+import org.springblade.desk.jobtransfer.pojo.excel.CertificateTypeExcel;
-import org.springblade.desk.jobTransfer.pojo.vo.CertificateTypeVO;
+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.entity.CultivateDetailEntity;
-import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel;
+import org.springblade.desk.jobtransfer.pojo.excel.CultivateDetailExcel;
-import org.springblade.desk.jobTransfer.pojo.request.CultivateDetailQuery;
+import org.springblade.desk.jobtransfer.pojo.request.CultivateDetailQuery;
-import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO;
+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"/>
@@ -107,17 +107,17 @@
             AND mp.early_warning_day = #{query.earlyWarningDay}
         </if>
         <!-- 时间范围查询 -->
-        <if test="query.startTime != null and query.startTime != ''">
+        <if test="query.startTime != null">
             AND cd.DISTRIBUTE_TIME &gt;= #{query.startTime}
         </if>
-        <if test="query.endTime != null and query.endTime != ''">
+        <if test="query.endTime != null">
             AND cd.DISTRIBUTE_TIME &lt;= #{query.endTime}
         </if>
         ORDER BY cd.create_time DESC
     </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.entity.EquipmentMaintenanceEntity;
-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.request.EquipmentMaintenanceQuery;
-import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceListVO;
+import org.springblade.desk.jobtransfer.pojo.vo.EquipmentMaintenanceListVO;
-import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceVO;
 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"/>
@@ -134,12 +134,21 @@
         <if test="query.maintenanceStatus != null">
             AND em.maintenance_status = #{query.maintenanceStatus}
         </if>
+        <if test="query.pleuripotent != null and query.pleuripotent">
+            AND ph.id IN (
+            SELECT em_inner.ph_id
+            FROM MES_EQUIPMENT_MAINTENANCE em_inner
+            WHERE em_inner.is_deleted = 0
+            GROUP BY em_inner.ph_id
+            HAVING COUNT(em_inner.id) >= 2
+            )
+        </if>
         ORDER BY ph.create_time DESC, em.equipment_date DESC
     </select>
 
 
     <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>

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

@@ -1,10 +1,10 @@
-package org.springblade.desk.jobTransfer.mapper;
+package org.springblade.desk.jobtransfer.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity;
-import org.springblade.desk.jobTransfer.pojo.excel.PostHandleExcel;
+import org.springblade.desk.jobtransfer.pojo.excel.PostHandleExcel;
-import org.springblade.desk.jobTransfer.pojo.request.PostHandleQuery;
+import org.springblade.desk.jobtransfer.pojo.request.PostHandleQuery;
-import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO;
+import org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;

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

@@ -1,9 +1,9 @@
 <?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.PostHandleMapper">
+<mapper namespace="org.springblade.desk.jobtransfer.mapper.PostHandleMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="mesPostHandleResultMap" type="org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity">
+    <resultMap id="mesPostHandleResultMap" type="org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity">
         <result column="ID" property="id"/>
         <result column="TENANT_ID" property="tenantId"/>
         <result column="CREATE_USER" property="createUser"/>
@@ -41,7 +41,7 @@
     </resultMap>
 
     <!-- PostHandleVO 专用结果映射 -->
-    <resultMap id="postHandleVOResultMap" type="org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO">
+    <resultMap id="postHandleVOResultMap" type="org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO">
         <!-- 映射主表 MES_POST_HANDLE 的所有字段 -->
         <id column="ID" property="id"/>
         <result column="TENANT_ID" property="tenantId"/>
@@ -91,7 +91,7 @@
     </select>
 
 
-    <select id="exportPostHandle" resultType="org.springblade.desk.jobTransfer.pojo.excel.PostHandleExcel">
+    <select id="exportPostHandle" resultType="org.springblade.desk.jobtransfer.pojo.excel.PostHandleExcel">
         SELECT *
         FROM MES_POST_HANDLE ${ew.customSqlSegment}
     </select>
@@ -122,8 +122,12 @@
         <if test="postHandle.skill != null">
             AND mph.SKILL = #{postHandle.skill}
         </if>
-        <if test="postHandle.phStatus != null">
+        <if test="postHandle.phStatus != null and postHandle.phStatus != ''">
-            AND mph.PH_STATUS = #{postHandle.phStatus}
+            AND mph.PH_STATUS IN
+            <foreach collection="postHandle.phStatus.split(',')" item="status"
+                     open="(" separator="," close=")" index="index">
+                #{status}
+            </foreach>
         </if>
         <if test="postHandle.inJobDate != null">
             AND mph.IN_JOB_DATE = #{postHandle.inJobDate}

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

@@ -1,8 +1,8 @@
-package org.springblade.desk.jobTransfer.mapper;
+package org.springblade.desk.jobtransfer.mapper;
 
-import org.springblade.desk.jobTransfer.pojo.entity.TrainingPlanEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.TrainingPlanEntity;
-import org.springblade.desk.jobTransfer.pojo.excel.TrainingPlanExcel;
+import org.springblade.desk.jobtransfer.pojo.excel.TrainingPlanExcel;
-import org.springblade.desk.jobTransfer.pojo.vo.TrainingPlanVO;
+import org.springblade.desk.jobtransfer.pojo.vo.TrainingPlanVO;
 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/TrainingPlanMapper.xml

@@ -1,9 +1,9 @@
 <?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.TrainingPlanMapper">
+<mapper namespace="org.springblade.desk.jobtransfer.mapper.TrainingPlanMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="mesTrainingPlanResultMap" type="org.springblade.desk.jobTransfer.pojo.entity.TrainingPlanEntity">
+    <resultMap id="mesTrainingPlanResultMap" type="org.springblade.desk.jobtransfer.pojo.entity.TrainingPlanEntity">
         <result column="ID" property="id"/>
         <result column="TENANT_ID" property="tenantId"/>
         <result column="CREATE_USER" property="createUser"/>
@@ -30,7 +30,7 @@
     </select>
 
 
-    <select id="exportTrainingPlan" resultType="org.springblade.desk.jobTransfer.pojo.excel.TrainingPlanExcel">
+    <select id="exportTrainingPlan" resultType="org.springblade.desk.jobtransfer.pojo.excel.TrainingPlanExcel">
         SELECT *
         FROM MES_TRAINING_PLAN ${ew.customSqlSegment}
     </select>

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

@@ -1,12 +1,12 @@
-package org.springblade.desk.jobTransfer.service;
+package org.springblade.desk.jobtransfer.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import org.springblade.core.tool.api.R;
-import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity;
-import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel;
+import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceExcel;
-import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceImport;
+import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceImport;
-import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery;
+import org.springblade.desk.jobtransfer.pojo.request.CertificateLedgerQuery;
-import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO;
+import org.springblade.desk.jobtransfer.pojo.vo.CertificateLedgerVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 

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

@@ -1,9 +1,9 @@
-package org.springblade.desk.jobTransfer.service;
+package org.springblade.desk.jobtransfer.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity;
-import org.springblade.desk.jobTransfer.pojo.excel.CertificateTypeExcel;
+import org.springblade.desk.jobtransfer.pojo.excel.CertificateTypeExcel;
-import org.springblade.desk.jobTransfer.pojo.vo.CertificateTypeVO;
+import org.springblade.desk.jobtransfer.pojo.vo.CertificateTypeVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 

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

@@ -1,11 +1,11 @@
-package org.springblade.desk.jobTransfer.service;
+package org.springblade.desk.jobtransfer.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import org.springblade.core.tool.api.R;
-import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity;
-import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel;
+import org.springblade.desk.jobtransfer.pojo.excel.CultivateDetailExcel;
-import org.springblade.desk.jobTransfer.pojo.request.CultivateDetailQuery;
+import org.springblade.desk.jobtransfer.pojo.request.CultivateDetailQuery;
-import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO;
+import org.springblade.desk.jobtransfer.pojo.vo.CultivateDetailVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 

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

@@ -1,10 +1,10 @@
-package org.springblade.desk.jobTransfer.service;
+package org.springblade.desk.jobtransfer.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity;
-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.request.EquipmentMaintenanceQuery;
-import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceListVO;
+import org.springblade.desk.jobtransfer.pojo.vo.EquipmentMaintenanceListVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 

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

@@ -1,12 +1,13 @@
-package org.springblade.desk.jobTransfer.service;
+package org.springblade.desk.jobtransfer.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import org.springblade.core.tool.api.R;
-import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity;
-import org.springblade.desk.jobTransfer.pojo.excel.PostHandleExcel;
+import org.springblade.desk.jobtransfer.pojo.excel.PostHandleExcel;
-import org.springblade.desk.jobTransfer.pojo.excel.PostHandleImport;
+import org.springblade.desk.jobtransfer.pojo.excel.PostHandleImport;
-import org.springblade.desk.jobTransfer.pojo.request.PostHandleQuery;
+import org.springblade.desk.jobtransfer.pojo.request.JobTransferSave;
-import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO;
+import org.springblade.desk.jobtransfer.pojo.request.PostHandleQuery;
+import org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 
@@ -86,10 +87,10 @@ public interface IPostHandleService extends BaseService<PostHandleEntity> {
     /**
      * 转岗
      *
-     * @param postHandleEntity
+     * @param jobTransferSave
      * @return
      */
-    R jobTransfer(PostHandleEntity postHandleEntity);
+    R jobTransfer(JobTransferSave jobTransferSave);
 
     /**
      * 离职

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

@@ -1,9 +1,8 @@
-package org.springblade.desk.jobTransfer.service;
+package org.springblade.desk.jobtransfer.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import org.springblade.desk.jobTransfer.pojo.entity.TrainingPlanEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.TrainingPlanEntity;
-import org.springblade.desk.jobTransfer.pojo.excel.TrainingPlanExcel;
+import org.springblade.desk.jobtransfer.pojo.excel.TrainingPlanExcel;
-import org.springblade.desk.jobTransfer.pojo.vo.TrainingPlanVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateMaintenanceServiceImpl.java

@@ -1,20 +1,23 @@
-package org.springblade.desk.jobTransfer.service.impl;
+package org.springblade.desk.jobtransfer.service.impl;
 
+import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import jakarta.annotation.Resource;
 import org.springblade.core.tool.api.R;
-import org.springblade.desk.jobTransfer.mapper.CertificateTypeMapper;
+import org.springblade.desk.jobtransfer.mapper.CertificateTypeMapper;
-import org.springblade.desk.jobTransfer.mapper.PostHandleMapper;
+import org.springblade.desk.jobtransfer.mapper.PostHandleMapper;
-import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity;
-import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity;
-import org.springblade.desk.jobTransfer.pojo.enums.PostHandleStatusEnum;
+import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity;
-import org.springblade.desk.jobTransfer.pojo.enums.StaffTypeEnum;
+import org.springblade.desk.jobtransfer.pojo.enums.MaintenanceStatusEnum;
-import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel;
+import org.springblade.desk.jobtransfer.pojo.enums.PostHandleStatusEnum;
-import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceImport;
+import org.springblade.desk.jobtransfer.pojo.enums.StaffTypeEnum;
-import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery;
+import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceExcel;
-import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO;
+import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceImport;
-import org.springblade.desk.jobTransfer.mapper.CertificateMaintenanceMapper;
+import org.springblade.desk.jobtransfer.pojo.request.CertificateLedgerQuery;
-import org.springblade.desk.jobTransfer.service.ICertificateMaintenanceService;
+import org.springblade.desk.jobtransfer.pojo.vo.CertificateLedgerVO;
+import org.springblade.desk.jobtransfer.mapper.CertificateMaintenanceMapper;
+import org.springblade.desk.jobtransfer.service.ICertificateMaintenanceService;
 import org.springblade.system.cache.UserCache;
 import org.springblade.system.pojo.entity.UserInfo;
 import org.springframework.stereotype.Service;
@@ -72,6 +75,7 @@ public class CertificateMaintenanceServiceImpl extends BaseServiceImpl<Certifica
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public R saveExcelData(List<CertificateMaintenanceImport> certificateMaintenanceImports) {
         //获取全部用户codes，通过code获取用户ID,
         Set<String> codes = certificateMaintenanceImports.stream().map(CertificateMaintenanceImport::getUserCode)
@@ -106,8 +110,30 @@ public class CertificateMaintenanceServiceImpl extends BaseServiceImpl<Certifica
         //获取全部证书类型
         Set<String> certificateType = certificateMaintenanceImports.stream().map(CertificateMaintenanceImport::getCertificateType)
                 .collect(Collectors.toSet());
-
+        LambdaQueryWrapper<CertificateTypeEntity> certificateTypeEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        return null;
+        certificateTypeEntityLambdaQueryWrapper.in(CollectionUtils.isNotEmpty(certificateType), CertificateTypeEntity::getName, certificateType); // [8](@ref)
+        List<CertificateTypeEntity> certificateTypeEntities = certificateTypeMapper.selectList(certificateTypeEntityLambdaQueryWrapper);
+        Map<String, Long> certificateTypeNameIds = certificateTypeEntities.stream().collect(Collectors.toMap(
+                entity -> entity.getName(),
+                entity -> entity.getId()));
+        certificateType.removeAll(certificateTypeNameIds.keySet());
+        if (certificateType.size() > 0) {
+            return R.fail("证书:" + String.join(",", certificateType) + "不存在。");
+        }
+        List<CertificateMaintenanceEntity> saves = new ArrayList<>();
+        certificateMaintenanceImports.forEach(e -> {
+            CertificateMaintenanceEntity entity = new CertificateMaintenanceEntity();
+            entity.setPhId(codePostHandleIdMap.get(e.getUserCode()));
+            entity.setCertificateId(certificateTypeNameIds.get(e.getCertificateType()));
+            entity.setCertificateDate(e.getCertificateDate());
+            entity.setAstronautDate(e.getAstronautDate());
+            entity.setAirworthinessDate(e.getAirworthinessDate());
+            entity.setCertificateCode(e.getCertificateCode());
+            entity.setMaintenanceStatus(MaintenanceStatusEnum.NORMAL.getCode().shortValue());
+            saves.add(entity);
+        });
+        boolean saved = this.saveBatch(saves);
+        return R.status(saved);
     }
 
 

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateTypeServiceImpl.java

@@ -1,10 +1,10 @@
-package org.springblade.desk.jobTransfer.service.impl;
+package org.springblade.desk.jobtransfer.service.impl;
 
-import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity;
-import org.springblade.desk.jobTransfer.pojo.excel.CertificateTypeExcel;
+import org.springblade.desk.jobtransfer.pojo.excel.CertificateTypeExcel;
-import org.springblade.desk.jobTransfer.pojo.vo.CertificateTypeVO;
+import org.springblade.desk.jobtransfer.pojo.vo.CertificateTypeVO;
-import org.springblade.desk.jobTransfer.mapper.CertificateTypeMapper;
+import org.springblade.desk.jobtransfer.mapper.CertificateTypeMapper;
-import org.springblade.desk.jobTransfer.service.ICertificateTypeService;
+import org.springblade.desk.jobtransfer.service.ICertificateTypeService;
 import org.springframework.stereotype.Service;
 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/service/impl/CultivateDetailServiceImpl.java

@@ -1,17 +1,16 @@
-package org.springblade.desk.jobTransfer.service.impl;
+package org.springblade.desk.jobtransfer.service.impl;
 
 import jakarta.annotation.Resource;
 import org.springblade.core.tool.api.R;
-import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity;
-import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity;
-import org.springblade.desk.jobTransfer.pojo.enums.PostHandleStatusEnum;
+import org.springblade.desk.jobtransfer.pojo.enums.PostHandleStatusEnum;
-import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel;
+import org.springblade.desk.jobtransfer.pojo.excel.CultivateDetailExcel;
-import org.springblade.desk.jobTransfer.pojo.request.CultivateDetailQuery;
+import org.springblade.desk.jobtransfer.pojo.request.CultivateDetailQuery;
-import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO;
+import org.springblade.desk.jobtransfer.pojo.vo.CultivateDetailVO;
-import org.springblade.desk.jobTransfer.mapper.CultivateDetailMapper;
+import org.springblade.desk.jobtransfer.mapper.CultivateDetailMapper;
-import org.springblade.desk.jobTransfer.service.ICultivateDetailService;
+import org.springblade.desk.jobtransfer.service.ICultivateDetailService;
-import org.springblade.desk.jobTransfer.service.IPostHandleService;
+import org.springblade.desk.jobtransfer.service.IPostHandleService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;

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

@@ -1,12 +1,11 @@
-package org.springblade.desk.jobTransfer.service.impl;
+package org.springblade.desk.jobtransfer.service.impl;
-
+
-import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity;
-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.request.EquipmentMaintenanceQuery;
-import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceListVO;
+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.mapper.EquipmentMaintenanceMapper;
+import org.springblade.desk.jobtransfer.service.IEquipmentMaintenanceService;
-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;

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/PostHandleServiceImpl.java

@@ -1,30 +1,27 @@
-package org.springblade.desk.jobTransfer.service.impl;
+package org.springblade.desk.jobtransfer.service.impl;
 
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import jakarta.annotation.Resource;
 import org.springblade.core.tool.api.R;
 import org.springblade.desk.basic.pojo.entity.RelTeamSetUser;
 import org.springblade.desk.basic.service.IRelTeamSetUserService;
-import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity;
-import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity;
-import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity;
-import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity;
-import org.springblade.desk.jobTransfer.pojo.enums.*;
+import org.springblade.desk.jobtransfer.pojo.enums.*;
-import org.springblade.desk.jobTransfer.pojo.excel.PostHandleExcel;
+import org.springblade.desk.jobtransfer.pojo.excel.PostHandleExcel;
-import org.springblade.desk.jobTransfer.pojo.excel.PostHandleImport;
+import org.springblade.desk.jobtransfer.pojo.excel.PostHandleImport;
-import org.springblade.desk.jobTransfer.pojo.request.PostHandleQuery;
+import org.springblade.desk.jobtransfer.pojo.request.JobTransferSave;
-import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO;
+import org.springblade.desk.jobtransfer.pojo.request.PostHandleQuery;
-import org.springblade.desk.jobTransfer.mapper.PostHandleMapper;
+import org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO;
-import org.springblade.desk.jobTransfer.service.ICertificateMaintenanceService;
+import org.springblade.desk.jobtransfer.mapper.PostHandleMapper;
-import org.springblade.desk.jobTransfer.service.ICultivateDetailService;
+import org.springblade.desk.jobtransfer.service.ICertificateMaintenanceService;
-import org.springblade.desk.jobTransfer.service.IEquipmentMaintenanceService;
+import org.springblade.desk.jobtransfer.service.ICultivateDetailService;
-import org.springblade.desk.jobTransfer.service.IPostHandleService;
+import org.springblade.desk.jobtransfer.service.IEquipmentMaintenanceService;
-import org.springblade.system.cache.SysCache;
+import org.springblade.desk.jobtransfer.service.IPostHandleService;
 import org.springblade.system.cache.UserCache;
-import org.springblade.system.pojo.entity.User;
 import org.springblade.system.pojo.entity.UserInfo;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -262,12 +259,16 @@ public class PostHandleServiceImpl extends BaseServiceImpl<PostHandleMapper, Pos
     }
 
     @Override
-    public R jobTransfer(PostHandleEntity postHandleEntity) {
+    public R jobTransfer(JobTransferSave jobTransferSave) {
-        if (!(PostHandleStatusEnum.JOB_TRANSFER_TRAINED.getCode().shortValue() == postHandleEntity.getPhStatus())) {
+        if (!(PostHandleStatusEnum.JOB_TRANSFER_TRAINED.getCode().shortValue() == jobTransferSave.getPhStatus())) {
             return R.fail("请在转岗培训完成后操作");
         }
+        PostHandleEntity postHandleEntity = new PostHandleEntity();
+        postHandleEntity.setId(jobTransferSave.getPhId());
         postHandleEntity.setPhStatus(PostHandleStatusEnum.NORMALITY.getCode().shortValue());
         postHandleEntity.setToNewJob(new Date());
+        postHandleEntity.setDeptId(jobTransferSave.getDeptId());
+        postHandleEntity.setStation(jobTransferSave.getStation());
         return R.status(this.updateById(postHandleEntity));
     }
 

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/TrainingPlanServiceImpl.java

@@ -1,12 +1,11 @@
-package org.springblade.desk.jobTransfer.service.impl;
+package org.springblade.desk.jobtransfer.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.springblade.desk.jobTransfer.pojo.entity.TrainingPlanEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.TrainingPlanEntity;
-import org.springblade.desk.jobTransfer.pojo.excel.TrainingPlanExcel;
+import org.springblade.desk.jobtransfer.pojo.excel.TrainingPlanExcel;
-import org.springblade.desk.jobTransfer.pojo.vo.TrainingPlanVO;
+import org.springblade.desk.jobtransfer.mapper.TrainingPlanMapper;
-import org.springblade.desk.jobTransfer.mapper.TrainingPlanMapper;
+import org.springblade.desk.jobtransfer.service.ITrainingPlanService;
-import org.springblade.desk.jobTransfer.service.ITrainingPlanService;
 import org.springframework.stereotype.Service;
 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/wrapper/CertificateMaintenanceWrapper.java

@@ -1,9 +1,9 @@
-package org.springblade.desk.jobTransfer.wrapper;
+package org.springblade.desk.jobtransfer.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity;
-import org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO;
+import org.springblade.desk.jobtransfer.pojo.vo.CertificateMaintenanceVO;
 
 import java.util.Objects;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/CertificateTypeWrapper.java

@@ -1,9 +1,9 @@
-package org.springblade.desk.jobTransfer.wrapper;
+package org.springblade.desk.jobtransfer.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity;
-import org.springblade.desk.jobTransfer.pojo.vo.CertificateTypeVO;
+import org.springblade.desk.jobtransfer.pojo.vo.CertificateTypeVO;
 
 import java.util.Objects;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/CultivateDetailWrapper.java

@@ -1,9 +1,9 @@
-package org.springblade.desk.jobTransfer.wrapper;
+package org.springblade.desk.jobtransfer.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity;
-import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO;
+import org.springblade.desk.jobtransfer.pojo.vo.CultivateDetailVO;
 
 import java.util.Objects;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/EquipmentMaintenanceWrapper.java

@@ -1,9 +1,9 @@
-package org.springblade.desk.jobTransfer.wrapper;
+package org.springblade.desk.jobtransfer.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity;
-import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceVO;
+import org.springblade.desk.jobtransfer.pojo.vo.EquipmentMaintenanceVO;
 
 import java.util.Objects;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/PostHandleWrapper.java

@@ -1,14 +1,13 @@
-package org.springblade.desk.jobTransfer.wrapper;
+package org.springblade.desk.jobtransfer.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity;
-import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO;
+import org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO;
 import org.springblade.system.cache.SysCache;
 import org.springblade.system.cache.UserCache;
 import org.springblade.system.pojo.entity.Dept;
 import org.springblade.system.pojo.entity.User;
-import org.springblade.system.pojo.entity.UserDept;
 
 import java.util.Objects;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/TrainingPlanWrapper.java

@@ -1,9 +1,9 @@
-package org.springblade.desk.jobTransfer.wrapper;
+package org.springblade.desk.jobtransfer.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.desk.jobTransfer.pojo.entity.TrainingPlanEntity;
+import org.springblade.desk.jobtransfer.pojo.entity.TrainingPlanEntity;
-import org.springblade.desk.jobTransfer.pojo.vo.TrainingPlanVO;
+import org.springblade.desk.jobtransfer.pojo.vo.TrainingPlanVO;
 
 import java.util.Objects;
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java

@@ -72,7 +72,8 @@ public class PlateGoodsApplyController extends BladeController {
     public R save(@Valid @RequestBody PlateGoodsApplySave saveData) {
         PlateGoodsApply entity = saveData.getAssayContent();
         List<PlateGoodsApplyDetail> detailList = saveData.getDetailList();
-        plateGoodsApplyService.save(entity, detailList);
+		List<Long> recordIdList = saveData.getRecordIdList();
+        plateGoodsApplyService.save(entity, detailList, recordIdList);
         return R.status(true);
     }
 

blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java

@@ -225,6 +225,7 @@ public class YieldOrderController extends BladeController {
 	 *
 	 * @return true:重复 false:不重复
 	 */
+	@Deprecated
 	@PostMapping(value = "/receiveOrderFromOldMes")
 	@Operation(summary = "保存旧mes传过来的生产订单", description = "")
 	public R receiveOrderFromOldMes(@RequestBody JSONObject dataObject) {
@@ -232,4 +233,17 @@ public class YieldOrderController extends BladeController {
 		yieldOrderService.receiveOrderFromOldMes(dataList);
 		return R.success();
 	}
+
+	/**
+	 * 保存旧mes传过来的生产订单状态
+	 *
+	 * @return
+	 */
+	@Deprecated
+	@PostMapping(value = "/receiveOrderStatusFromOldMes")
+	@Operation(summary = "保存旧mes传过来的生产订单状态数据", description = "")
+	public R receiveOrderStatusFromOldMes(@RequestBody JSONObject entity) {
+		yieldOrderService.receiveOrderStatusFromOldMes(entity.getString("cardNo"), entity.getInteger("status"));
+		return R.success();
+	}
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IPlateGoodsApplyService.java

@@ -27,9 +27,10 @@ public interface IPlateGoodsApplyService extends BaseService<PlateGoodsApply> {
 	 *
 	 * @param entity
 	 * @param detailList
+	 * @param recordIdList
 	 * @return
 	 */
-	boolean save(PlateGoodsApply entity, List<PlateGoodsApplyDetail> detailList);
+	boolean save(PlateGoodsApply entity, List<PlateGoodsApplyDetail> detailList, List<Long> recordIdList);
 
 	/**
 	 * 修改

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java

@@ -151,4 +151,12 @@ public interface IYieldOrderService extends BaseService<YieldOrder> {
 	 * @param dataList
 	 */
 	void receiveOrderFromOldMes(JSONArray dataList);
+
+	/**
+	 * 接收旧mes同步的生产订单状态数据
+	 *
+	 * @param cardNo
+	 * @param statusCode
+	 */
+	void receiveOrderStatusFromOldMes(String cardNo, Integer statusCode);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/PlateGoodsApplyServiceImpl.java

@@ -34,8 +34,11 @@ public class PlateGoodsApplyServiceImpl extends BaseServiceImpl<PlateGoodsApplyM
 	}
 
 	@Override
-	public boolean save(PlateGoodsApply entity, List<PlateGoodsApplyDetail> detailList) {
+	public boolean save(PlateGoodsApply entity, List<PlateGoodsApplyDetail> detailList, List<Long> recordIdList) {
 		if (this.save(entity)) {
+			// 1. 更新化验记录相关数据
+
+			// 2. 更新需求单的相关数据
 			for (PlateGoodsApplyDetail detail : detailList) {
 				detail.setPgadId(entity.getId());
 			}

blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java

@@ -94,8 +94,8 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 	public IPage<YieldOrder> pageMaterialApply(IPage<YieldOrder> page, Long wcId, Integer materialType, Integer overHalfMon) {
 		YieldOrder entity = new YieldOrder();
 		entity.setWorkCenterId(wcId);
-		//TODO 1. 金钾银钾如何区分
+		// TODO 1. 金钾银钾如何区分，使用工艺编制中的物料编号，其中只有金钾、银钾的选项
-		// 2. 允许使用半月以上的数据是以生产订单的什么时间算
+		// TODO 2. 允许使用半月以上的数据是以生产订单的什么时间算，需查看原来的逻辑
 		List<YieldOrder> dataList = baseMapper.selectPage(page, entity, null);
 		return page.setRecords(dataList);
 	}
@@ -552,6 +552,26 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 		}
 	}
 
+	@Override
+	public void receiveOrderStatusFromOldMes(String cardNo, Integer statusCode) {
+		// 先根据流程卡号查询订单，如果查不到则不处理
+		List<YieldOrder> orderList = baseMapper.selectList(Wrappers.lambdaQuery(YieldOrder.class).eq(YieldOrder::getCardNo, cardNo));
+		if (orderList.size() > 0) {
+			YieldOrder yieldOrder = orderList.get(0);
+			switch (statusCode) {
+				case 15:
+					yieldOrder.setStatus(YieldOrderEnum.STATUS_COMPLETED.getCode());
+					break;
+				case 21:
+					yieldOrder.setStatus(YieldOrderEnum.STATUS_CLOSED.getCode());
+					break;
+				default:
+					break;
+			}
+			this.updateById(yieldOrder);
+		}
+	}
+
 	/**
 	 * 验证零件子件信息
 	 *

blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/YieldPlanWrapper.java

@@ -2,9 +2,12 @@ package org.springblade.desk.order.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.order.pojo.entity.YieldPlan;
 import org.springblade.desk.order.pojo.enums.YieldPlanEnum;
 import org.springblade.desk.order.pojo.vo.YieldPlanVo;
+import org.springblade.system.cache.UserCache;
+import org.springblade.system.pojo.entity.User;
 
 import java.util.Objects;
 
@@ -23,6 +26,11 @@ public class YieldPlanWrapper extends BaseEntityWrapper<YieldPlan, YieldPlanVo>
 	public YieldPlanVo entityVO(YieldPlan entity) {
 		YieldPlanVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, YieldPlanVo.class));
 		vo.setStatusName(YieldPlanEnum.getName(entity.getStatus()));
+
+		User user = UserCache.getUser(entity.getPlanUser());
+		if (Func.isNotEmpty(user)) {
+			vo.setPlanUserName(user.getAccount());
+		}
 		return vo;
 	}
 }

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/SchedulingApplication.java

@@ -28,7 +28,6 @@ package org.springblade.scheduling;
 import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.cloud.client.BladeCloudApplication;
 import org.springblade.core.launch.BladeApplication;
-import org.springblade.core.launch.constant.AppConstant;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipAbilityController.java

@@ -117,7 +117,7 @@ public class EquipAbilityController extends BladeController {
 		}
 		equipAbilityService.save(entity);
 		//初始化设备资源
-		equipResourceService.initSingleEquipResource(entity.getWorkCenterId(),entity.getCraftId(),entity.getEquipCode());
+		equipResourceService.initSingleEquipResource(entity);
 		return R.status(true);
 	}
 
@@ -130,7 +130,7 @@ public class EquipAbilityController extends BladeController {
 	public R update(@Valid @RequestBody EquipAbilityEntity entity) {
 		equipAbilityService.updateById(entity);
 		//初始化设备资源
-		equipResourceService.initSingleEquipResource(entity.getWorkCenterId(),entity.getCraftId(),entity.getEquipCode());
+		equipResourceService.initSingleEquipResource(entity);
 		return R.status(true);
 	}
 

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonAbilityController.java

@@ -46,6 +46,7 @@ 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.jobtransfer.pojo.entity.CertificateTypeEntity;
 import org.springblade.scheduling.pojo.entity.PersonAbilityEntity;
 import org.springblade.scheduling.scheduling.excel.PersonAbilityExcel;
 import org.springblade.scheduling.scheduling.service.IPersonAbilityService;
@@ -160,4 +161,15 @@ public class PersonAbilityController extends BladeController {
 		ExcelUtil.export(response, "人员能力表数据" + DateUtil.time(), "人员能力表数据表", list, PersonAbilityExcel.class);
 	}
 
+
+	/**
+	 * 获取证书列表
+	 */
+	@GetMapping("/selectCertificateList")
+	@ApiOperationSupport(order = 2)
+	public R<List<CertificateTypeEntity>> selectCertificateList() {
+		List<CertificateTypeEntity> list = personAbilityService.selectCertificateList();
+		return R.data(list);
+	}
+
 }

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/WorkOrderController.java

@@ -25,6 +25,7 @@
  */
 package org.springblade.scheduling.scheduling.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -242,4 +243,14 @@ public class WorkOrderController extends BladeController {
 		ExcelUtil.export(response, "车间订单表数据" + DateUtil.time(), "车间订单表数据表", list, SchedulingBoardExcel.class);
 	}
 
+	/**
+	 * 车间订单 更新调度人员
+	 */
+	@PostMapping("/receiveDispatcherFromOldMes")
+	@Operation(summary = "更新调度人员", description = "")
+	public R receiveDispatcherFromOldMes(@RequestBody JSONObject entity) {
+		workOrderService.receiveDispatcherFromOldMes(entity.getLong("id"), entity.getLong("dispatcher"));
+		return R.success();
+	}
+
 }

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/dto/WorkOrderDto.java

@@ -46,6 +46,8 @@ public class WorkOrderDto {
     private String productIdent;
     private String receiveTime;
     private String priorityAps;
+    private String teamMembers;
+    private String releaseDate;
 
     private List<String> planStatusList;
 

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/feign/WorkOrderClient.java

@@ -0,0 +1,57 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.scheduling.scheduling.feign;
+
+
+import io.swagger.v3.oas.annotations.Hidden;
+import lombok.AllArgsConstructor;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.core.tool.api.R;
+import org.springblade.scheduling.feign.IWorkOrderClient;
+import org.springblade.scheduling.scheduling.service.IWorkOrderService;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 字典服务Feign实现类
+ *
+ * @author Chill
+ */
+@NonDS
+@Hidden
+@RestController
+@AllArgsConstructor
+public class WorkOrderClient implements IWorkOrderClient {
+
+	private final IWorkOrderService workOrderService;
+
+
+	@Override
+	public R<Void> scheduling() {
+		workOrderService.scheduling();
+		return R.success();
+	}
+}

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
+import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity;
 import org.springblade.scheduling.pojo.entity.PersonAbilityEntity;
 import org.springblade.scheduling.scheduling.excel.PersonAbilityExcel;
 import org.springblade.scheduling.scheduling.vo.PersonAbilityVO;
@@ -60,5 +61,7 @@ public interface PersonAbilityMapper extends BaseMapper<PersonAbilityEntity> {
      */
     List<PersonAbilityExcel> export(@Param("ew") Wrapper<PersonAbilityEntity> queryWrapper);
 
+    List<CertificateTypeEntity> selectCertificateList();
+
 
 }

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.xml

@@ -42,4 +42,8 @@
     <select id="export" resultType="org.springblade.scheduling.scheduling.excel.PersonAbilityExcel">
         SELECT * FROM MES_PERSON_ABILITY ${ew.customSqlSegment}
     </select>
+
+    <select id="selectCertificateList" resultType="org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity">
+        SELECT * FROM MES_CERTIFICATE_TYPE where is_deleted = 0
+    </select>
 </mapper>

blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.java

@@ -76,4 +76,6 @@ public interface WorkOrderMapper extends BaseMapper<WorkOrderEntity> {
 
 	List<SchedulingBoardExcel> exportSchedulingBoard(WorkOrderDto workOrderDto);
 
+	List<String> selectTeamMember(@Param("teamId") Long teamId,@Param("certificateId") Long certificateId);
+
 }