From 3a001cb112600f063b619fc290dab39979b3be7b Mon Sep 17 00:00:00 2001 From: Tom Li Date: Tue, 13 Jan 2026 19:24:11 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=A4=84=E7=BD=AE?= =?UTF-8?q?=E5=8D=95=E7=9B=B8=E5=85=B3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/quality/pojo/entity/ReviewSheet.java | 28 ++++- .../pojo/request/ReviewSheetHisWOSearch.java | 4 + .../pojo/request/ReviewSheetInitSearch.java | 23 +++- .../request/ReviewSheetRedoScrapSearch.java | 33 +++++ .../pojo/request/ReviewSheetRedoSearch.java | 13 -- .../pojo/request/ReviewSheetScrapSearch.java | 13 -- .../pojo/request/ReviewSheetSelfSearch.java | 20 +++- .../desk/quality/pojo/vo/ELeVO.java | 28 +++++ .../quality/pojo/vo/ReviewSheetDetailVO.java | 44 +++++++ ...etErpListVO.java => ReviewSheetErpVO.java} | 2 +- .../quality/pojo/vo/ReviewSheetHisWOVO.java | 22 ++++ ...SelfListVO.java => ReviewSheetInitVO.java} | 2 +- .../pojo/vo/ReviewSheetRedoListVO.java | 24 ---- ...istVO.java => ReviewSheetRedoScrapVO.java} | 2 +- ...InitListVO.java => ReviewSheetSelfVO.java} | 2 +- .../desk/quality/pojo/vo/ReviewSheetVO.java | 34 ------ .../quality/constant/ReviewSheetConst.java | 75 +++++++++++- .../controller/ReviewSheetController.java | 113 +++++++----------- .../quality/mapper/ReviewSheetMapper.java | 4 +- .../desk/quality/mapper/ReviewSheetMapper.xml | 4 + .../quality/service/IReviewSheetService.java | 19 +-- .../impl/InspectionTaskServiceImpl.java | 8 +- .../service/impl/ReviewSheetServiceImpl.java | 77 ++++++++++-- ...per.java => ReviewSheetDetailWrapper.java} | 13 +- ...rapper.java => ReviewSheetErpWrapper.java} | 12 +- ...apper.java => ReviewSheetInitWrapper.java} | 13 +- ....java => ReviewSheetRedoScrapWrapper.java} | 13 +- .../wrapper/ReviewSheetScrapListWrapper.java | 37 ------ ...apper.java => ReviewSheetSelfWrapper.java} | 13 +- 29 files changed, 430 insertions(+), 265 deletions(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetHisWOSearch.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoScrapSearch.java delete mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoSearch.java delete mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetScrapSearch.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ELeVO.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDetailVO.java rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/{ReviewSheetErpListVO.java => ReviewSheetErpVO.java} (95%) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetHisWOVO.java rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/{ReviewSheetSelfListVO.java => ReviewSheetInitVO.java} (96%) delete mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoListVO.java rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/{ReviewSheetScrapListVO.java => ReviewSheetRedoScrapVO.java} (94%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/{ReviewSheetInitListVO.java => ReviewSheetSelfVO.java} (96%) delete mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java rename blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/{ReviewSheetErpListWrapper.java => ReviewSheetDetailWrapper.java} (56%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/{ReviewSheetWrapper.java => ReviewSheetErpWrapper.java} (61%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/{ReviewSheetInitListWrapper.java => ReviewSheetInitWrapper.java} (56%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/{ReviewSheetSelfListWrapper.java => ReviewSheetRedoScrapWrapper.java} (56%) delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetScrapListWrapper.java rename blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/{ReviewSheetRedoListWrapper.java => ReviewSheetSelfWrapper.java} (56%) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java index 000e55cd..e49f33e8 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java @@ -23,10 +23,10 @@ import java.time.LocalDateTime; * @author Tom Shuo * @since 2026-01-06 */ -@Data @TableName("QA_REVIEW_SHEET") -@Schema(description = "ReviewSheet Entity对象") +@Data @EqualsAndHashCode(callSuper = true) +@Schema(description = "ReviewSheet Entity对象") public class ReviewSheet extends BaseEntity { @Serial @@ -349,12 +349,12 @@ public class ReviewSheet extends BaseEntity { * 总数量 */ @Schema(description = "总数量") - private Short totalNum; + private Integer totalNum; /** * 返修数量 */ @Schema(description = "返修数量") - private Short reDoNum; + private Integer reDoNum; /** * 返修原因 */ @@ -375,4 +375,24 @@ public class ReviewSheet extends BaseEntity { */ @Schema(description = "[作业中心]id") private Long wcId; + /** + * 报废数量 + */ + @Schema(description = "报废数量") + private Integer scrapNum; + /** + * 报废数量 + */ + @Schema(description = "内部审理是否通过/驳回-[1]:通过;[2]:驳回;") + private Integer selfReviewFlag; + /** + * 不良原因 + */ + @Schema(description = "不良原因") + private String poorReason; + /** + * 不良描述 + */ + @Schema(description = "不良描述") + private String poorDesc; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetHisWOSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetHisWOSearch.java new file mode 100644 index 00000000..18945bf4 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetHisWOSearch.java @@ -0,0 +1,4 @@ +package org.springblade.desk.quality.pojo.request; + +public class ReviewSheetHisWOSearch { +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetInitSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetInitSearch.java index 01d2d5de..b8393159 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetInitSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetInitSearch.java @@ -1,14 +1,35 @@ package org.springblade.desk.quality.pojo.request; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.ReviewSheet; /** - * todo: + * 生产处置单 搜索 */ @Data @EqualsAndHashCode(callSuper = false) public class ReviewSheetInitSearch extends ReviewSheet { + @Schema(description = "单据编号") + private String docCode; + @Schema(description = "车间订单号") + private String woCode; + @Schema(description = "产品编号") + private String prodCode; + @Schema(description = "产品名称") + private String prodName; + @Schema(description = "产品型号名称") + private String prodTypeName; + @Schema(description = "生产标识") + private String prodIdent; + @Schema(description = "批次号") + private String batchNo; + @Schema(description = "流程卡号") + private String cardNo; + @Schema(description = "创建时间-开始") + private String createTimeStart; + @Schema(description = "创建时间-结束") + private String createTimeEnd; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoScrapSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoScrapSearch.java new file mode 100644 index 00000000..581ca727 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoScrapSearch.java @@ -0,0 +1,33 @@ +package org.springblade.desk.quality.pojo.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; + +/** + * 返工审理 报废审理 搜索 + */ +@Data +@EqualsAndHashCode(callSuper = false) +public class ReviewSheetRedoScrapSearch extends ReviewSheet { + + @Schema(description = "业务类型-[1]:内部审理返修;[2]:内部审理报废;") + private Integer bizType; + @Schema(description = "车间订单号") + private String woCode; + @Schema(description = "创建时间-开始") + private String createTimeStart; + @Schema(description = "创建时间-结束") + private String createTimeEnd; + @Schema(description = "提请人员[用户]真名") + private String createUserRealName; + @Schema(description = "审理[用户]真名") + private String reviewUserRealName; + @Schema(description = "供应商代码") + private String oemCode; + @Schema(description = "供应商名称") + private String oemName; + @Schema(description = "生产标识") + private String prodIdent; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoSearch.java deleted file mode 100644 index fe97ee2e..00000000 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoSearch.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.springblade.desk.quality.pojo.request; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * todo: - */ -@Data -@EqualsAndHashCode() -public class ReviewSheetRedoSearch { - -} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetScrapSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetScrapSearch.java deleted file mode 100644 index 9edae34d..00000000 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetScrapSearch.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.springblade.desk.quality.pojo.request; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * todo: - */ -@Data -@EqualsAndHashCode() -public class ReviewSheetScrapSearch { - -} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetSelfSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetSelfSearch.java index 5e937b2c..260d270f 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetSelfSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetSelfSearch.java @@ -1,13 +1,27 @@ package org.springblade.desk.quality.pojo.request; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; /** - * todo: + * 内部审理 搜索 */ @Data -@EqualsAndHashCode() -public class ReviewSheetSelfSearch { +@EqualsAndHashCode(callSuper = false) +public class ReviewSheetSelfSearch extends ReviewSheet { + @Schema(description = "车间订单号") + private String woCode; + @Schema(description = "供应商名称") + private String oemName; + @Schema(description = "创建时间-开始") + private String createTimeStart; + @Schema(description = "创建时间-结束") + private String createTimeEnd; + @Schema(description = "审理时间-开始") + private String reviewTimeStart; + @Schema(description = "审理时间-结束") + private String reviewTimeEnd; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ELeVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ELeVO.java new file mode 100644 index 00000000..b1b9e625 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ELeVO.java @@ -0,0 +1,28 @@ +package org.springblade.desk.quality.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * [电子档案] todo: + */ +@Data +@EqualsAndHashCode() +public class ELeVO { + + @Schema(description = "[车间订单]编号") + private String woCode = ""; + @Schema(description = "[产品]编号") + private String prodCode = ""; + @Schema(description = "[批次]编号") + private String batCode = ""; + @Schema(description = "生产标识") + private String prodIdent = ""; + @Schema(description = "加工[班组]名称") + private String workTeamSetName; + @Schema(description = "完工时间") + private String finishTime; + @Schema(description = "上传兰台时间") + private String uploadTime; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDetailVO.java new file mode 100644 index 00000000..bf1b510c --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDetailVO.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; + +import java.io.Serial; +import java.util.List; + +/** + * [生产处置单] 视图实体类 detail详情 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ReviewSheetDetailVO extends ReviewSheet { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "问题故障list") + private List faultList; + @Schema(description = "问题故障删除ids") + private String faultDeleteIds = ""; + @Schema(description = "责任零件list") + private List dutyList; + @Schema(description = "责任零件删除ids") + private String dutyDeleteIds = ""; + + @Schema(description = "发现[工序]名称") + private String findPrecessName; + @Schema(description = "流程卡号") + private String cardNo; + @Schema(description = "[物料]名称") + private String materialName; + @Schema(description = "提交类型") + private Integer submitType = 0; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetErpListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetErpVO.java similarity index 95% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetErpListVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetErpVO.java index f09e0ecd..581eb1f2 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetErpListVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetErpVO.java @@ -8,7 +8,7 @@ import org.springblade.desk.quality.pojo.entity.ReviewSheet; @Data @EqualsAndHashCode(callSuper = true) -public class ReviewSheetErpListVO extends ReviewSheet { +public class ReviewSheetErpVO extends ReviewSheet { @Schema(description = "BaseEntityVO") private BaseEntityVO base; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetHisWOVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetHisWOVO.java new file mode 100644 index 00000000..1f5d6b69 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetHisWOVO.java @@ -0,0 +1,22 @@ +package org.springblade.desk.quality.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 历史已完成车间订单 WorkOrder Copy Entity + */ +@Data +@EqualsAndHashCode() +public class ReviewSheetHisWOVO { + + @Schema(description = "车间订单id") + private Long woId = 1000L; + + @Schema(description = "车间订单编码") + private String woCode = "CJ1000"; + + @Schema(description = "车间订单下拉显示信息") + private String woInfo = "CJ1000"; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetSelfListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitVO.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetSelfListVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitVO.java index 2d3f9897..a9c7f038 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetSelfListVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitVO.java @@ -8,7 +8,7 @@ import org.springblade.desk.quality.pojo.entity.ReviewSheet; @Data @EqualsAndHashCode(callSuper = true) -public class ReviewSheetSelfListVO extends ReviewSheet { +public class ReviewSheetInitVO extends ReviewSheet { @Schema(description = "BaseEntityVO") private BaseEntityVO base; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoListVO.java deleted file mode 100644 index 873d7cca..00000000 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoListVO.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.springblade.desk.quality.pojo.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.desk.basic.pojo.vo.BaseEntityVO; -import org.springblade.desk.quality.pojo.entity.ReviewSheet; - -@Data -@EqualsAndHashCode(callSuper = true) -public class ReviewSheetRedoListVO extends ReviewSheet { - - @Schema(description = "BaseEntityVO") - private BaseEntityVO base; - @Schema(description = "审理状态 名称") - private String reviewStatusName; - @Schema(description = "审理[用户]真名") - private String reviewUserRealName; - @Schema(description = "打回[用户]真名") - private String backUserRealName; - @Schema(description = "车间订单号") - private String woCode; - -} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetScrapListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoScrapVO.java similarity index 94% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetScrapListVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoScrapVO.java index c4c03cc9..60f5f5cc 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetScrapListVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoScrapVO.java @@ -8,7 +8,7 @@ import org.springblade.desk.quality.pojo.entity.ReviewSheet; @Data @EqualsAndHashCode(callSuper = true) -public class ReviewSheetScrapListVO extends ReviewSheet { +public class ReviewSheetRedoScrapVO extends ReviewSheet { @Schema(description = "BaseEntityVO") private BaseEntityVO base; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetSelfVO.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitListVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetSelfVO.java index cea01d6b..73f499c1 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetInitListVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetSelfVO.java @@ -8,7 +8,7 @@ import org.springblade.desk.quality.pojo.entity.ReviewSheet; @Data @EqualsAndHashCode(callSuper = true) -public class ReviewSheetInitListVO extends ReviewSheet { +public class ReviewSheetSelfVO extends ReviewSheet { @Schema(description = "BaseEntityVO") private BaseEntityVO base; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java deleted file mode 100644 index fffafd94..00000000 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.quality.pojo.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.desk.quality.pojo.entity.ReviewSheet; - -import java.io.Serial; -import java.util.List; - -/** - * [生产处置单] 视图实体类 detail详情 - * - * @author Tom Shuo - * @since 2026-01-06 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class ReviewSheetVO extends ReviewSheet { - @Serial - private static final long serialVersionUID = 1L; - - @Schema(description = "故障list") - private List faultList; - @Schema(description = "故障删除ids") - private String faultDeleteIds = ""; - @Schema(description = "责任零件list") - private List dutyList; - @Schema(description = "责任零件删除ids") - private String dutyDeleteIds = ""; -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java index ce9aa18a..72e3c3e7 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java @@ -5,13 +5,24 @@ package org.springblade.desk.quality.constant; */ public interface ReviewSheetConst { + /** + * 初始化 + */ Integer S_INIT = 0; - // [1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理; interface BizType { - Integer T_1 = 1; - Integer T_2 = 2; - Integer T_3 = 3; + /** + * [1]:内部审理返修 + */ + Integer T_SELF_REDO = 1; + /** + * [2]:内部审理报废 + */ + Integer T_SELF_SCRAP = 2; + /** + * [3]:ERP审理 + */ + Integer T_ERP = 3; } interface ERP { @@ -62,6 +73,24 @@ public interface ReviewSheetConst { Integer REVIEW_STATUS_15 = 15; } + interface SELF { + /** + * 编制中 + */ + Integer S_NEW = 1; + /** + * 待审理 + */ + Integer S_JUDGE = 2; + /** + * 待完成 + */ + Integer S_TODO = 3; + /** + * 已完成 + */ + Integer S_FINISH = 4; + } /** * 零件模式 @@ -72,7 +101,43 @@ public interface ReviewSheetConst { */ Integer MODE_ASSEMBLY = 2; /** - * 售后模式 + * 售后模式 目前不用 */ Integer MODE_AFTER_SALES = 3; + + interface SUBMIT_TYPE { + /** + * 内部提交 + */ + Integer T_SELF = 10; + /** + * 内部暂存 目前不需要 + */ + Integer T_SELF_TEMP = 11; + /** + * ERP暂存 + */ + Integer T_ERP_TEMP = 21; + /** + * ERP提交质保 + */ + Integer T_ERP_QA = 22; + /** + * ERP提交工艺 + */ + Integer T_ERP_CRAFT = 23; + /** + * ERP提交设计 + */ + Integer T_ERP_DES = 24; + /** + * ERP提交设计变更 + */ + Integer T_ERP_DES_CHANGE = 25; + } + + interface SELF_REVIEW_FLAG { + Integer YES = 1; + Integer NO = 2; + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java index ac0f126b..c9691045 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java @@ -5,7 +5,6 @@ package org.springblade.desk.quality.controller; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.injector.methods.UpdateById; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; @@ -34,19 +33,13 @@ import org.springblade.desk.quality.pojo.entity.ReviewDuty; import org.springblade.desk.quality.pojo.entity.ReviewFault; import org.springblade.desk.quality.pojo.entity.ReviewSheet; import org.springblade.desk.quality.pojo.request.ReviewSheetInitSearch; -import org.springblade.desk.quality.pojo.request.ReviewSheetRedoSearch; -import org.springblade.desk.quality.pojo.request.ReviewSheetScrapSearch; +import org.springblade.desk.quality.pojo.request.ReviewSheetRedoScrapSearch; import org.springblade.desk.quality.pojo.request.ReviewSheetSelfSearch; -import org.springblade.desk.quality.pojo.vo.ReviewDutyVO; -import org.springblade.desk.quality.pojo.vo.ReviewFaultVO; -import org.springblade.desk.quality.pojo.vo.ReviewSheetInitListVO; -import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; +import org.springblade.desk.quality.pojo.vo.*; import org.springblade.desk.quality.service.IReviewDutyService; import org.springblade.desk.quality.service.IReviewFaultService; import org.springblade.desk.quality.service.IReviewSheetService; -import org.springblade.desk.quality.wrapper.ReviewDutyWrapper; -import org.springblade.desk.quality.wrapper.ReviewSheetInitListWrapper; -import org.springblade.desk.quality.wrapper.ReviewSheetWrapper; +import org.springblade.desk.quality.wrapper.*; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -84,10 +77,10 @@ public class ReviewSheetController extends BladeController { @GetMapping("/detail") @ApiOperationSupport(order = 10) @Operation(summary = "详情", description = "传入ReviewSheet Obj") - public R detail(ReviewSheet reviewSheet) { + public R detail(ReviewSheet reviewSheet) { QueryWrapper qw = Condition.getQueryWrapper(reviewSheet); ReviewSheet detail = service.getOne(qw); - ReviewSheetVO detailVO = ReviewSheetWrapper.build().entityVO(detail); + ReviewSheetDetailVO detailVO = ReviewSheetDetailWrapper.build().entityVO(detail); service.setVOValue(detailVO); return R.data(detailVO); } @@ -118,13 +111,13 @@ public class ReviewSheetController extends BladeController { @PostMapping("/listInit") @ApiOperationSupport(order = 20) @Operation(summary = "生产处置单list分页", description = "传入ReviewSheet Obj") - public R> listInit(@Parameter(hidden = true) @RequestParam(required = false) - ReviewSheetInitSearch search, Query query) { + public R> listInit(@Parameter(hidden = true) @RequestBody + ReviewSheetInitSearch search, Query query) { Map demo = new HashMap(); demo.put("status", ReviewSheetConst.S_INIT); QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ReviewSheetInitListWrapper.build().pageVO(pages); + IPage pagesVO = ReviewSheetInitWrapper.build().pageVO(pages); // todo: // pagesVO.getRecords() @@ -135,41 +128,22 @@ public class ReviewSheetController extends BladeController { } /** - * [生产处置单] 返工审理list分页 + * [生产处置单] 返工报废审理list分页 */ - @PostMapping("/listRedo") + @PostMapping("/listReviewRedoScrap") @ApiOperationSupport(order = 20) - @Operation(summary = "返工审理list分页", description = "传入ReviewSheet Obj") - public R> listRedo(@Parameter(hidden = true) @RequestParam(required = false) - ReviewSheetRedoSearch search, Query query) { + @Operation(summary = "返工报废审理list分页", description = "传入ReviewSheet Obj") + public R> listReviewRedoScrap(@Parameter(hidden = true) @RequestBody + ReviewSheetRedoScrapSearch search, Query query) { Map demo = new HashMap(); - demo.put("bizType", ReviewSheetConst.BizType.T_1); QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); + qw.eq(ReviewSheet.COL_BIZ_TYPE, search.getBizType()); + qw.eq(ReviewSheet.COL_REVIEW_STATUS, ReviewSheetConst.SELF.S_JUDGE); IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ReviewSheetWrapper.build().pageVO(pages); + IPage pagesVO = ReviewSheetRedoScrapWrapper.build().pageVO(pages); pagesVO.getRecords() .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - /** - * [生产处置单] 返工审理list分页 - */ - @PostMapping("/listScrap") - @ApiOperationSupport(order = 20) - @Operation(summary = "返工审理list分页", description = "传入ReviewSheet Obj") - public R> listScrap(@Parameter(hidden = true) @RequestParam(required = false) - ReviewSheetScrapSearch search, Query query) { - Map demo = new HashMap(); - demo.put("bizType", ReviewSheetConst.BizType.T_2); - QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ReviewSheetWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) + .peek(service::setRedoScrapVOValue) .collect(Collectors.toList()); return R.data(pagesVO); } @@ -180,16 +154,16 @@ public class ReviewSheetController extends BladeController { @PostMapping("/listSelf") @ApiOperationSupport(order = 20) @Operation(summary = "内部list分页", description = "传入ReviewSheet Obj") - public R> listSelf(@Parameter(hidden = true) @RequestParam(required = false) - ReviewSheetSelfSearch search, Query query) { + public R> listSelf(@Parameter(hidden = true) @RequestBody + ReviewSheetSelfSearch search, Query query) { Map demo = new HashMap(); QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); - qw.in("bizType", ReviewSheetConst.BizType.T_1, ReviewSheetConst.BizType.T_2); + qw.in("bizType", ReviewSheetConst.BizType.T_SELF_REDO, ReviewSheetConst.BizType.T_SELF_SCRAP); IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ReviewSheetWrapper.build().pageVO(pages); + IPage pagesVO = ReviewSheetSelfWrapper.build().pageVO(pages); pagesVO.getRecords() .stream() - .peek(service::setVOValue) + .peek(service::setSelfVOValue) .collect(Collectors.toList()); return R.data(pagesVO); } @@ -199,16 +173,16 @@ public class ReviewSheetController extends BladeController { */ @PostMapping("/listErp") @ApiOperationSupport(order = 20) - @Operation(summary = "ERPlist分页", description = "传入ReviewSheet Obj") - public R> listErp(@Parameter(hidden = true) @RequestParam Map reviewSheet, - Query query) { + @Operation(summary = "Erplist分页", description = "传入ReviewSheet Obj") + public R> listErp(@Parameter(hidden = true) @RequestParam Map reviewSheet, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(reviewSheet, ReviewSheet.class); - qw.eq("bizType", ReviewSheetConst.BizType.T_3); + qw.eq("bizType", ReviewSheetConst.BizType.T_ERP); IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ReviewSheetWrapper.build().pageVO(pages); + IPage pagesVO = ReviewSheetErpWrapper.build().pageVO(pages); pagesVO.getRecords() .stream() - .peek(service::setVOValue) + .peek(service::setErpVOValue) .collect(Collectors.toList()); return R.data(pagesVO); } @@ -232,9 +206,9 @@ public class ReviewSheetController extends BladeController { @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) @Operation(summary = "list下拉选择", description = "") - public R> listForSelect() { + public R> listForSelect() { List list = service.list(); - List listVO = ReviewSheetWrapper.build().listVO(list); + List listVO = ReviewSheetDetailWrapper.build().listVO(list); return R.data(listVO); } @@ -288,7 +262,7 @@ public class ReviewSheetController extends BladeController { @PostMapping("/submitInternal") @ApiOperationSupport(order = 50) @Operation(summary = "新增或修改一条", description = "传入ReviewSheet Obj") - public R submitInternal(@Valid @RequestBody ReviewSheetVO vo) { + public R submitInternal(@Valid @RequestBody ReviewSheetDetailVO vo) { { // dutyService.saveOrUpdateBatch(BeanUtil.copyToList(vo.getDutyList(), ReviewDuty.class)); @@ -308,7 +282,7 @@ public class ReviewSheetController extends BladeController { @PostMapping("/submitErp") @ApiOperationSupport(order = 50) @Operation(summary = "新增或修改一条", description = "传入ReviewSheet Obj") - public R submitErp(@Valid @RequestBody ReviewSheetVO vo) { + public R submitErp(@Valid @RequestBody ReviewSheetDetailVO vo) { { // dutyService.saveOrUpdateBatch(BeanUtil.copyToList(vo.getDutyList(), ReviewDuty.class)); @@ -322,16 +296,13 @@ public class ReviewSheetController extends BladeController { return R.status(service.saveOrUpdate(vo)); } - @GetMapping("/review") + @GetMapping("/reviewSelf") @ApiOperationSupport(order = 22) - @Operation(summary = "审批", description = "") - public R review(@RequestParam Long id, - @RequestParam Integer status, - @RequestParam String memo) { - ReviewSheet rs = service.getById(id); - rs.setStatus(status); - rs.setMemo(memo); - return R.status(service.updateById(rs)); + @Operation(summary = "内部审批", description = "") + public R reviewSelf(@Parameter(description = "id") @RequestParam Long id, + @Parameter(description = "selfReviewFlag 1 or 2") @RequestParam Integer selfReviewFlag, + @Parameter(description = "memo") @RequestParam String memo) { + return service.reviewSelf(id, selfReviewFlag, memo); } /** @@ -402,12 +373,14 @@ public class ReviewSheetController extends BladeController { } /** - * [生产处置单] 修改一条 + * 填报[生产处置单] */ @PostMapping("/fill") @ApiOperationSupport(order = 40) - @Operation(summary = "fill", description = "ReviewSheetVO Obj") - public R fill(@Valid @RequestBody ReviewSheetVO vo) { + @Operation(summary = "填报[生产处置单]", description = "ReviewSheetVO Obj") + public R fill(@Valid @RequestBody ReviewSheetDetailVO vo) { return service.fill(vo); } + + public R getHisWO( ) } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java index 6681b62c..fc6d33d1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.quality.excel.ReviewSheetExcel; import org.springblade.desk.quality.pojo.entity.ReviewSheet; -import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; +import org.springblade.desk.quality.pojo.vo.ReviewSheetDetailVO; import java.util.List; @@ -28,7 +28,7 @@ public interface ReviewSheetMapper extends BaseMapper { * @param reviewSheet 查询参数 * @return List */ - List selectReviewSheetPage(IPage page, ReviewSheetVO reviewSheet); + List selectReviewSheetPage(IPage page, ReviewSheetDetailVO reviewSheet); /** * 获取导出数据 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml index 3fbb2649..00789909 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml @@ -44,6 +44,10 @@ + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewDutyService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewDutyService.java index af57da4b..19718364 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewDutyService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewDutyService.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.quality.excel.ReviewDutyExcel; import org.springblade.desk.quality.pojo.entity.ReviewDuty; +import org.springblade.desk.quality.pojo.entity.ReviewFault; import org.springblade.desk.quality.pojo.vo.ReviewDutyVO; import org.springblade.desk.quality.pojo.vo.ReviewFaultVO; @@ -44,6 +45,7 @@ public interface IReviewDutyService extends BaseService { */ void setVOValue(ReviewDutyVO vo); + int deleteByReviewSheetId(Long reviewSheetId); /** *

方法名: listByRsId

@@ -57,4 +59,6 @@ public interface IReviewDutyService extends BaseService { List listByRsId(Long rsId); List listVOByRsId(Long rsId); + + List listByReviewSheetId(Long reviewSheetId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewFaultService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewFaultService.java index 736929f7..3d90b33f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewFaultService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewFaultService.java @@ -43,6 +43,8 @@ public interface IReviewFaultService extends BaseService { */ void setVOValue(ReviewFaultVO vo); + int deleteByReviewSheetId(Long reviewSheetId); + /** *

方法名: listByRsId

*

方法描述: 按审理单查询

@@ -55,4 +57,6 @@ public interface IReviewFaultService extends BaseService { List listByRsId(Long rsId); List listVOByRsId(Long rsId); + + List listByReviewSheetId(Long reviewSheetId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java index 079ab8a2..034fd853 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java @@ -6,11 +6,13 @@ package org.springblade.desk.quality.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.v3.oas.annotations.Parameter; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.service.en.EnBaseService; import org.springblade.desk.quality.excel.ReviewSheetExcel; import org.springblade.desk.quality.pojo.entity.ReviewSheet; import org.springblade.desk.quality.pojo.vo.*; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -39,11 +41,6 @@ public interface IReviewSheetService extends EnBaseService { */ List exportReviewSheet(Wrapper queryWrapper); - /** - * VO - * - * @param vo - */ void setVOValue(ReviewSheetDetailVO vo); void setRedoScrapVOValue(ReviewSheetRedoScrapVO vo); @@ -138,4 +135,8 @@ public interface IReviewSheetService extends EnBaseService { R fill(ReviewSheetDetailVO vo); R reviewSelf(Long id, Integer selfReviewFlag, String memo); + + R sameCopyFromHiWO(Long id, Long woId); + + ReviewSheet getOneByWoId(Long woId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemDetailService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemDetailService.java index f6ff0452..802ff319 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemDetailService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemDetailService.java @@ -43,5 +43,9 @@ public interface IWorkPlanItemDetailService extends BaseService listByWorkPlanItemId(Long workPlanItemId); + List listVOByWorkPlanItemId(Long workPlanItemId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java index ddf28fe8..f802d098 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java @@ -22,6 +22,7 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.constant.BaseCol; +import org.springblade.desk.basic.constant.BaseRequest; import org.springblade.desk.basic.constant.BaseValue; import org.springblade.desk.basic.util.IdUtil; import org.springblade.desk.basic.util.StatusCountMap; @@ -35,7 +36,6 @@ import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; import org.springblade.desk.quality.pojo.request.InspectionTaskStartNew; import org.springblade.desk.quality.pojo.vo.*; import org.springblade.desk.quality.service.*; -import org.springblade.desk.quality.wrapper.IndicatorYearWrapper; import org.springblade.desk.quality.wrapper.InspectionTaskListWrapper; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; @@ -44,7 +44,6 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.*; -import java.util.stream.Collectors; /** * [检验任务] 服务实现类 @@ -169,6 +168,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl itemList = null; { + // todo:实际要根据工序定义查询 itemList = itemService.getBaseMapper().selectList( new QueryWrapper() .eq(BaseCol.STATUS, BaseValue.STATE_ENABLE) @@ -192,12 +192,13 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl qw1 = Wrappers.lambdaQuery(); - qw1.eq(InspectionTask::getId, sourceId); - source = baseMapper.selectById(qw1); - } - { - LambdaQueryWrapper qw2 = Wrappers.lambdaQuery(); - qw2.eq(InspectionTask::getId, targetId); - target = baseMapper.selectById(qw2); - } + InspectionTask source = getById(sourceId); + InspectionTask target = getById(targetId); log.info("source = {}", source); log.info("target = {}", target); if (source == null || target == null) { - return R.fail("失败"); + return R.fail("匹配结果失败"); } - // todo: copy 赋值 - // throw new IllegalAccessException(""); + List wpItemListS = wpItemService.listByTaskId(source.getId()); + List wpItemListT = wpItemService.listByTaskId(target.getId()); + int count = 0; + // + for (WorkPlanItem wpItemT : wpItemListT) { + for (WorkPlanItem wpItemS : wpItemListS) { + if (wpItemT.getItemId().equals(wpItemS.getItemId())) { // 检测项id相等 + // 除id外 copy值 + BeanUtil.copyProperties(wpItemS, wpItemT, BaseRequest.ID); + // 更新 + wpItemService.updateById(wpItemT); + // + count = count + 1; + if (InspectionItemConst.SPECIAL_TYPE_NORMAL.equals(wpItemT.getSpecialType())) { + // 常规不考虑itemDetail - return R.success(); + } else { + // 考虑itemDetail + List wpItemDetailList = wpItemDetailService.listByWorkPlanItemId(wpItemS.getId()); + // 删除已有detail列表 + wpItemDetailService.deleteByWorkPlanItemId(wpItemT.getId()); + // 插入新detail列表 + for (WorkPlanItemDetail wpItemDetail : wpItemDetailList) { + // 去除id + wpItemDetail.setId(null); + // 关联item id + wpItemDetail.setWorkPlanItemId(wpItemT.getId()); + // 新插入detail一条 + wpItemDetailService.save(wpItemDetail); + } + } + } + } + } + return R.data(count); } @Override diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewDutyServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewDutyServiceImpl.java index bbfe7979..68437981 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewDutyServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewDutyServiceImpl.java @@ -68,6 +68,13 @@ public class ReviewDutyServiceImpl extends BaseServiceImpl qw = Wrappers.lambdaQuery(ReviewDuty.class) + .eq(ReviewDuty::getReviewSheetId, reviewSheetId); + return baseMapper.delete(qw); + } + @Override public List listByRsId(Long rsId) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReviewDuty.class) @@ -88,4 +95,11 @@ public class ReviewDutyServiceImpl extends BaseServiceImpl listByReviewSheetId(Long reviewSheetId) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(ReviewDuty.class); + qw.eq(ReviewDuty::getReviewSheetId, reviewSheetId); + return baseMapper.selectList(qw); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewFaultServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewFaultServiceImpl.java index b80ed5d0..15417e30 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewFaultServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewFaultServiceImpl.java @@ -71,6 +71,13 @@ public class ReviewFaultServiceImpl extends BaseServiceImpl queryWrapper = Wrappers.lambdaQuery(ReviewFault.class) + .eq(ReviewFault::getReviewSheetId, reviewSheetId); + return baseMapper.delete(queryWrapper); + } + @Override public List listByRsId(Long rsId) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReviewFault.class) @@ -91,4 +98,12 @@ public class ReviewFaultServiceImpl extends BaseServiceImpl listByReviewSheetId(Long reviewSheetId) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(ReviewFault.class) + .eq(ReviewFault::getReviewSheetId, reviewSheetId) + .eq(ReviewFault::getIsDeleted, CommonConstant.DELETE_FALSE); + return baseMapper.selectList(qw); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java index c726d6fc..baadff93 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java @@ -18,6 +18,7 @@ import org.apache.commons.lang3.StringUtils; import org.springblade.common.exception.BusinessException; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BaseRequest; import org.springblade.desk.basic.service.en.impl.EnBaseServiceImpl; import org.springblade.desk.basic.util.IdUtil; import org.springblade.desk.quality.constant.InspectionTaskConst; @@ -251,6 +252,7 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl listF = faultService.listByReviewSheetId(rsS.getId()); + for (ReviewFault oneF : listF) { + oneF.setId(null); + oneF.setReviewSheetId(rsT.getId()); + faultService.saveOrUpdate(oneF); + } + // + List listD = dutyService.listByReviewSheetId(rsT.getId()); + for (ReviewDuty oneD : listD) { + oneD.setId(null); + oneD.setReviewSheetId(rsT.getId()); + dutyService.saveOrUpdate(oneD); + } + // 更新rs + BeanUtil.copyProperties(rsS, rsT, BaseRequest.ID); + updateById(rsT); + return R.success(); + } + + @Override + public ReviewSheet getOneByWoId(Long woId) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(); + qw.eq(ReviewSheet::getWoId, woId); + return baseMapper.selectOne(qw); + } + @Override public ReviewSheet getByRsCode(String rsCode) { LambdaQueryWrapper qw = Wrappers.lambdaQuery(); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemDetailServiceImpl.java index e0ead8fb..6ed27b46 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemDetailServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemDetailServiceImpl.java @@ -39,7 +39,8 @@ import java.util.List; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -public class WorkPlanItemDetailServiceImpl extends BaseServiceImpl implements IWorkPlanItemDetailService { +public class WorkPlanItemDetailServiceImpl extends BaseServiceImpl + implements IWorkPlanItemDetailService { @Resource private IUserClient userClient; @@ -65,6 +66,21 @@ public class WorkPlanItemDetailServiceImpl extends BaseServiceImpl qw = Wrappers.lambdaQuery(); + qw.eq(WorkPlanItemDetail::getWorkPlanItemId, workPlanItemId); + baseMapper.delete(qw); + } + + @Override + public List listByWorkPlanItemId(Long workPlanItemId) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(); + qw.eq(WorkPlanItemDetail::getWorkPlanItemId, workPlanItemId); + qw.orderByAsc(WorkPlanItemDetail::getId); + return list(qw); + } + @Override public List listVOByWorkPlanItemId(Long workPlanItemId) { LambdaQueryWrapper qw = Wrappers.lambdaQuery(); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java index 38876106..17eb9f79 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java @@ -13,7 +13,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.mp.support.Condition; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.util.IdUtil; import org.springblade.desk.quality.constant.InspectionItemConst; @@ -38,7 +37,6 @@ import org.springblade.system.pojo.entity.UserInfo; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** * [工序检验项] 服务实现类 @@ -102,9 +100,9 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl Date: Wed, 14 Jan 2026 13:57:25 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/quality/pojo/entity/ReviewFault.java | 6 ++ .../desk/quality/pojo/entity/ReviewSheet.java | 5 ++ .../request/ReviewSheetRedoScrapSearch.java | 14 ++--- .../pojo/request/ReviewSheetSelfSearch.java | 6 ++ .../quality/pojo/vo/ReviewSheetHisWOVO.java | 6 +- .../pojo/vo/ReviewSheetRedoScrapVO.java | 4 +- .../quality/pojo/vo/SupplyInspectionVO.java | 2 - .../desk/basic/constant/BaseRequest.java | 2 + .../quality/constant/ReviewSheetConst.java | 60 ++++++++++++------- .../controller/ReviewSheetController.java | 46 ++++++++++---- .../desk/quality/mapper/ReviewSheetMapper.xml | 1 + .../impl/InspectionTaskServiceImpl.java | 10 +++- .../service/impl/ReviewSheetServiceImpl.java | 43 +++++++++---- 13 files changed, 140 insertions(+), 65 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java index c993bc75..33530d7a 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java @@ -4,6 +4,8 @@ package org.springblade.desk.quality.pojo.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -60,21 +62,25 @@ public class ReviewFault extends BaseEntity { * [生产处置单]id */ @Schema(description = "[生产处置单]id") + @JsonSerialize(using = ToStringSerializer.class) private Long reviewSheetId; /** * 故障类别[缺陷]id */ @Schema(description = "故障类别[缺陷]id") + @JsonSerialize(using = ToStringSerializer.class) private Long ngType2Id; /** * 问题大类[缺陷]id */ @Schema(description = "问题大类[缺陷]id") + @JsonSerialize(using = ToStringSerializer.class) private Long ngType3Id; /** * 问题小类[缺陷]id */ @Schema(description = "问题小类[缺陷]id") + @JsonSerialize(using = ToStringSerializer.class) private Long ngType4Id; /** * 比例 diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java index e49f33e8..d97a269b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java @@ -395,4 +395,9 @@ public class ReviewSheet extends BaseEntity { */ @Schema(description = "不良描述") private String poorDesc; + /** + * 复制引用[车间订单]id + */ + @Schema(description = "复制引用[车间订单]id") + private Long refWoId; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoScrapSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoScrapSearch.java index 581ca727..5d73a62c 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoScrapSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoScrapSearch.java @@ -12,13 +12,9 @@ import org.springblade.desk.quality.pojo.entity.ReviewSheet; @EqualsAndHashCode(callSuper = false) public class ReviewSheetRedoScrapSearch extends ReviewSheet { - @Schema(description = "业务类型-[1]:内部审理返修;[2]:内部审理报废;") - private Integer bizType; - @Schema(description = "车间订单号") - private String woCode; - @Schema(description = "创建时间-开始") + @Schema(description = "创建提请时间-开始") private String createTimeStart; - @Schema(description = "创建时间-结束") + @Schema(description = "创建提请时间-结束") private String createTimeEnd; @Schema(description = "提请人员[用户]真名") private String createUserRealName; @@ -28,6 +24,8 @@ public class ReviewSheetRedoScrapSearch extends ReviewSheet { private String oemCode; @Schema(description = "供应商名称") private String oemName; - @Schema(description = "生产标识") - private String prodIdent; + @Schema(description = "审理时间-开始") + private String reviewTimeStart; + @Schema(description = "审理时间-结束") + private String reviewTimeEnd; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetSelfSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetSelfSearch.java index 260d270f..a0cd10f5 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetSelfSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetSelfSearch.java @@ -24,4 +24,10 @@ public class ReviewSheetSelfSearch extends ReviewSheet { private String reviewTimeStart; @Schema(description = "审理时间-结束") private String reviewTimeEnd; + @Schema(description = "物料名称") + private String materialName; + @Schema(description = "需求数量") + private Long needQty; + @Schema(description = "故障原因") + private String faultReason; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetHisWOVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetHisWOVO.java index 1f5d6b69..188d6ad4 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetHisWOVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetHisWOVO.java @@ -12,11 +12,11 @@ import lombok.EqualsAndHashCode; public class ReviewSheetHisWOVO { @Schema(description = "车间订单id") - private Long woId = 1000L; + private Long woId; @Schema(description = "车间订单编码") - private String woCode = "CJ1000"; + private String woCode; @Schema(description = "车间订单下拉显示信息") - private String woInfo = "CJ1000"; + private String woInfo; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoScrapVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoScrapVO.java index 60f5f5cc..ce70a623 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoScrapVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRedoScrapVO.java @@ -17,9 +17,7 @@ public class ReviewSheetRedoScrapVO extends ReviewSheet { @Schema(description = "审理[用户]真名") private String reviewUserRealName; @Schema(description = "打回[用户]真名") - private String backUserRealName; - @Schema(description = "车间订单号") - private String woCode; + private String backUserRealName; @Schema(description = "供应商代码") private String oemCode; @Schema(description = "供应商名称") diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/SupplyInspectionVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/SupplyInspectionVO.java index a66d88cb..98c098ca 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/SupplyInspectionVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/SupplyInspectionVO.java @@ -21,6 +21,4 @@ public class SupplyInspectionVO extends SupplyInspection { @Serial private static final long serialVersionUID = 1L; - - } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java index 8f59454e..fb707857 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java @@ -2,6 +2,8 @@ package org.springblade.desk.basic.constant; public interface BaseRequest { + String STATUS = "status"; + String ID = "id"; /** * 创建[用户]-真名 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java index 72e3c3e7..ef0d0728 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java @@ -25,24 +25,38 @@ public interface ReviewSheetConst { Integer T_ERP = 3; } - interface ERP { + interface STATUS { /** - * 新建 + * 新建 内部 ERP 都用 */ Integer S_NEW = 1; /** - * 打回 + * 待审理 内部用 ERP不用 + */ + Integer S_JUDGE = 2; + /** + * 打回 ERP用 */ Integer S_REPULSE = 3; /** - * 审理中 + * 审理中 ERP用 */ Integer S_HEAR = 6; /** - * 审理完成 + * 审理完成 内部 ERP 都用 */ Integer S_COMPLETE = 10; + /** + * 待完成 内部用 ERP不用 + */ + Integer S_TODO = 11; + } + interface ERP_REVIEW_S { + /** + * 初始化 + */ + Integer REVIEW_STATUS_0 = 0; /** * 让步接收 */ @@ -73,24 +87,24 @@ public interface ReviewSheetConst { Integer REVIEW_STATUS_15 = 15; } - interface SELF { - /** - * 编制中 - */ - Integer S_NEW = 1; - /** - * 待审理 - */ - Integer S_JUDGE = 2; - /** - * 待完成 - */ - Integer S_TODO = 3; - /** - * 已完成 - */ - Integer S_FINISH = 4; - } +// interface SELF { +// /** +// * 编制中 +// */ +// Integer S_NEW = 1; +// /** +// * 待审理 +// */ +// Integer S_JUDGE = 2; +// /** +// * 待完成 +// */ +// Integer S_TODO = 3; +// /** +// * 已完成 +// */ +// Integer S_FINISH = 4; +// } /** * 零件模式 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java index 7eefee86..958c61b6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java @@ -25,6 +25,7 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BaseRequest; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.constant.ReviewSheetConst; @@ -116,7 +117,7 @@ public class ReviewSheetController extends BladeController { public R> listInit(@Parameter() @RequestBody ReviewSheetInitSearch search, Query query) { Map demo = new HashMap(); - demo.put("status", ReviewSheetConst.S_INIT); + demo.put(BaseRequest.STATUS, ReviewSheetConst.S_INIT); QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = ReviewSheetInitWrapper.build().pageVO(pages); @@ -126,6 +127,10 @@ public class ReviewSheetController extends BladeController { // .stream() // .peek(service::setVOValue) // .collect(Collectors.toList()); + + for (ReviewSheetInitVO initVO : pagesVO.getRecords()) { + initVO.setDocCode("" + initVO.getId()); + } return R.data(pagesVO); } @@ -137,10 +142,12 @@ public class ReviewSheetController extends BladeController { @Operation(summary = "返工报废审理list分页", description = "传入ReviewSheet Obj") public R> listReviewRedoScrap(@Parameter() @RequestBody ReviewSheetRedoScrapSearch search, Query query) { + // todo: mapper Map demo = new HashMap(); QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); - qw.eq(ReviewSheet.COL_BIZ_TYPE, search.getBizType()); - qw.eq(ReviewSheet.COL_REVIEW_STATUS, ReviewSheetConst.SELF.S_JUDGE); + Integer bizType = search.getBizType(); + qw.eq((bizType != null && bizType != 0), ReviewSheet.COL_BIZ_TYPE, search.getBizType()); + // qw.eq(ReviewSheet.COL_REVIEW_STATUS, ReviewSheetConst.SELF.S_JUDGE); IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = ReviewSheetRedoScrapWrapper.build().pageVO(pages); pagesVO.getRecords() @@ -160,7 +167,7 @@ public class ReviewSheetController extends BladeController { ReviewSheetSelfSearch search, Query query) { Map demo = new HashMap(); QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); - qw.in("bizType", ReviewSheetConst.BizType.T_SELF_REDO, ReviewSheetConst.BizType.T_SELF_SCRAP); + qw.in(ReviewSheet.COL_BIZ_TYPE, ReviewSheetConst.BizType.T_SELF_REDO, ReviewSheetConst.BizType.T_SELF_SCRAP); IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = ReviewSheetSelfWrapper.build().pageVO(pages); pagesVO.getRecords() @@ -179,8 +186,9 @@ public class ReviewSheetController extends BladeController { public R> listErp(@Parameter() @RequestBody ReviewSheetErpSearch search, Query query) { Map demo = new HashMap(); + // todo: mapper QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); - qw.eq("bizType", ReviewSheetConst.BizType.T_ERP); + qw.eq(ReviewSheet.COL_BIZ_TYPE, ReviewSheetConst.BizType.T_ERP); IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = ReviewSheetErpWrapper.build().pageVO(pages); pagesVO.getRecords() @@ -190,14 +198,32 @@ public class ReviewSheetController extends BladeController { return R.data(pagesVO); } + /** + * SELECT + * * + * FROM + * "QA_REVIEW_SHEET" + * ORDER BY + * WO_ID ASC + * + * @param search + * @param query + * @return + */ @PostMapping("/getHisWOList") @ApiOperationSupport(order = 20) @Operation(summary = "历史已经完成的车间订单", description = "Obj") public R> getHisWOList(@Parameter() @RequestBody ReviewSheetErpSearch search, - Query query) { + Query query) { List list = new ArrayList<>(); - list.add(new ReviewSheetHisWOVO()); - list.add(new ReviewSheetHisWOVO()); + ReviewSheetHisWOVO vo1 = new ReviewSheetHisWOVO(); + vo1.setWoId(1000L); + vo1.setWoInfo("WO" + "1000L"); + ReviewSheetHisWOVO vo2 = new ReviewSheetHisWOVO(); + vo2.setWoId(1001L); + vo2.setWoInfo("WO" + "1001L"); + list.add(vo1); + list.add(vo2); return R.data(list); } @@ -208,9 +234,7 @@ public class ReviewSheetController extends BladeController { @Parameter(description = "车间订单Id") @RequestParam Long woId) { // todo: // 找到的历史审理单 - Long rsId = 100L; - - return R.success(""); + return service.sameCopyFromHiWO(id, woId); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml index 00789909..141bb98e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml @@ -48,6 +48,7 @@ + From 9c0941f05d05cf0c8624ddf8836d78dbb253e04f Mon Sep 17 00:00:00 2001 From: Tom Li Date: Fri, 16 Jan 2026 06:17:11 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/pojo/entity/InspectionTask.java | 48 ++- .../desk/quality/pojo/entity/ReviewSheet.java | 9 +- .../pojo/entity/WorkPlanItemDetail.java | 9 +- .../pojo/request/InspectionTaskSearch.java | 4 + .../quality/pojo/vo/InspectionTaskListVO.java | 4 +- .../pojo/vo/ReviewSheetDutyBatchVO.java | 18 + .../pojo/vo/ReviewSheetDutyPartVO.java | 18 + .../pojo/vo/ReviewSheetRelevantBatchVO.java | 18 + .../pojo/vo/ReviewSheetRelevantPartVO.java | 18 + .../quality/pojo/vo/WorkPlanItemDetailVO.java | 3 + .../desk/basic/config/RoleConfig.java | 21 +- .../controller/RelTeamSetUserController.java | 315 +++++++++--------- .../quality/constant/InspectionTaskConst.java | 4 +- .../quality/constant/ReviewSheetConst.java | 15 +- .../controller/InspectionTaskController.java | 22 ++ .../controller/ReviewSheetController.java | 110 ++++-- .../excel/WorkPlanItemDetailExcel.java | 4 +- .../quality/mapper/InspectionTaskMapper.java | 1 - .../quality/mapper/InspectionTaskMapper.xml | 83 ++++- .../quality/mapper/ReviewSheetMapper.java | 47 ++- .../desk/quality/mapper/ReviewSheetMapper.xml | 174 ++++++++++ .../mapper/WorkPlanItemDetailMapper.xml | 1 + .../service/IInspectionTaskService.java | 4 +- .../impl/InspectionTaskServiceImpl.java | 101 ++++-- .../service/impl/ReviewSheetServiceImpl.java | 65 +++- .../src/main/resources/application-dev.yml | 12 +- 26 files changed, 840 insertions(+), 288 deletions(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDutyBatchVO.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDutyPartVO.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRelevantBatchVO.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRelevantPartVO.java diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java index 3773ab5a..2d3bb05d 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java @@ -40,9 +40,9 @@ public class InspectionTask extends BaseEntity { */ public static final String COL_NAME = "NAME"; /** - * [工单]id + * [车间订单]id */ - public static final String COL_WORK_ORDER_ID = "WORK_ORDER_ID"; + public static final String COL_WO_ID = "WO_ID"; /** * [制品]id */ @@ -68,9 +68,9 @@ public class InspectionTask extends BaseEntity { */ public static final String COL_BATCH_NUMBER = "BATCH_NUMBER"; /** - * [工单]编码 + * [车间订单]编码 */ - public static final String COL_WORK_ORDER_CODE = "WORK_ORDER_CODE"; + public static final String COL_WO_CODE = "WO_CODE"; /** * [工序]编码 */ @@ -156,9 +156,17 @@ public class InspectionTask extends BaseEntity { */ public static final String COL_FROM_TYPE = "FROM_TYPE"; /** - * 生产订单类型 + * [生产订单]类型 */ public static final String COL_YIELD_ORDER_TYPE = "YIELD_ORDER_TYPE"; + /** + * [生产订单]id + */ + public static final String COL_YIELD_ORDER_ID = "YIELD_ORDER_ID"; + /** + * 接收日期 + */ + public static final String COL_RECEIVE_DATE = "RECEIVE_DATE"; /** * [检验任务]编码 @@ -171,15 +179,15 @@ public class InspectionTask extends BaseEntity { @Schema(description = "[检验任务]类型") private Long inspectionTaskType; /** - * [检验任务] + * [检验任务]名称 */ - @Schema(description = "[检验任务]") + @Schema(description = "[检验任务]名称") private String name; /** - * [工单]id + * [车间订单]id */ - @Schema(description = "[工单]id") - private Long workOrderId; + @Schema(description = "[车间订单]id") + private Long woId; /** * [制品]id */ @@ -211,10 +219,10 @@ public class InspectionTask extends BaseEntity { @Schema(description = "生产批次号") private Long batchNumber; /** - * [工单]编码 + * [车间订单]编码 */ - @Schema(description = "[工单]编码") - private String workOrderCode; + @Schema(description = "[车间订单]编码") + private String woCode; /** * [工序]编码 */ @@ -321,8 +329,18 @@ public class InspectionTask extends BaseEntity { @Schema(description = "来源类型") private Integer fromType; /** - * 生产订单类型 + * [生产订单]类型 */ - @Schema(description = "生产订单类型") + @Schema(description = "[生产订单]类型") private Integer yieldOrderType; + /** + * [生产订单]id + */ + @Schema(description = "[生产订单]id") + private Integer yieldOrderId; + /** + * 接收日期 + */ + @Schema(description = "接收日期") + private LocalDateTime receiveDate; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java index 77cd04c9..022948ae 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java @@ -19,6 +19,9 @@ import java.time.LocalDateTime; * qc_review_sheet_internal QcReviewSheetInternal 热表内部审理记录表 * qc_review_sheet_internalredo QcReviewSheetInternalredo 热表内部审理记录表（返修） * qc_review_sheet_internalsj QcReviewSheetInternalsj 热表内部审理记录表（烧结） + *

+ *

+ * status 默认 -1 * * @author Tom Shuo * @since 2026-01-06 @@ -129,7 +132,7 @@ public class ReviewSheet extends BaseEntity { */ public static final String COL_BIZ_TYPE = "BIZ_TYPE"; /** - * 物料号 + * 物料号/零件号 */ public static final String COL_PART_CODE = "PART_CODE"; /** @@ -306,9 +309,9 @@ public class ReviewSheet extends BaseEntity { @Schema(description = "业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理;") private Integer bizType; /** - * 物料号 + * 物料号/零件号 */ - @Schema(description = "物料号") + @Schema(description = "物料号/零件号") private String partCode; /** * 批次号 diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java index f7c12823..f692cc79 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java @@ -85,9 +85,9 @@ public class WorkPlanItemDetail extends BaseEntity { @Schema(description = "[工序检验项]id") private Long workPlanItemId; /** - * 测量类型-[1]镀前;[2]:镀后; + * 测量类型; */ - @Schema(description = "测量类型-[1]镀前;[2]:镀后;") + @Schema(description = "测量类型") private String testType; /** * 尺寸 @@ -144,4 +144,9 @@ public class WorkPlanItemDetail extends BaseEntity { */ @Schema(description = "[量具]id") private Long mtId; + /** + * 实际[量具]id + */ + @Schema(description = "实际[量具]id") + private Long actMtId; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java index 2869e294..c7b3eaaf 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java @@ -25,12 +25,16 @@ public class InspectionTaskSearch extends InspectionTask { private String prodIdent; @Schema(description = "需求部门") private String needDeptName; + @Schema(description = "需求[部门]id") + private String needDeptId; @Schema(description = "批次号") private String batchNo; @Schema(description = "分批号") private String poBatchNo; @Schema(description = "当前工序") private Long currentProcessId; + @Schema(description = "上个工序") + private Long frontProcessId; @Schema(description = "下个工序") private Long nextProcessId; @Schema(description = "生产数量") diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java index 20f2164b..a9e33b58 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java @@ -72,7 +72,7 @@ public class InspectionTaskListVO extends InspectionTask { @Schema(description = "生产数量") private Double poQty = 2002d; @Schema(description = "接收时间") - private LocalDateTime receiveDate = LocalDateTime.now(); + private LocalDateTime receiveDate; @Schema(description = "订单-产品号") @@ -106,5 +106,5 @@ public class InspectionTaskListVO extends InspectionTask { private String sameNo = "tank-1001"; // todo: @Schema(description = "材料") - private String material = "铜"; + private String material = "铜"; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDutyBatchVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDutyBatchVO.java new file mode 100644 index 00000000..ed50875a --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDutyBatchVO.java @@ -0,0 +1,18 @@ +package org.springblade.desk.quality.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 责任批号 + */ +@Data +@EqualsAndHashCode() +public class ReviewSheetDutyBatchVO { + + private String dutyBatch; + + public ReviewSheetDutyBatchVO(String dutyBatch) { + this.dutyBatch = dutyBatch; + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDutyPartVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDutyPartVO.java new file mode 100644 index 00000000..79167be7 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDutyPartVO.java @@ -0,0 +1,18 @@ +package org.springblade.desk.quality.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 责任零件 + */ +@Data +@EqualsAndHashCode() +public class ReviewSheetDutyPartVO { + + private String dutyPart; + + public ReviewSheetDutyPartVO(String dutyPart) { + this.dutyPart = dutyPart; + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRelevantBatchVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRelevantBatchVO.java new file mode 100644 index 00000000..69721dd1 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRelevantBatchVO.java @@ -0,0 +1,18 @@ +package org.springblade.desk.quality.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 相关批号 + */ +@Data +@EqualsAndHashCode() +public class ReviewSheetRelevantBatchVO { + + private String relevantBatch; + + public ReviewSheetRelevantBatchVO(String relevantBatch) { + this.relevantBatch = relevantBatch; + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRelevantPartVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRelevantPartVO.java new file mode 100644 index 00000000..3191a6ff --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetRelevantPartVO.java @@ -0,0 +1,18 @@ +package org.springblade.desk.quality.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 相关零件 + */ +@Data +@EqualsAndHashCode() +public class ReviewSheetRelevantPartVO { + + private String relevantPart; + + public ReviewSheetRelevantPartVO(String relevantPart) { + this.relevantPart = relevantPart; + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java index 0c1635dc..cb2dd0cd 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java @@ -24,4 +24,7 @@ public class WorkPlanItemDetailVO extends WorkPlanItemDetail { @Schema(description = "[量具]名称") private String mtName = "标尺1"; + + @Schema(description = "实际[量具]名称") + private String actMtName = "游标卡尺QW"; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/config/RoleConfig.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/config/RoleConfig.java index c51da904..84ca5e7b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/config/RoleConfig.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/config/RoleConfig.java @@ -10,12 +10,27 @@ import org.springframework.stereotype.Component; public class RoleConfig { /** - * 工艺员角色id + * 工艺员[角色]id */ private Long processEngineerId; - /** - * 工艺员角色alias + * 工艺员[角色]alias */ private String processEngineerAlias; + /** + * 热表检验员[角色]id + */ + private Long rbCheckerId; + /** + * 热表检验员[角色]alias + */ + private String rbCheckerAlias; + /** + * 烧结检验员[角色]id + */ + private Long sjCheckerId; + /** + * 烧结检验员[角色]alias + */ + private String sjCheckerAlias; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/RelTeamSetUserController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/RelTeamSetUserController.java index 5028a850..1fdbf61a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/RelTeamSetUserController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/RelTeamSetUserController.java @@ -24,6 +24,7 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.RelTeamSetUserExcel; import org.springblade.desk.basic.pojo.entity.RelTeamSetUser; import org.springblade.desk.basic.pojo.vo.RelTeamSetUserVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2026-01-13 */ @RestController -@RequestMapping("/RelTeamSetUser") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/RelTeamSetUser") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -54,184 +55,184 @@ import java.util.stream.Collectors; public class RelTeamSetUserController extends BladeController { @Resource - private IRelTeamSetUserService service; - - /** - * [班组用户关联] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入RelTeamSetUser Obj") - public R detail(RelTeamSetUser relTeamSetUser) { - QueryWrapper qw = Condition.getQueryWrapper(relTeamSetUser); - RelTeamSetUser detail = service.getOne(qw); - RelTeamSetUserVO detailVO = RelTeamSetUserWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [班组用户关联] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入RelTeamSetUser Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map relTeamSetUser, - Query query) { + private IRelTeamSetUserService service; + + /** + * [班组用户关联] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入RelTeamSetUser Obj") + public R detail(RelTeamSetUser relTeamSetUser) { + QueryWrapper qw = Condition.getQueryWrapper(relTeamSetUser); + RelTeamSetUser detail = service.getOne(qw); + RelTeamSetUserVO detailVO = RelTeamSetUserWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [班组用户关联] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入RelTeamSetUser Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map relTeamSetUser, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(relTeamSetUser, RelTeamSetUser.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = RelTeamSetUserWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [班组用户关联] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入RelTeamSetUser Obj") - public R> page(RelTeamSetUserVO relTeamSetUser, Query query) { - IPage pagesVO = service.selectRelTeamSetUserPage( - Condition.getPage(query), relTeamSetUser - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = RelTeamSetUserWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [班组用户关联] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入RelTeamSetUser Obj") + public R> page(RelTeamSetUserVO relTeamSetUser, Query query) { + IPage pagesVO = service.selectRelTeamSetUserPage( + Condition.getPage(query), relTeamSetUser + ); + return R.data(pagesVO); + } + + /** * [班组用户关联] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = RelTeamSetUserWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = RelTeamSetUserWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [班组用户关联] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入RelTeamSetUser Obj") + public R save(@Valid @RequestBody RelTeamSetUser addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [班组用户关联] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入RelTeamSetUser Obj") - public R save(@Valid @RequestBody RelTeamSetUser addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [班组用户关联] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入RelTeamSetUser List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [班组用户关联] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入RelTeamSetUser Obj") - public R update(@Valid @RequestBody RelTeamSetUser updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入RelTeamSetUser List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [班组用户关联] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入RelTeamSetUser Obj") + public R update(@Valid @RequestBody RelTeamSetUser updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [班组用户关联] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入RelTeamSetUser List") + @Operation(summary = "修改批量", description = "传入RelTeamSetUser List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [班组用户关联] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入RelTeamSetUser Obj") - public R submit(@Valid @RequestBody RelTeamSetUser mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [班组用户关联] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入RelTeamSetUser Obj") + public R submit(@Valid @RequestBody RelTeamSetUser mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [班组用户关联] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入RelTeamSetUser List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [班组用户关联] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [班组用户关联] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入RelTeamSetUser") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map relTeamSetUser, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(relTeamSetUser, RelTeamSetUser.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(RelTeamSetUser::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(RelTeamSetUserEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportRelTeamSetUser(qw); - ExcelUtil.export(response, "[班组用户关联]数据" + DateUtil.time(), - "[班组用户关联]数据表", list, RelTeamSetUserExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入RelTeamSetUser List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [班组用户关联] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [班组用户关联] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入RelTeamSetUser") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map relTeamSetUser, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(relTeamSetUser, RelTeamSetUser.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(RelTeamSetUser::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(RelTeamSetUserEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportRelTeamSetUser(qw); + ExcelUtil.export(response, "[班组用户关联]数据" + DateUtil.time(), + "[班组用户关联]数据表", list, RelTeamSetUserExcel.class); + } + + /** * [班组用户关联] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [班组用户关联] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, RelTeamSetUser.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [班组用户关联] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, RelTeamSetUser.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java index 2eab8ee5..b26d920f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java @@ -5,12 +5,12 @@ public interface InspectionTaskConst { /** * 热表 */ - Integer TYPE_RB = 1; + Integer FROM_TYPE_RB = 1; /** * 烧结 */ - Integer TYPE_SJ = 2; + Integer FROM_TYPE_SJ = 2; /** * 未检验 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java index ef0d0728..2945e512 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java @@ -5,11 +5,6 @@ package org.springblade.desk.quality.constant; */ public interface ReviewSheetConst { - /** - * 初始化 - */ - Integer S_INIT = 0; - interface BizType { /** * [1]:内部审理返修 @@ -26,10 +21,14 @@ public interface ReviewSheetConst { } interface STATUS { + /** + * 初始化 + */ + Integer S_INIT = -1; /** * 新建 内部 ERP 都用 */ - Integer S_NEW = 1; + Integer S_NEW = -1; /** * 待审理 内部用 ERP不用 */ @@ -56,7 +55,7 @@ public interface ReviewSheetConst { /** * 初始化 */ - Integer REVIEW_STATUS_0 = 0; + Integer REVIEW_STATUS_INIT = -1; /** * 让步接收 */ @@ -87,6 +86,8 @@ public interface ReviewSheetConst { Integer REVIEW_STATUS_15 = 15; } + + // 一期状态 整合 // interface SELF { // /** // * 编制中 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index 0a1ca980..58c52764 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -14,17 +14,24 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.utils.AuthUtil; 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.config.RoleConfig; +import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.basic.pojo.vo.UrlVO; +import org.springblade.desk.quality.constant.CycleTestTaskConst; +import org.springblade.desk.quality.constant.InspectionTaskConst; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.InspectionTaskExcel; +import org.springblade.desk.quality.pojo.entity.CycleTestTask; import org.springblade.desk.quality.pojo.entity.InspectionTask; import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; import org.springblade.desk.quality.pojo.request.InspectionTaskStartNew; @@ -49,6 +56,7 @@ import java.util.Map; * @author Tom Shuo * @since 2025-11-14 */ +@Slf4j @RestController @Data @EqualsAndHashCode(callSuper = true) @@ -60,6 +68,8 @@ public class InspectionTaskController extends BladeController { private IInspectionTaskService service; @Resource private InspectionTaskService2 service2; + @Resource + private RoleConfig roleConfig; /** * [检验任务] 详情 @@ -82,6 +92,18 @@ public class InspectionTaskController extends BladeController { @Operation(summary = "分页", description = "传入inspectionTask") public R> listSearch( @Parameter(hidden = true) @RequestParam(required = false) InspectionTaskSearch search, Query query) { + log.info("getUserRole = {}", AuthUtil.getUserRole()); + // 热表 烧结 检验员 数据区分。 + if (AuthUtil.getUserRole().contains(roleConfig.getRbCheckerAlias())) { + search.setFromType(InspectionTaskConst.FROM_TYPE_RB); + } + if (AuthUtil.getUserRole().contains(roleConfig.getSjCheckerAlias())) { + search.setFromType(InspectionTaskConst.FROM_TYPE_SJ); + } + if (AuthUtil.getUserRole().contains(roleConfig.getRbCheckerAlias()) && + AuthUtil.getUserRole().contains(roleConfig.getSjCheckerAlias())) { + search.setFromType(null); + } IPage pagesVO = service.listSearch(Condition.getPage(query), search); return R.data(pagesVO); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java index 958c61b6..60adf159 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java @@ -117,7 +117,7 @@ public class ReviewSheetController extends BladeController { public R> listInit(@Parameter() @RequestBody ReviewSheetInitSearch search, Query query) { Map demo = new HashMap(); - demo.put(BaseRequest.STATUS, ReviewSheetConst.S_INIT); + demo.put(BaseRequest.STATUS, ReviewSheetConst.STATUS.S_INIT); QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = ReviewSheetInitWrapper.build().pageVO(pages); @@ -146,7 +146,11 @@ public class ReviewSheetController extends BladeController { Map demo = new HashMap(); QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); Integer bizType = search.getBizType(); - qw.eq((bizType != null && bizType != 0), ReviewSheet.COL_BIZ_TYPE, search.getBizType()); + if (bizType != null && bizType != 0) { + qw.eq(ReviewSheet.COL_BIZ_TYPE, search.getBizType()); + } else { + qw.ne(ReviewSheet.COL_BIZ_TYPE, ReviewSheetConst.BizType.T_ERP); + } // qw.eq(ReviewSheet.COL_REVIEW_STATUS, ReviewSheetConst.SELF.S_JUDGE); IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = ReviewSheetRedoScrapWrapper.build().pageVO(pages); @@ -160,22 +164,22 @@ public class ReviewSheetController extends BladeController { /** * [生产处置单] list分页 */ - @PostMapping("/listSelf") - @ApiOperationSupport(order = 20) - @Operation(summary = "内部list分页", description = "传入ReviewSheet Obj") - public R> listSelf(@Parameter() @RequestBody - ReviewSheetSelfSearch search, Query query) { - Map demo = new HashMap(); - QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); - qw.in(ReviewSheet.COL_BIZ_TYPE, ReviewSheetConst.BizType.T_SELF_REDO, ReviewSheetConst.BizType.T_SELF_SCRAP); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ReviewSheetSelfWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setSelfVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } +// @PostMapping("/listSelf") +// @ApiOperationSupport(order = 20) +// @Operation(summary = "内部list分页", description = "传入ReviewSheet Obj") +// public R> listSelf(@Parameter() @RequestBody +// ReviewSheetSelfSearch search, Query query) { +// Map demo = new HashMap(); +// QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); +// qw.in(ReviewSheet.COL_BIZ_TYPE, ReviewSheetConst.BizType.T_SELF_REDO, ReviewSheetConst.BizType.T_SELF_SCRAP); +// IPage pages = service.page(Condition.getPage(query), qw); +// IPage pagesVO = ReviewSheetSelfWrapper.build().pageVO(pages); +// pagesVO.getRecords() +// .stream() +// .peek(service::setSelfVOValue) +// .collect(Collectors.toList()); +// return R.data(pagesVO); +// } /** * [生产处置单] list分页 @@ -232,8 +236,6 @@ public class ReviewSheetController extends BladeController { @Operation(summary = "copy相同数据到from车间订单id", description = "传入 [车间订单]id") public R sameCopyFromHiWO(@Parameter(description = "列表id") @RequestParam Long id, @Parameter(description = "车间订单Id") @RequestParam Long woId) { - // todo: - // 找到的历史审理单 return service.sameCopyFromHiWO(id, woId); } @@ -431,4 +433,72 @@ public class ReviewSheetController extends BladeController { public R fill(@Valid @RequestBody ReviewSheetDetailVO vo) { return service.fill(vo); } + + @GetMapping("/getRSDutyPartList") + @ApiOperationSupport(order = 51) + @Operation(summary = "责任零件list", description = "") + public R getRSDutyPartList(@Parameter(description = "id") @RequestParam Long id) { + ReviewSheetDutyPartVO vo1 = new ReviewSheetDutyPartVO("21E8-571-3000-K5"); + ReviewSheetDutyPartVO vo2 = new ReviewSheetDutyPartVO("21E8-003-11234-K5"); + ReviewSheetDutyPartVO vo3 = new ReviewSheetDutyPartVO("21E8-001-1625-H8-N"); + ReviewSheetDutyPartVO vo4 = new ReviewSheetDutyPartVO("21E8-570-3238-K8"); + ReviewSheetDutyPartVO vo5 = new ReviewSheetDutyPartVO("21E8-570-1066-K5"); + List list = new ArrayList<>(); + list.add(vo1); + list.add(vo2); + list.add(vo3); + list.add(vo4); + list.add(vo5); + return R.data(list); + } + + @GetMapping("/getRSDutyBatchList") + @ApiOperationSupport(order = 52) + @Operation(summary = "责任批号list", description = "") + public R getRSDutyBatchList(@Parameter(description = "id") @RequestParam Long id) { + ReviewSheetDutyBatchVO vo1 = new ReviewSheetDutyBatchVO("L1022312073"); + ReviewSheetDutyBatchVO vo2 = new ReviewSheetDutyBatchVO("Y0572401499"); + ReviewSheetDutyBatchVO vo3 = new ReviewSheetDutyBatchVO("Y7952401087"); + ReviewSheetDutyBatchVO vo4 = new ReviewSheetDutyBatchVO("Y5432403515"); + ReviewSheetDutyBatchVO vo5 = new ReviewSheetDutyBatchVO("2402-XC-6566-JII-W664"); + List list = new ArrayList<>(); + list.add(vo1); + list.add(vo2); + list.add(vo3); + list.add(vo4); + list.add(vo5); + return R.data(list); + } + + @GetMapping("/getRSRelevantPartList") + @ApiOperationSupport(order = 51) + @Operation(summary = "相关零件list", description = "") + public R getRSRelevantPartList(@Parameter(description = "id") @RequestParam Long id) { + ReviewSheetRelevantPartVO vo1 = new ReviewSheetRelevantPartVO("21E8-571-3000-K5"); + ReviewSheetRelevantPartVO vo2 = new ReviewSheetRelevantPartVO("21E8-003-11234-K5"); + ReviewSheetRelevantPartVO vo3 = new ReviewSheetRelevantPartVO("21E8-001-1625-H8-N"); + ReviewSheetRelevantPartVO vo4 = new ReviewSheetRelevantPartVO("21E8-570-3238-K8"); + ReviewSheetRelevantPartVO vo5 = new ReviewSheetRelevantPartVO("21E8-570-1066-K5"); + List list = new ArrayList<>(); + list.add(vo1); + list.add(vo2); + list.add(vo3); + list.add(vo4); + list.add(vo5); + return R.data(list); + } + + @GetMapping("/getRSRelevantBatchList") + @ApiOperationSupport(order = 51) + @Operation(summary = "相关批号list", description = "") + public R getRSRelevantBatchList(@Parameter(description = "id") @RequestParam Long id) { + ReviewSheetRelevantBatchVO vo1 = new ReviewSheetRelevantBatchVO("24022001"); + ReviewSheetRelevantBatchVO vo2 = new ReviewSheetRelevantBatchVO("23122001"); + ReviewSheetRelevantBatchVO vo3 = new ReviewSheetRelevantBatchVO("2401200101"); + List list = new ArrayList<>(); + list.add(vo1); + list.add(vo2); + list.add(vo3); + return R.data(list); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/WorkPlanItemDetailExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/WorkPlanItemDetailExcel.java index 0f4bcad6..956b8434 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/WorkPlanItemDetailExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/WorkPlanItemDetailExcel.java @@ -35,7 +35,7 @@ public class WorkPlanItemDetailExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("[工序检验项]id") - private BigDecimal workPlanItemId; + private Long workPlanItemId; /** * 测量类型-[1]镀前;[2]:镀后; */ @@ -107,5 +107,5 @@ public class WorkPlanItemDetailExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("[量具]id") - private BigDecimal mtId; + private Long mtId; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.java index 61b62582..96aa0770 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.java @@ -41,5 +41,4 @@ public interface InspectionTaskMapper extends BaseMapper { List exportInspectionTask(@Param("ew") Wrapper queryWrapper); List listSearch(IPage page, @Param("q") InspectionTaskSearch search); - } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml index 652be1f4..cbe155f0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml @@ -10,14 +10,14 @@ - + - + @@ -46,6 +46,8 @@ + + - SELECT task.* - FROM QA_INSPECTION_TASK task + SELECT t.* + FROM QA_INSPECTION_TASK t -- 车间作业计划 wp - -- LEFT JOIN RB_PR_WORK_PLAN wp ON task.WP_ID = wp.ID + LEFT JOIN MES_WORK_PLAN wp ON t.WP_ID = wp.ID -- 车间订单 wo - -- LEFT JOIN PR_WORK_ORDER wo ON wp.WO_ID = wo.ID + LEFT JOIN MES_WORK_ORDER wo ON wp.WO_ID = wo.ID + -- 生产订单 yo + LEFT JOIN MES_YIELD_ORDER yo ON wo.YO_ID = yo.ID + -- 工序 + LEFT JOIN DS_PROCESS ps ON wp.ORDERS = ps.PROCESS_CODE + -- 外协厂商 oem + LEFT JOIN BA_OEM oem ON wp.OC_ID = oem.ID -- 班组 ts -- LEFT JOIN BA_TEAM_SET ts ON wp.MAKE_TEAM = ts.ID - -- 外协厂商 oem - -- LEFT JOIN BA_OEM oem ON wp.OC_ID = oem.ID - -- 工序 - -- LEFT JOIN BS_PROCEDURE_SET ON wp. - -- LEFT JOIN BLADE_DEPT bl_dept on task.CREATE_DEPT = bl_dept.ID + -- 部门 + LEFT JOIN BLADE_DEPT bl_dept on t.CREATE_DEPT = bl_dept.ID WHERE ( - task.IS_DELETED = 0 + t.IS_DELETED = 0 -- AND wp.IS_DELETED = 0 -- AND wo.IS_DELETED = 0 + -- AND ps.IS_DELETED = 0 + -- AND oem.IS_DELETED = 0 -- AND bl_dept.IS_DELETED = 0 ) - AND task.WP_ID = #{q.wpId} + AND t.WP_ID = #{q.wpId} - AND task.STATUS = #{q.status} + AND t.STATUS = #{q.status} - AND task.FROM_TYPE = #{q.fromType} + AND t.FROM_TYPE = #{q.fromType} + + + AND rs.RECEIVE_DATE >= #{q.receiveDateStart} + + + AND rs.RECEIVE_DATE <= #{q.receiveDateEnd} + + -- wp + + AND wo.MAKE_TEAM = #{q.teamSetId} + + + AND wp.OC_ID = #{q.oemId} + + + AND wp.FRONT_WP_ID = #{q.frontProcessId} + + + AND wp.NEXT_WP_ID = #{q.nextProcessId} + + -- wo + + AND wo.CARD_NO = #{q.cardNo} + + + AND wo.WO_ID = #{q.woCode} + + + AND wo.PART_CODE = #{q.partCode} + + + AND wo.BATCH_NO = #{q.batchNo} + + + AND wo.MAKE_QTY = #{q.poQty} + + -- yo + + AND yo.PRODUCT_IDENT = #{q.prodIdent} + + -- ps + + AND ps.ID = #{q.currentProcessId} - ORDER BY task.ID DESC + -- oem + ORDER BY t.ID DESC diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java index fc6d33d1..7df12ac8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java @@ -9,7 +9,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.quality.excel.ReviewSheetExcel; import org.springblade.desk.quality.pojo.entity.ReviewSheet; -import org.springblade.desk.quality.pojo.vo.ReviewSheetDetailVO; +import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; +import org.springblade.desk.quality.pojo.request.ReviewSheetErpSearch; +import org.springblade.desk.quality.pojo.request.ReviewSheetInitSearch; +import org.springblade.desk.quality.pojo.request.ReviewSheetRedoScrapSearch; +import org.springblade.desk.quality.pojo.vo.*; import java.util.List; @@ -21,20 +25,29 @@ import java.util.List; */ public interface ReviewSheetMapper extends BaseMapper { - /** - * 自定义分页 - * - * @param page 分页参数 - * @param reviewSheet 查询参数 - * @return List - */ - List selectReviewSheetPage(IPage page, ReviewSheetDetailVO reviewSheet); - - /** - * 获取导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportReviewSheet(@Param("ew") Wrapper queryWrapper); + /** + * 自定义分页 + * + * @param page 分页参数 + * @param reviewSheet 查询参数 + * @return List + */ + List selectReviewSheetPage(IPage page, ReviewSheetDetailVO reviewSheet); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportReviewSheet(@Param("ew") Wrapper queryWrapper); + + List listInit(IPage page, + @Param("q") ReviewSheetInitSearch search); + + List listReviewRedoScrap(IPage page, + @Param("q") ReviewSheetRedoScrapSearch search); + + List listErp(IPage page, + @Param("q") ReviewSheetErpSearch search); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml index fc8bf7a5..e82eccc4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml @@ -62,4 +62,178 @@ SELECT * FROM QA_REVIEW_SHEET ${ew.customSqlSegment} + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemDetailMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemDetailMapper.xml index a01f1f2b..4151e8b7 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemDetailMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemDetailMapper.xml @@ -19,6 +19,7 @@ + - SELECT t.* + SELECT t.*, + wo.PART_CODE AS partCode, + wo.CARD_NO AS cardNo FROM QA_INSPECTION_TASK t -- 车间作业计划 wp LEFT JOIN MES_WORK_PLAN wp ON t.WP_ID = wp.ID diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RemindMsgMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RemindMsgMapper.java index 94554f03..1fc87069 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RemindMsgMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RemindMsgMapper.java @@ -37,4 +37,6 @@ public interface RemindMsgMapper extends BaseMapper { * @return List */ List exportRemindMsg(@Param("ew") Wrapper queryWrapper); + + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java index 7df12ac8..8884f741 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java @@ -48,6 +48,6 @@ public interface ReviewSheetMapper extends BaseMapper { List listReviewRedoScrap(IPage page, @Param("q") ReviewSheetRedoScrapSearch search); - List listErp(IPage page, + List listErp(IPage page, @Param("q") ReviewSheetErpSearch search); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml index e82eccc4..9213efec 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml @@ -65,7 +65,8 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java index 034fd853..e9576934 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java @@ -6,13 +6,14 @@ package org.springblade.desk.quality.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.swagger.v3.oas.annotations.Parameter; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.service.en.EnBaseService; import org.springblade.desk.quality.excel.ReviewSheetExcel; import org.springblade.desk.quality.pojo.entity.ReviewSheet; +import org.springblade.desk.quality.pojo.request.ReviewSheetErpSearch; +import org.springblade.desk.quality.pojo.request.ReviewSheetInitSearch; +import org.springblade.desk.quality.pojo.request.ReviewSheetRedoScrapSearch; import org.springblade.desk.quality.pojo.vo.*; -import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -41,14 +42,14 @@ public interface IReviewSheetService extends EnBaseService { */ List exportReviewSheet(Wrapper queryWrapper); - void setVOValue(ReviewSheetDetailVO vo); + void setDetailVOValue(ReviewSheetDetailVO vo); + + void setInitVOValue(ReviewSheetInitVO vo); void setRedoScrapVOValue(ReviewSheetRedoScrapVO vo); void setErpVOValue(ReviewSheetErpVO vo); - void setSelfVOValue(ReviewSheetSelfVO vo); - /** *

方法名: getByTrialId

*

方法描述: 按审理单erpId查询

@@ -139,4 +140,10 @@ public interface IReviewSheetService extends EnBaseService { R sameCopyFromHiWO(Long id, Long woId); ReviewSheet getOneByWoId(Long woId); + + IPage listInit(IPage page, ReviewSheetInitSearch search); + + IPage listReviewRedoScrap(IPage page, ReviewSheetRedoScrapSearch search); + + IPage listErp(IPage page, ReviewSheetErpSearch search); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java index 7fc48a17..c9e48175 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java @@ -405,8 +405,17 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl uiR = userClient.userInfo(vo.getReviewUserId()); if (uiR != null && uiR.isSuccess() && uiR.getData() != null) { vo.setReviewUserRealName(uiR.getData().getUser().getRealName()); } } - } - - @Override - public void setSelfVOValue(ReviewSheetSelfVO vo) { - + // 责任零件 + StringBuilder sbDutyPart = new StringBuilder(); + // 责任批号 + StringBuilder sbDutyBatNo = new StringBuilder(); + // 查询明细表 + List listRD = dutyService.listByReviewSheetId(vo.getId()); + for (ReviewDuty reviewDuty : listRD) { + sbDutyPart.append(reviewDuty.getDutyPart()).append(","); + sbDutyBatNo.append(reviewDuty.getDutyBatch()).append(","); + } + vo.setDutyPart(sbDutyPart.toString()); + vo.setDutyBatNo(sbDutyBatNo.toString()); } /** @@ -238,7 +260,10 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl listInit(IPage page, ReviewSheetInitSearch search) { + List listVO = baseMapper.listInit(page, search); + for (ReviewSheetInitVO oneVO : listVO) { + setInitVOValue(oneVO); + } + return page.setRecords(listVO); + } + + @Override + public IPage listReviewRedoScrap(IPage page, ReviewSheetRedoScrapSearch search) { + List listVO = baseMapper.listReviewRedoScrap(page, search); + for (ReviewSheetRedoScrapVO oneVO : listVO) { + setRedoScrapVOValue(oneVO); + } + return page.setRecords(listVO); + } + + @Override + public IPage listErp(IPage page, ReviewSheetErpSearch search) { + List listVO = baseMapper.listErp(page, search); + for (ReviewSheetErpVO oneVO : listVO) { + setErpVOValue(oneVO); + } + return page.setRecords(listVO); + } + @Override public ReviewSheet getByRsCode(String rsCode) { LambdaQueryWrapper qw = Wrappers.lambdaQuery(); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/RoleUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/RoleUtil.java deleted file mode 100644 index e56d367b..00000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/RoleUtil.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.springblade.desk.quality.util; - -import org.apache.commons.lang3.StringUtils; -import org.springblade.core.secure.utils.AuthUtil; - -public class RoleUtil { - - - /** - * API权限 - * todo: - * @param roleAlias - * @return - */ - public static Boolean hasRole(String roleAlias) { - if (StringUtils.isBlank(roleAlias)) { - throw new IllegalArgumentException("roleAlias参数错误"); - } - return false; - } -} From 157fa60c2cd8b869cd41573bc458fbde23b89af6 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Fri, 16 Jan 2026 16:27:10 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=B7=AF=E5=BE=84-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CertificateMaintenanceController.java | 15 ++++----------- .../controller/CertificateTypeController.java | 8 +++----- .../controller/CultivateDetailController.java | 13 +++---------- .../EquipmentMaintenanceController.java | 12 +++--------- .../controller/PostHandleController.java | 6 +++--- .../controller/TrainingPlanController.java | 11 +++-------- .../mapper/CertificateMaintenanceMapper.java | 3 +-- .../mapper/CertificateMaintenanceMapper.xml | 6 +++--- .../jobTransfer/mapper/CertificateTypeMapper.java | 2 +- .../jobTransfer/mapper/CertificateTypeMapper.xml | 2 +- .../jobTransfer/mapper/CultivateDetailMapper.java | 2 +- .../jobTransfer/mapper/CultivateDetailMapper.xml | 2 +- .../mapper/EquipmentMaintenanceMapper.java | 3 +-- .../mapper/EquipmentMaintenanceMapper.xml | 2 +- .../desk/jobTransfer/mapper/PostHandleMapper.java | 2 +- .../desk/jobTransfer/mapper/PostHandleMapper.xml | 2 +- .../jobTransfer/mapper/TrainingPlanMapper.java | 2 +- .../jobTransfer/mapper/TrainingPlanMapper.xml | 2 +- .../service/ICertificateMaintenanceService.java | 2 +- .../service/ICertificateTypeService.java | 2 +- .../service/ICultivateDetailService.java | 2 +- .../service/IEquipmentMaintenanceService.java | 2 +- .../jobTransfer/service/IPostHandleService.java | 2 +- .../jobTransfer/service/ITrainingPlanService.java | 3 +-- .../impl/CertificateMaintenanceServiceImpl.java | 10 +++++----- .../service/impl/CertificateTypeServiceImpl.java | 6 +++--- .../service/impl/CultivateDetailServiceImpl.java | 9 ++++----- .../impl/EquipmentMaintenanceServiceImpl.java | 7 +++---- .../service/impl/PostHandleServiceImpl.java | 12 ++++++------ .../service/impl/TrainingPlanServiceImpl.java | 7 +++---- .../wrapper/CertificateMaintenanceWrapper.java | 2 +- .../wrapper/CertificateTypeWrapper.java | 2 +- .../wrapper/CultivateDetailWrapper.java | 2 +- .../wrapper/EquipmentMaintenanceWrapper.java | 2 +- .../jobTransfer/wrapper/PostHandleWrapper.java | 3 +-- .../jobTransfer/wrapper/TrainingPlanWrapper.java | 2 +- 36 files changed, 69 insertions(+), 103 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateMaintenanceController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateMaintenanceController.java index 84321bfe..6d505bd3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateMaintenanceController.java +++ b/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,7 +12,6 @@ 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; @@ -20,25 +19,19 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel; import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceImport; -import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel; -import org.springblade.desk.jobTransfer.pojo.excel.PostHandleImport; import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery; import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO; -import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO; import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; -import org.springblade.system.cache.UserCache; -import org.springblade.system.pojo.entity.UserInfo; import org.springframework.beans.BeanUtils; import org.springframework.core.io.Resource; import org.springframework.http.ResponseEntity; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity; import org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO; -import org.springblade.desk.jobTransfer.wrapper.CertificateMaintenanceWrapper; -import org.springblade.desk.jobTransfer.service.ICertificateMaintenanceService; +import org.springblade.desk.jobtransfer.wrapper.CertificateMaintenanceWrapper; +import org.springblade.desk.jobtransfer.service.ICertificateMaintenanceService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; @@ -187,7 +180,7 @@ public class CertificateMaintenanceController extends BladeController { @Operation(summary = "下载Excel模板", description = "") public ResponseEntity downloadExcelTemplate() { return ExcelExtUtil.downloadXlsTemplate( - "Excel/jobTransfer/证书维护导入模板.xls", + "Excel/jobtransfer/证书维护导入模板.xls", "证书维护导入模板.xls"); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateTypeController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateTypeController.java index 97b44fbf..3b6d7343 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateTypeController.java +++ b/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,7 +8,6 @@ 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; @@ -19,12 +18,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity; import org.springblade.desk.jobTransfer.pojo.vo.CertificateTypeVO; -import org.springblade.desk.jobTransfer.wrapper.CertificateTypeWrapper; -import org.springblade.desk.jobTransfer.service.ICertificateTypeService; +import org.springblade.desk.jobtransfer.wrapper.CertificateTypeWrapper; +import org.springblade.desk.jobtransfer.service.ICertificateTypeService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; import java.util.Map; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CultivateDetailController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CultivateDetailController.java index 30bbbdf6..1e07e10e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CultivateDetailController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CultivateDetailController.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.controller; +package org.springblade.desk.jobtransfer.controller; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; @@ -8,34 +8,27 @@ import jakarta.annotation.PostConstruct; import lombok.AllArgsConstructor; import jakarta.validation.Valid; -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.jobTransfer.pojo.enums.TrainingStatusEnum; import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel; -import org.springblade.desk.jobTransfer.pojo.excel.PostHandleExcel; import org.springblade.desk.jobTransfer.pojo.request.CultivateDetailQuery; -import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity; import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO; -import org.springblade.desk.jobTransfer.wrapper.CultivateDetailWrapper; -import org.springblade.desk.jobTransfer.service.ICultivateDetailService; +import org.springblade.desk.jobtransfer.wrapper.CultivateDetailWrapper; +import org.springblade.desk.jobtransfer.service.ICultivateDetailService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; import java.util.ArrayList; import java.util.Date; -import java.util.Map; import java.util.List; import jakarta.servlet.http.HttpServletResponse; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/EquipmentMaintenanceController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/EquipmentMaintenanceController.java index 019f5f9e..08d9d2f6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/EquipmentMaintenanceController.java +++ b/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.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.wrapper.EquipmentMaintenanceWrapper; -import org.springblade.desk.jobTransfer.service.IEquipmentMaintenanceService; +import org.springblade.desk.jobtransfer.wrapper.EquipmentMaintenanceWrapper; +import org.springblade.desk.jobtransfer.service.IEquipmentMaintenanceService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; import java.util.ArrayList; -import java.util.Map; import java.util.List; import jakarta.servlet.http.HttpServletResponse; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/PostHandleController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/PostHandleController.java index c96cf453..ab958e64 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/PostHandleController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/PostHandleController.java @@ -1,4 +1,4 @@ -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; @@ -30,8 +30,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity; import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; -import org.springblade.desk.jobTransfer.wrapper.PostHandleWrapper; -import org.springblade.desk.jobTransfer.service.IPostHandleService; +import org.springblade.desk.jobtransfer.wrapper.PostHandleWrapper; +import org.springblade.desk.jobtransfer.service.IPostHandleService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/TrainingPlanController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/TrainingPlanController.java index ff06551c..55f9b054 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/TrainingPlanController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/TrainingPlanController.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.controller; +package org.springblade.desk.jobtransfer.controller; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -11,27 +11,22 @@ import lombok.AllArgsConstructor; import jakarta.validation.Valid; import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity; -import org.springblade.desk.jobTransfer.pojo.enums.TrainingStatusEnum; import org.springblade.desk.jobTransfer.pojo.excel.TrainingPlanExcel; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.jobTransfer.pojo.entity.TrainingPlanEntity; import org.springblade.desk.jobTransfer.pojo.vo.TrainingPlanVO; -import org.springblade.desk.jobTransfer.wrapper.TrainingPlanWrapper; -import org.springblade.desk.jobTransfer.service.ITrainingPlanService; +import org.springblade.desk.jobtransfer.wrapper.TrainingPlanWrapper; +import org.springblade.desk.jobtransfer.service.ITrainingPlanService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; -import java.util.Date; import java.util.Map; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.java index 85ea27e8..4192a155 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.java @@ -1,10 +1,9 @@ -package org.springblade.desk.jobTransfer.mapper; +package org.springblade.desk.jobtransfer.mapper; import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity; import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel; import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery; import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.xml index fb44eea5..dff07c11 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.xml @@ -1,6 +1,6 @@ - + - + - + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.java index 8c322867..fa121106 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.mapper; +package org.springblade.desk.jobtransfer.mapper; import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity; import org.springblade.desk.jobTransfer.pojo.excel.CertificateTypeExcel; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.xml index e8d02765..44871de5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.xml @@ -1,6 +1,6 @@ - + - + - + - + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.java index 74e8ad84..9b176a80 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.java @@ -1,4 +1,4 @@ -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.excel.TrainingPlanExcel; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.xml index 9996d23c..d1535582 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateMaintenanceService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateMaintenanceService.java index dba9d2d0..d16cfa2b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateMaintenanceService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateMaintenanceService.java @@ -1,4 +1,4 @@ -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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateTypeService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateTypeService.java index e976a6dd..37af5d26 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateTypeService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateTypeService.java @@ -1,4 +1,4 @@ -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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICultivateDetailService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICultivateDetailService.java index febffdc1..f776797f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICultivateDetailService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICultivateDetailService.java @@ -1,4 +1,4 @@ -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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IEquipmentMaintenanceService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IEquipmentMaintenanceService.java index 6ef616a0..f3410f91 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IEquipmentMaintenanceService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IEquipmentMaintenanceService.java @@ -1,4 +1,4 @@ -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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IPostHandleService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IPostHandleService.java index fdb37701..def7a292 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IPostHandleService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IPostHandleService.java @@ -1,4 +1,4 @@ -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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ITrainingPlanService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ITrainingPlanService.java index bd0bbacb..f608b33e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ITrainingPlanService.java +++ b/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.excel.TrainingPlanExcel; -import org.springblade.desk.jobTransfer.pojo.vo.TrainingPlanVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateMaintenanceServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateMaintenanceServiceImpl.java index 89c27b2c..1d9dbd88 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateMaintenanceServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateMaintenanceServiceImpl.java @@ -1,10 +1,10 @@ -package org.springblade.desk.jobTransfer.service.impl; +package org.springblade.desk.jobtransfer.service.impl; 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.PostHandleMapper; +import org.springblade.desk.jobtransfer.mapper.CertificateTypeMapper; +import org.springblade.desk.jobtransfer.mapper.PostHandleMapper; import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity; import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity; import org.springblade.desk.jobTransfer.pojo.enums.PostHandleStatusEnum; @@ -13,8 +13,8 @@ import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel; import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceImport; import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery; import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO; -import org.springblade.desk.jobTransfer.mapper.CertificateMaintenanceMapper; -import org.springblade.desk.jobTransfer.service.ICertificateMaintenanceService; +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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateTypeServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateTypeServiceImpl.java index a6bc9570..7684ef99 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateTypeServiceImpl.java +++ b/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.excel.CertificateTypeExcel; import org.springblade.desk.jobTransfer.pojo.vo.CertificateTypeVO; -import org.springblade.desk.jobTransfer.mapper.CertificateTypeMapper; -import org.springblade.desk.jobTransfer.service.ICertificateTypeService; +import org.springblade.desk.jobtransfer.mapper.CertificateTypeMapper; +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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CultivateDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CultivateDetailServiceImpl.java index 4f7ad9d1..73acde2f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CultivateDetailServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CultivateDetailServiceImpl.java @@ -1,4 +1,4 @@ -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; @@ -8,10 +8,9 @@ import org.springblade.desk.jobTransfer.pojo.enums.PostHandleStatusEnum; import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel; import org.springblade.desk.jobTransfer.pojo.request.CultivateDetailQuery; import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO; -import org.springblade.desk.jobTransfer.mapper.CultivateDetailMapper; -import org.springblade.desk.jobTransfer.service.ICultivateDetailService; -import org.springblade.desk.jobTransfer.service.IPostHandleService; -import org.springframework.beans.factory.annotation.Autowired; +import org.springblade.desk.jobtransfer.mapper.CultivateDetailMapper; +import org.springblade.desk.jobtransfer.service.ICultivateDetailService; +import org.springblade.desk.jobtransfer.service.IPostHandleService; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/EquipmentMaintenanceServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/EquipmentMaintenanceServiceImpl.java index 8341ba92..9b193be1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/EquipmentMaintenanceServiceImpl.java +++ b/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.excel.EquipmentMaintenanceExcel; import org.springblade.desk.jobTransfer.pojo.request.EquipmentMaintenanceQuery; import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceListVO; -import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceVO; -import org.springblade.desk.jobTransfer.mapper.EquipmentMaintenanceMapper; -import org.springblade.desk.jobTransfer.service.IEquipmentMaintenanceService; +import org.springblade.desk.jobtransfer.mapper.EquipmentMaintenanceMapper; +import org.springblade.desk.jobtransfer.service.IEquipmentMaintenanceService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/PostHandleServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/PostHandleServiceImpl.java index 1f20fc62..d3948583 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/PostHandleServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/PostHandleServiceImpl.java @@ -1,4 +1,4 @@ -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; @@ -15,11 +15,11 @@ import org.springblade.desk.jobTransfer.pojo.excel.PostHandleImport; import org.springblade.desk.jobTransfer.pojo.request.JobTransferSave; import org.springblade.desk.jobTransfer.pojo.request.PostHandleQuery; import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; -import org.springblade.desk.jobTransfer.mapper.PostHandleMapper; -import org.springblade.desk.jobTransfer.service.ICertificateMaintenanceService; -import org.springblade.desk.jobTransfer.service.ICultivateDetailService; -import org.springblade.desk.jobTransfer.service.IEquipmentMaintenanceService; -import org.springblade.desk.jobTransfer.service.IPostHandleService; +import org.springblade.desk.jobtransfer.mapper.PostHandleMapper; +import org.springblade.desk.jobtransfer.service.ICertificateMaintenanceService; +import org.springblade.desk.jobtransfer.service.ICultivateDetailService; +import org.springblade.desk.jobtransfer.service.IEquipmentMaintenanceService; +import org.springblade.desk.jobtransfer.service.IPostHandleService; import org.springblade.system.cache.SysCache; import org.springblade.system.cache.UserCache; import org.springblade.system.pojo.entity.User; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/TrainingPlanServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/TrainingPlanServiceImpl.java index f642b888..56a65f74 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/TrainingPlanServiceImpl.java +++ b/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.excel.TrainingPlanExcel; -import org.springblade.desk.jobTransfer.pojo.vo.TrainingPlanVO; -import org.springblade.desk.jobTransfer.mapper.TrainingPlanMapper; -import org.springblade.desk.jobTransfer.service.ITrainingPlanService; +import org.springblade.desk.jobtransfer.mapper.TrainingPlanMapper; +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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateMaintenanceWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateMaintenanceWrapper.java index 49f91ec6..39b0cb6a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateMaintenanceWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateMaintenanceWrapper.java @@ -1,4 +1,4 @@ -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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateTypeWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateTypeWrapper.java index 920d0d1c..f9afd749 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateTypeWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateTypeWrapper.java @@ -1,4 +1,4 @@ -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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CultivateDetailWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CultivateDetailWrapper.java index 39ef09f7..ab48529c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CultivateDetailWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CultivateDetailWrapper.java @@ -1,4 +1,4 @@ -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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/EquipmentMaintenanceWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/EquipmentMaintenanceWrapper.java index 9cd1b3b9..29ba2694 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/EquipmentMaintenanceWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/EquipmentMaintenanceWrapper.java @@ -1,4 +1,4 @@ -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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/PostHandleWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/PostHandleWrapper.java index 3a1b5ad0..94f77a6e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/PostHandleWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/PostHandleWrapper.java @@ -1,4 +1,4 @@ -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; @@ -8,7 +8,6 @@ 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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/TrainingPlanWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/TrainingPlanWrapper.java index 8eb00fa9..2c95150a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/TrainingPlanWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/TrainingPlanWrapper.java @@ -1,4 +1,4 @@ -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; From cdeb5b8a6b22b5f6db8ab415577c9f1893d1beea Mon Sep 17 00:00:00 2001 From: qinyulong Date: Fri, 16 Jan 2026 16:48:46 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8C=85=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E4=B8=BA=E5=85=A8=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/CertificateMaintenanceEntity.java | 2 +- .../pojo/entity/CertificateTypeEntity.java | 2 +- .../pojo/entity/CultivateDetailEntity.java | 2 +- .../entity/EquipmentMaintenanceEntity.java | 2 +- .../pojo/entity/PostHandleEntity.java | 2 +- .../pojo/entity/TrainingPlanEntity.java | 2 +- .../pojo/enums/CultivateStatusEnum.java | 2 +- .../pojo/enums/GenderEnum.java | 2 +- .../pojo/enums/MaintenanceStatusEnum.java | 2 +- .../pojo/enums/MarriageEnum.java | 2 +- .../pojo/enums/PostHandleStatusEnum.java | 2 +- .../pojo/enums/SkillEnum.java | 2 +- .../pojo/enums/StaffTypeEnum.java | 2 +- .../pojo/enums/TrainingStatusEnum.java | 2 +- .../excel/CertificateMaintenanceExcel.java | 4 +--- .../excel/CertificateMaintenanceImport.java | 2 +- .../pojo/excel/CertificateTypeExcel.java | 5 +--- .../pojo/excel/CultivateDetailExcel.java | 3 +-- .../pojo/excel/EquipmentMaintenanceExcel.java | 3 +-- .../pojo/excel/PostHandleExcel.java | 3 +-- .../pojo/excel/PostHandleImport.java | 5 +--- .../pojo/excel/TrainingPlanExcel.java | 5 +--- .../pojo/request/CertificateLedgerQuery.java | 2 +- .../pojo/request/CultivateDetailQuery.java | 4 +--- .../request/EquipmentMaintenanceQuery.java | 2 +- .../pojo/request/JobTransferSave.java | 2 +- .../pojo/request/PostHandleQuery.java | 6 +---- .../pojo/vo/CertificateLedgerVO.java | 2 +- .../pojo/vo/CertificateMaintenanceVO.java | 6 ++--- .../pojo/vo/CertificateTypeVO.java | 4 ++-- .../pojo/vo/CultivateDetailVO.java | 10 ++++---- .../pojo/vo/EquipmentMaintenanceListVO.java | 2 +- .../pojo/vo/EquipmentMaintenanceVO.java | 6 ++--- .../pojo/vo/PostHandleVO.java | 6 ++--- .../pojo/vo/TrainingPlanVO.java | 4 ++-- .../CertificateMaintenanceController.java | 14 +++++------ .../controller/CertificateTypeController.java | 6 ++--- .../controller/CultivateDetailController.java | 10 ++++---- .../EquipmentMaintenanceController.java | 8 +++---- .../controller/PostHandleController.java | 18 +++++--------- .../controller/TrainingPlanController.java | 6 ++--- .../mapper/CertificateMaintenanceMapper.java | 8 +++---- .../mapper/CertificateMaintenanceMapper.xml | 12 +++++----- .../mapper/CertificateTypeMapper.java | 6 ++--- .../mapper/CertificateTypeMapper.xml | 4 ++-- .../mapper/CultivateDetailMapper.java | 8 +++---- .../mapper/CultivateDetailMapper.xml | 6 ++--- .../mapper/EquipmentMaintenanceMapper.java | 8 +++---- .../mapper/EquipmentMaintenanceMapper.xml | 12 +++++----- .../mapper/PostHandleMapper.java | 8 +++---- .../mapper/PostHandleMapper.xml | 6 ++--- .../mapper/TrainingPlanMapper.java | 6 ++--- .../mapper/TrainingPlanMapper.xml | 4 ++-- .../ICertificateMaintenanceService.java | 10 ++++---- .../service/ICertificateTypeService.java | 6 ++--- .../service/ICultivateDetailService.java | 8 +++---- .../service/IEquipmentMaintenanceService.java | 8 +++---- .../service/IPostHandleService.java | 12 +++++----- .../service/ITrainingPlanService.java | 4 ++-- .../CertificateMaintenanceServiceImpl.java | 16 ++++++------- .../impl/CertificateTypeServiceImpl.java | 6 ++--- .../impl/CultivateDetailServiceImpl.java | 12 +++++----- .../impl/EquipmentMaintenanceServiceImpl.java | 8 +++---- .../service/impl/PostHandleServiceImpl.java | 24 ++++++++----------- .../service/impl/TrainingPlanServiceImpl.java | 4 ++-- .../CertificateMaintenanceWrapper.java | 4 ++-- .../wrapper/CertificateTypeWrapper.java | 4 ++-- .../wrapper/CultivateDetailWrapper.java | 4 ++-- .../wrapper/EquipmentMaintenanceWrapper.java | 4 ++-- .../wrapper/PostHandleWrapper.java | 4 ++-- .../wrapper/TrainingPlanWrapper.java | 4 ++-- .../controller/PersonAbilityController.java | 2 +- .../mapper/PersonAbilityMapper.java | 2 +- .../scheduling/mapper/PersonAbilityMapper.xml | 2 +- .../service/IPersonAbilityService.java | 2 +- .../impl/PersonAbilityServiceImpl.java | 2 +- 76 files changed, 193 insertions(+), 223 deletions(-) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/entity/CertificateMaintenanceEntity.java (96%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/entity/CertificateTypeEntity.java (95%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/entity/CultivateDetailEntity.java (97%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/entity/EquipmentMaintenanceEntity.java (95%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/entity/PostHandleEntity.java (98%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/entity/TrainingPlanEntity.java (96%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/enums/CultivateStatusEnum.java (96%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/enums/GenderEnum.java (96%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/enums/MaintenanceStatusEnum.java (96%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/enums/MarriageEnum.java (96%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/enums/PostHandleStatusEnum.java (97%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/enums/SkillEnum.java (96%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/enums/StaffTypeEnum.java (96%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/enums/TrainingStatusEnum.java (96%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/excel/CertificateMaintenanceExcel.java (95%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/excel/CertificateMaintenanceImport.java (95%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/excel/CertificateTypeExcel.java (91%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/excel/CultivateDetailExcel.java (95%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/excel/EquipmentMaintenanceExcel.java (96%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/excel/PostHandleExcel.java (97%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/excel/PostHandleImport.java (93%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/excel/TrainingPlanExcel.java (93%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/request/CertificateLedgerQuery.java (94%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/request/CultivateDetailQuery.java (93%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/request/EquipmentMaintenanceQuery.java (94%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/request/JobTransferSave.java (92%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/request/PostHandleQuery.java (81%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/vo/CertificateLedgerVO.java (89%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/vo/CertificateMaintenanceVO.java (96%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/vo/CertificateTypeVO.java (75%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/vo/CultivateDetailVO.java (80%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/vo/EquipmentMaintenanceListVO.java (89%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/vo/EquipmentMaintenanceVO.java (91%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/vo/PostHandleVO.java (95%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/pojo/vo/TrainingPlanVO.java (74%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/controller/CertificateMaintenanceController.java (95%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/controller/CertificateTypeController.java (96%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/controller/CultivateDetailController.java (96%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/controller/EquipmentMaintenanceController.java (97%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/controller/PostHandleController.java (93%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/controller/TrainingPlanController.java (96%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/mapper/CertificateMaintenanceMapper.java (81%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/mapper/CertificateMaintenanceMapper.xml (96%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/mapper/CertificateTypeMapper.java (83%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/mapper/CertificateTypeMapper.xml (92%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/mapper/CultivateDetailMapper.java (80%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/mapper/CultivateDetailMapper.xml (97%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/mapper/EquipmentMaintenanceMapper.java (81%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/mapper/EquipmentMaintenanceMapper.xml (95%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/mapper/PostHandleMapper.java (82%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/mapper/PostHandleMapper.xml (98%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/mapper/TrainingPlanMapper.java (83%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/mapper/TrainingPlanMapper.xml (94%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/service/ICertificateMaintenanceService.java (82%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/service/ICertificateTypeService.java (83%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/service/ICultivateDetailService.java (82%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/service/IEquipmentMaintenanceService.java (84%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/service/IPostHandleService.java (84%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/service/ITrainingPlanService.java (87%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/service/impl/CertificateMaintenanceServiceImpl.java (90%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/service/impl/CertificateTypeServiceImpl.java (87%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/service/impl/CultivateDetailServiceImpl.java (90%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/service/impl/EquipmentMaintenanceServiceImpl.java (88%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/service/impl/PostHandleServiceImpl.java (95%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/service/impl/TrainingPlanServiceImpl.java (93%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/wrapper/CertificateMaintenanceWrapper.java (90%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/wrapper/CertificateTypeWrapper.java (89%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/wrapper/CultivateDetailWrapper.java (89%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/wrapper/EquipmentMaintenanceWrapper.java (90%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/wrapper/PostHandleWrapper.java (92%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/{jobTransfer => jobtransfer}/wrapper/TrainingPlanWrapper.java (89%) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CertificateMaintenanceEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/CertificateMaintenanceEntity.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CertificateMaintenanceEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/CertificateMaintenanceEntity.java index 0b8b4a4a..033f72f0 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CertificateMaintenanceEntity.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CertificateTypeEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/CertificateTypeEntity.java similarity index 95% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CertificateTypeEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/CertificateTypeEntity.java index 09ca27d6..24f35af3 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CertificateTypeEntity.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CultivateDetailEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/CultivateDetailEntity.java similarity index 97% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CultivateDetailEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/CultivateDetailEntity.java index 705554c4..b32a968b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/CultivateDetailEntity.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/EquipmentMaintenanceEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/EquipmentMaintenanceEntity.java similarity index 95% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/EquipmentMaintenanceEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/EquipmentMaintenanceEntity.java index 82932104..4382cb19 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/EquipmentMaintenanceEntity.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/PostHandleEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/PostHandleEntity.java similarity index 98% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/PostHandleEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/PostHandleEntity.java index ca2b9d43..7c07cce7 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/PostHandleEntity.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/TrainingPlanEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/TrainingPlanEntity.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/TrainingPlanEntity.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/entity/TrainingPlanEntity.java index 1dec4736..96f8cd03 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/entity/TrainingPlanEntity.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/CultivateStatusEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/CultivateStatusEnum.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/CultivateStatusEnum.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/CultivateStatusEnum.java index a1abb2e4..5c119257 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/CultivateStatusEnum.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/GenderEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/GenderEnum.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/GenderEnum.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/GenderEnum.java index 8102a07c..d63e4dd1 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/GenderEnum.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/MaintenanceStatusEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/MaintenanceStatusEnum.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/MaintenanceStatusEnum.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/MaintenanceStatusEnum.java index 259c07cc..41699627 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/MaintenanceStatusEnum.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/MarriageEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/MarriageEnum.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/MarriageEnum.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/MarriageEnum.java index 0a5eba2b..de84c0c2 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/MarriageEnum.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/PostHandleStatusEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/PostHandleStatusEnum.java similarity index 97% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/PostHandleStatusEnum.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/PostHandleStatusEnum.java index 4ba3b663..2e3dccf8 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/PostHandleStatusEnum.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/SkillEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/SkillEnum.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/SkillEnum.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/SkillEnum.java index 5f9dcb02..955c9cef 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/SkillEnum.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/StaffTypeEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/StaffTypeEnum.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/StaffTypeEnum.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/StaffTypeEnum.java index 9f64feef..8da166ec 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/StaffTypeEnum.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/TrainingStatusEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/TrainingStatusEnum.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/TrainingStatusEnum.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/enums/TrainingStatusEnum.java index ae79787f..f9047f36 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/enums/TrainingStatusEnum.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateMaintenanceExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CertificateMaintenanceExcel.java similarity index 95% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateMaintenanceExcel.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CertificateMaintenanceExcel.java index 51078350..1da39338 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateMaintenanceExcel.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateMaintenanceImport.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CertificateMaintenanceImport.java similarity index 95% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateMaintenanceImport.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CertificateMaintenanceImport.java index fc8ce960..fd128c23 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateMaintenanceImport.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateTypeExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CertificateTypeExcel.java similarity index 91% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateTypeExcel.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CertificateTypeExcel.java index bd5a9703..4d7c57d7 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CertificateTypeExcel.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CultivateDetailExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CultivateDetailExcel.java similarity index 95% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CultivateDetailExcel.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/CultivateDetailExcel.java index 70f4a3f1..abb1c587 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/CultivateDetailExcel.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/EquipmentMaintenanceExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/EquipmentMaintenanceExcel.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/EquipmentMaintenanceExcel.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/EquipmentMaintenanceExcel.java index 6742f716..0958c2fb 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/EquipmentMaintenanceExcel.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/PostHandleExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/PostHandleExcel.java similarity index 97% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/PostHandleExcel.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/PostHandleExcel.java index 743df5a3..6fbab914 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/PostHandleExcel.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/PostHandleImport.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/PostHandleImport.java similarity index 93% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/PostHandleImport.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/PostHandleImport.java index 77f668a1..9bd1df00 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/PostHandleImport.java +++ b/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; /** diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/TrainingPlanExcel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/TrainingPlanExcel.java similarity index 93% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/TrainingPlanExcel.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/TrainingPlanExcel.java index 97732d25..deb2ac88 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/excel/TrainingPlanExcel.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/CertificateLedgerQuery.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/CertificateLedgerQuery.java similarity index 94% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/CertificateLedgerQuery.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/CertificateLedgerQuery.java index 8f81505a..b23a339d 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/CertificateLedgerQuery.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/CultivateDetailQuery.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/CultivateDetailQuery.java similarity index 93% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/CultivateDetailQuery.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/CultivateDetailQuery.java index e4ccb754..e7a18980 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/CultivateDetailQuery.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/CultivateDetailQuery.java @@ -1,12 +1,10 @@ -package org.springblade.desk.jobTransfer.pojo.request; +package org.springblade.desk.jobtransfer.pojo.request; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springblade.core.mp.base.BaseEntity; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDate; import java.util.Date; /** diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/EquipmentMaintenanceQuery.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/EquipmentMaintenanceQuery.java similarity index 94% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/EquipmentMaintenanceQuery.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/EquipmentMaintenanceQuery.java index 11ce3860..09ea9a95 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/EquipmentMaintenanceQuery.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/JobTransferSave.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/JobTransferSave.java similarity index 92% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/JobTransferSave.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/JobTransferSave.java index 971fbdbb..9df9f047 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/JobTransferSave.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/JobTransferSave.java @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.pojo.request; +package org.springblade.desk.jobtransfer.pojo.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/PostHandleQuery.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/PostHandleQuery.java similarity index 81% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/PostHandleQuery.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/request/PostHandleQuery.java index 6a386619..3ec123ff 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/request/PostHandleQuery.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateLedgerVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CertificateLedgerVO.java similarity index 89% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateLedgerVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CertificateLedgerVO.java index e236d254..f9a4063a 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateLedgerVO.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateMaintenanceVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CertificateMaintenanceVO.java similarity index 96% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateMaintenanceVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CertificateMaintenanceVO.java index 17bddf95..61258eca 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateMaintenanceVO.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateTypeVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CertificateTypeVO.java similarity index 75% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateTypeVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CertificateTypeVO.java index ba85252d..878b4462 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CertificateTypeVO.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CultivateDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CultivateDetailVO.java similarity index 80% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CultivateDetailVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CultivateDetailVO.java index 0c8e0dc8..2999b7d6 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/CultivateDetailVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/CultivateDetailVO.java @@ -1,11 +1,11 @@ -package org.springblade.desk.jobTransfer.pojo.vo; +package org.springblade.desk.jobtransfer.pojo.vo; -import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity; +import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springblade.desk.jobTransfer.pojo.enums.CultivateStatusEnum; -import org.springblade.desk.jobTransfer.pojo.enums.StaffTypeEnum; -import org.springblade.desk.jobTransfer.pojo.enums.TrainingStatusEnum; +import org.springblade.desk.jobtransfer.pojo.enums.CultivateStatusEnum; +import org.springblade.desk.jobtransfer.pojo.enums.StaffTypeEnum; +import org.springblade.desk.jobtransfer.pojo.enums.TrainingStatusEnum; import java.io.Serial; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/EquipmentMaintenanceListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/EquipmentMaintenanceListVO.java similarity index 89% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/EquipmentMaintenanceListVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/EquipmentMaintenanceListVO.java index 2eda7eea..77f61fb1 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/EquipmentMaintenanceListVO.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/EquipmentMaintenanceVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/EquipmentMaintenanceVO.java similarity index 91% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/EquipmentMaintenanceVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/EquipmentMaintenanceVO.java index b8721eb2..80b80127 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/EquipmentMaintenanceVO.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/PostHandleVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/PostHandleVO.java similarity index 95% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/PostHandleVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/PostHandleVO.java index 7aa66e25..c5d4c6e5 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/PostHandleVO.java +++ b/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; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/TrainingPlanVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/TrainingPlanVO.java similarity index 74% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/TrainingPlanVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/vo/TrainingPlanVO.java index 03aaf9ca..146cb79c 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobTransfer/pojo/vo/TrainingPlanVO.java +++ b/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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateMaintenanceController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateMaintenanceController.java similarity index 95% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateMaintenanceController.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateMaintenanceController.java index 6d505bd3..4e244c9e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateMaintenanceController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateMaintenanceController.java @@ -17,19 +17,19 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceImport; -import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO; -import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceImport; +import org.springblade.desk.jobtransfer.pojo.request.CertificateLedgerQuery; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateLedgerVO; +import org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO; import org.springframework.beans.BeanUtils; import org.springframework.core.io.Resource; import org.springframework.http.ResponseEntity; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateMaintenanceVO; import org.springblade.desk.jobtransfer.wrapper.CertificateMaintenanceWrapper; import org.springblade.desk.jobtransfer.service.ICertificateMaintenanceService; import org.springblade.core.boot.ctrl.BladeController; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateTypeController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateTypeController.java similarity index 96% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateTypeController.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateTypeController.java index 3b6d7343..6ef3dbb2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CertificateTypeController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateTypeController.java @@ -12,12 +12,12 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateTypeExcel; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateTypeExcel; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateTypeVO; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateTypeVO; import org.springblade.desk.jobtransfer.wrapper.CertificateTypeWrapper; import org.springblade.desk.jobtransfer.service.ICertificateTypeService; import org.springblade.core.boot.ctrl.BladeController; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CultivateDetailController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CultivateDetailController.java similarity index 96% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CultivateDetailController.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CultivateDetailController.java index 1e07e10e..53260b07 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/CultivateDetailController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CultivateDetailController.java @@ -12,15 +12,15 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springblade.desk.jobTransfer.pojo.enums.TrainingStatusEnum; -import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel; -import org.springblade.desk.jobTransfer.pojo.request.CultivateDetailQuery; +import org.springblade.desk.jobtransfer.pojo.enums.TrainingStatusEnum; +import org.springblade.desk.jobtransfer.pojo.excel.CultivateDetailExcel; +import org.springblade.desk.jobtransfer.pojo.request.CultivateDetailQuery; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity; -import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO; +import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity; +import org.springblade.desk.jobtransfer.pojo.vo.CultivateDetailVO; import org.springblade.desk.jobtransfer.wrapper.CultivateDetailWrapper; import org.springblade.desk.jobtransfer.service.ICultivateDetailService; import org.springblade.core.boot.ctrl.BladeController; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/EquipmentMaintenanceController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/EquipmentMaintenanceController.java similarity index 97% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/EquipmentMaintenanceController.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/EquipmentMaintenanceController.java index 08d9d2f6..a89aef12 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/EquipmentMaintenanceController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/EquipmentMaintenanceController.java @@ -16,14 +16,14 @@ 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.EquipmentMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.request.EquipmentMaintenanceQuery; -import org.springblade.desk.jobTransfer.pojo.vo.*; +import org.springblade.desk.jobtransfer.pojo.excel.EquipmentMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.request.EquipmentMaintenanceQuery; +import org.springblade.desk.jobtransfer.pojo.vo.*; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; 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.service.IEquipmentMaintenanceService; import org.springblade.core.boot.ctrl.BladeController; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/PostHandleController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/PostHandleController.java similarity index 93% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/PostHandleController.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/PostHandleController.java index ab958e64..139fea14 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/PostHandleController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/PostHandleController.java @@ -1,6 +1,5 @@ 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,25 +10,22 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import lombok.AllArgsConstructor; import jakarta.validation.Valid; -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; -import org.springblade.desk.jobTransfer.pojo.excel.PostHandleExcel; -import org.springblade.desk.jobTransfer.pojo.excel.PostHandleImport; -import org.springblade.desk.jobTransfer.pojo.request.JobTransferSave; -import org.springblade.desk.jobTransfer.pojo.request.PostHandleQuery; +import org.springblade.desk.jobtransfer.pojo.excel.PostHandleExcel; +import org.springblade.desk.jobtransfer.pojo.excel.PostHandleImport; +import org.springblade.desk.jobtransfer.pojo.request.JobTransferSave; +import org.springblade.desk.jobtransfer.pojo.request.PostHandleQuery; import org.springframework.beans.BeanUtils; import org.springframework.core.io.Resource; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity; -import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; +import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity; +import org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO; import org.springblade.desk.jobtransfer.wrapper.PostHandleWrapper; import org.springblade.desk.jobtransfer.service.IPostHandleService; import org.springblade.core.boot.ctrl.BladeController; @@ -37,9 +33,7 @@ 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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/TrainingPlanController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/TrainingPlanController.java similarity index 96% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/TrainingPlanController.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/TrainingPlanController.java index 55f9b054..9965a964 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/controller/TrainingPlanController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/TrainingPlanController.java @@ -15,12 +15,12 @@ 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.TrainingPlanExcel; +import org.springblade.desk.jobtransfer.pojo.excel.TrainingPlanExcel; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.jobTransfer.pojo.entity.TrainingPlanEntity; -import org.springblade.desk.jobTransfer.pojo.vo.TrainingPlanVO; +import org.springblade.desk.jobtransfer.pojo.entity.TrainingPlanEntity; +import org.springblade.desk.jobtransfer.pojo.vo.TrainingPlanVO; import org.springblade.desk.jobtransfer.wrapper.TrainingPlanWrapper; import org.springblade.desk.jobtransfer.service.ITrainingPlanService; import org.springblade.core.boot.ctrl.BladeController; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateMaintenanceMapper.java similarity index 81% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateMaintenanceMapper.java index 4192a155..72fd87ef 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateMaintenanceMapper.java @@ -1,9 +1,9 @@ package org.springblade.desk.jobtransfer.mapper; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.request.CertificateLedgerQuery; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateLedgerVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateMaintenanceMapper.xml similarity index 96% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.xml rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateMaintenanceMapper.xml index dff07c11..46f4aac4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateMaintenanceMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateMaintenanceMapper.xml @@ -4,7 +4,7 @@ + type="org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity"> @@ -32,7 +32,7 @@ - + @@ -41,14 +41,14 @@ - + @@ -92,7 +92,7 @@ - + @@ -159,7 +159,7 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateTypeMapper.java similarity index 83% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateTypeMapper.java index fa121106..e40c62c9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateTypeMapper.java @@ -1,8 +1,8 @@ package org.springblade.desk.jobtransfer.mapper; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateTypeExcel; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateTypeVO; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateTypeExcel; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateTypeVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateTypeMapper.xml similarity index 92% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.xml rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateTypeMapper.xml index 44871de5..0e45505a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CertificateTypeMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CertificateTypeMapper.xml @@ -4,7 +4,7 @@ + type="org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity"> @@ -28,7 +28,7 @@ - SELECT * FROM MES_CERTIFICATE_TYPE ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CultivateDetailMapper.java similarity index 80% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CultivateDetailMapper.java index 6c6b2714..8e80525e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CultivateDetailMapper.java @@ -1,9 +1,9 @@ package org.springblade.desk.jobtransfer.mapper; -import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity; -import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel; -import org.springblade.desk.jobTransfer.pojo.request.CultivateDetailQuery; -import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO; +import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity; +import org.springblade.desk.jobtransfer.pojo.excel.CultivateDetailExcel; +import org.springblade.desk.jobtransfer.pojo.request.CultivateDetailQuery; +import org.springblade.desk.jobtransfer.pojo.vo.CultivateDetailVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CultivateDetailMapper.xml similarity index 97% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.xml rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CultivateDetailMapper.xml index caa6da60..25e7fb04 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/CultivateDetailMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/CultivateDetailMapper.xml @@ -4,7 +4,7 @@ + type="org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity"> @@ -26,7 +26,7 @@ - + @@ -117,7 +117,7 @@ - SELECT * FROM MES_CULTIVATE_DETAIL ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/EquipmentMaintenanceMapper.java similarity index 81% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/EquipmentMaintenanceMapper.java index 76f2aa74..74856af4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/EquipmentMaintenanceMapper.java @@ -1,9 +1,9 @@ package org.springblade.desk.jobtransfer.mapper; -import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.excel.EquipmentMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.request.EquipmentMaintenanceQuery; -import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceListVO; +import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.excel.EquipmentMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.request.EquipmentMaintenanceQuery; +import org.springblade.desk.jobtransfer.pojo.vo.EquipmentMaintenanceListVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/EquipmentMaintenanceMapper.xml similarity index 95% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.xml rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/EquipmentMaintenanceMapper.xml index 393ad04f..ff62d6d3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/EquipmentMaintenanceMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/EquipmentMaintenanceMapper.xml @@ -4,7 +4,7 @@ + type="org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity"> @@ -20,7 +20,7 @@ - + @@ -29,14 +29,14 @@ - + @@ -80,7 +80,7 @@ - + @@ -148,7 +148,7 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/PostHandleMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/PostHandleMapper.java similarity index 82% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/PostHandleMapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/PostHandleMapper.java index df35d889..f56ddfc1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/PostHandleMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/PostHandleMapper.java @@ -1,10 +1,10 @@ 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.excel.PostHandleExcel; -import org.springblade.desk.jobTransfer.pojo.request.PostHandleQuery; -import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; +import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity; +import org.springblade.desk.jobtransfer.pojo.excel.PostHandleExcel; +import org.springblade.desk.jobtransfer.pojo.request.PostHandleQuery; +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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/PostHandleMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/PostHandleMapper.xml similarity index 98% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/PostHandleMapper.xml rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/PostHandleMapper.xml index b54ba526..dc07a64c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/PostHandleMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/PostHandleMapper.xml @@ -3,7 +3,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -91,7 +91,7 @@ - SELECT * FROM MES_POST_HANDLE ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/TrainingPlanMapper.java similarity index 83% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/TrainingPlanMapper.java index 9b176a80..882bf849 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/TrainingPlanMapper.java @@ -1,8 +1,8 @@ package org.springblade.desk.jobtransfer.mapper; -import org.springblade.desk.jobTransfer.pojo.entity.TrainingPlanEntity; -import org.springblade.desk.jobTransfer.pojo.excel.TrainingPlanExcel; -import org.springblade.desk.jobTransfer.pojo.vo.TrainingPlanVO; +import org.springblade.desk.jobtransfer.pojo.entity.TrainingPlanEntity; +import org.springblade.desk.jobtransfer.pojo.excel.TrainingPlanExcel; +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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/TrainingPlanMapper.xml similarity index 94% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.xml rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/TrainingPlanMapper.xml index d1535582..524b2c57 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/mapper/TrainingPlanMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/mapper/TrainingPlanMapper.xml @@ -3,7 +3,7 @@ - + @@ -30,7 +30,7 @@ - SELECT * FROM MES_TRAINING_PLAN ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateMaintenanceService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ICertificateMaintenanceService.java similarity index 82% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateMaintenanceService.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ICertificateMaintenanceService.java index d16cfa2b..55625807 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateMaintenanceService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ICertificateMaintenanceService.java @@ -2,11 +2,11 @@ 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.excel.CertificateMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceImport; -import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceImport; +import org.springblade.desk.jobtransfer.pojo.request.CertificateLedgerQuery; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateLedgerVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateTypeService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ICertificateTypeService.java similarity index 83% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateTypeService.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ICertificateTypeService.java index 37af5d26..ced6bc5e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICertificateTypeService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ICertificateTypeService.java @@ -1,9 +1,9 @@ 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.excel.CertificateTypeExcel; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateTypeVO; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateTypeExcel; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateTypeVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICultivateDetailService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ICultivateDetailService.java similarity index 82% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICultivateDetailService.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ICultivateDetailService.java index f776797f..4a968a7a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ICultivateDetailService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ICultivateDetailService.java @@ -2,10 +2,10 @@ 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.excel.CultivateDetailExcel; -import org.springblade.desk.jobTransfer.pojo.request.CultivateDetailQuery; -import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO; +import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity; +import org.springblade.desk.jobtransfer.pojo.excel.CultivateDetailExcel; +import org.springblade.desk.jobtransfer.pojo.request.CultivateDetailQuery; +import org.springblade.desk.jobtransfer.pojo.vo.CultivateDetailVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IEquipmentMaintenanceService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/IEquipmentMaintenanceService.java similarity index 84% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IEquipmentMaintenanceService.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/IEquipmentMaintenanceService.java index f3410f91..b76f9f01 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IEquipmentMaintenanceService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/IEquipmentMaintenanceService.java @@ -1,10 +1,10 @@ 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.excel.EquipmentMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.request.EquipmentMaintenanceQuery; -import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceListVO; +import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.excel.EquipmentMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.request.EquipmentMaintenanceQuery; +import org.springblade.desk.jobtransfer.pojo.vo.EquipmentMaintenanceListVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IPostHandleService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/IPostHandleService.java similarity index 84% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IPostHandleService.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/IPostHandleService.java index def7a292..6319b862 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/IPostHandleService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/IPostHandleService.java @@ -2,12 +2,12 @@ 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.excel.PostHandleExcel; -import org.springblade.desk.jobTransfer.pojo.excel.PostHandleImport; -import org.springblade.desk.jobTransfer.pojo.request.JobTransferSave; -import org.springblade.desk.jobTransfer.pojo.request.PostHandleQuery; -import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; +import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity; +import org.springblade.desk.jobtransfer.pojo.excel.PostHandleExcel; +import org.springblade.desk.jobtransfer.pojo.excel.PostHandleImport; +import org.springblade.desk.jobtransfer.pojo.request.JobTransferSave; +import org.springblade.desk.jobtransfer.pojo.request.PostHandleQuery; +import org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ITrainingPlanService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ITrainingPlanService.java similarity index 87% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ITrainingPlanService.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ITrainingPlanService.java index f608b33e..a6c42a59 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/ITrainingPlanService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/ITrainingPlanService.java @@ -1,8 +1,8 @@ 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.excel.TrainingPlanExcel; +import org.springblade.desk.jobtransfer.pojo.entity.TrainingPlanEntity; +import org.springblade.desk.jobtransfer.pojo.excel.TrainingPlanExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateMaintenanceServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateMaintenanceServiceImpl.java similarity index 90% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateMaintenanceServiceImpl.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateMaintenanceServiceImpl.java index 1d9dbd88..b65316f9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateMaintenanceServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateMaintenanceServiceImpl.java @@ -5,14 +5,14 @@ import jakarta.annotation.Resource; import org.springblade.core.tool.api.R; import org.springblade.desk.jobtransfer.mapper.CertificateTypeMapper; import org.springblade.desk.jobtransfer.mapper.PostHandleMapper; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity; -import org.springblade.desk.jobTransfer.pojo.enums.PostHandleStatusEnum; -import org.springblade.desk.jobTransfer.pojo.enums.StaffTypeEnum; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceImport; -import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity; +import org.springblade.desk.jobtransfer.pojo.enums.PostHandleStatusEnum; +import org.springblade.desk.jobtransfer.pojo.enums.StaffTypeEnum; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceImport; +import org.springblade.desk.jobtransfer.pojo.request.CertificateLedgerQuery; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateLedgerVO; import org.springblade.desk.jobtransfer.mapper.CertificateMaintenanceMapper; import org.springblade.desk.jobtransfer.service.ICertificateMaintenanceService; import org.springblade.system.cache.UserCache; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateTypeServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateTypeServiceImpl.java similarity index 87% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateTypeServiceImpl.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateTypeServiceImpl.java index 7684ef99..d7a6e179 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CertificateTypeServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateTypeServiceImpl.java @@ -1,8 +1,8 @@ package org.springblade.desk.jobtransfer.service.impl; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateTypeExcel; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateTypeVO; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateTypeExcel; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateTypeVO; import org.springblade.desk.jobtransfer.mapper.CertificateTypeMapper; import org.springblade.desk.jobtransfer.service.ICertificateTypeService; import org.springframework.stereotype.Service; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CultivateDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CultivateDetailServiceImpl.java similarity index 90% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CultivateDetailServiceImpl.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CultivateDetailServiceImpl.java index 73acde2f..da3e9f86 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/CultivateDetailServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CultivateDetailServiceImpl.java @@ -2,12 +2,12 @@ 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.PostHandleEntity; -import org.springblade.desk.jobTransfer.pojo.enums.PostHandleStatusEnum; -import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel; -import org.springblade.desk.jobTransfer.pojo.request.CultivateDetailQuery; -import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO; +import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity; +import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity; +import org.springblade.desk.jobtransfer.pojo.enums.PostHandleStatusEnum; +import org.springblade.desk.jobtransfer.pojo.excel.CultivateDetailExcel; +import org.springblade.desk.jobtransfer.pojo.request.CultivateDetailQuery; +import org.springblade.desk.jobtransfer.pojo.vo.CultivateDetailVO; import org.springblade.desk.jobtransfer.mapper.CultivateDetailMapper; import org.springblade.desk.jobtransfer.service.ICultivateDetailService; import org.springblade.desk.jobtransfer.service.IPostHandleService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/EquipmentMaintenanceServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java similarity index 88% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/EquipmentMaintenanceServiceImpl.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java index 9b193be1..d8e040b6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/EquipmentMaintenanceServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java @@ -1,9 +1,9 @@ package org.springblade.desk.jobtransfer.service.impl; -import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.excel.EquipmentMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.request.EquipmentMaintenanceQuery; -import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceListVO; +import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.excel.EquipmentMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.request.EquipmentMaintenanceQuery; +import org.springblade.desk.jobtransfer.pojo.vo.EquipmentMaintenanceListVO; import org.springblade.desk.jobtransfer.mapper.EquipmentMaintenanceMapper; import org.springblade.desk.jobtransfer.service.IEquipmentMaintenanceService; import org.springframework.stereotype.Service; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/PostHandleServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/PostHandleServiceImpl.java similarity index 95% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/PostHandleServiceImpl.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/PostHandleServiceImpl.java index d3948583..bdfdd213 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/PostHandleServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/PostHandleServiceImpl.java @@ -1,31 +1,27 @@ 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.CultivateDetailEntity; -import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity; -import org.springblade.desk.jobTransfer.pojo.enums.*; -import org.springblade.desk.jobTransfer.pojo.excel.PostHandleExcel; -import org.springblade.desk.jobTransfer.pojo.excel.PostHandleImport; -import org.springblade.desk.jobTransfer.pojo.request.JobTransferSave; -import org.springblade.desk.jobTransfer.pojo.request.PostHandleQuery; -import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity; +import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity; +import org.springblade.desk.jobtransfer.pojo.enums.*; +import org.springblade.desk.jobtransfer.pojo.excel.PostHandleExcel; +import org.springblade.desk.jobtransfer.pojo.excel.PostHandleImport; +import org.springblade.desk.jobtransfer.pojo.request.JobTransferSave; +import org.springblade.desk.jobtransfer.pojo.request.PostHandleQuery; +import org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO; import org.springblade.desk.jobtransfer.mapper.PostHandleMapper; import org.springblade.desk.jobtransfer.service.ICertificateMaintenanceService; import org.springblade.desk.jobtransfer.service.ICultivateDetailService; import org.springblade.desk.jobtransfer.service.IEquipmentMaintenanceService; import org.springblade.desk.jobtransfer.service.IPostHandleService; -import org.springblade.system.cache.SysCache; 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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/TrainingPlanServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/TrainingPlanServiceImpl.java similarity index 93% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/TrainingPlanServiceImpl.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/TrainingPlanServiceImpl.java index 56a65f74..fb0627c4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/TrainingPlanServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/TrainingPlanServiceImpl.java @@ -2,8 +2,8 @@ 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.excel.TrainingPlanExcel; +import org.springblade.desk.jobtransfer.pojo.entity.TrainingPlanEntity; +import org.springblade.desk.jobtransfer.pojo.excel.TrainingPlanExcel; import org.springblade.desk.jobtransfer.mapper.TrainingPlanMapper; import org.springblade.desk.jobtransfer.service.ITrainingPlanService; import org.springframework.stereotype.Service; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateMaintenanceWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/CertificateMaintenanceWrapper.java similarity index 90% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateMaintenanceWrapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/CertificateMaintenanceWrapper.java index 39b0cb6a..5505fbee 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateMaintenanceWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/CertificateMaintenanceWrapper.java @@ -2,8 +2,8 @@ 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.vo.CertificateMaintenanceVO; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateMaintenanceVO; import java.util.Objects; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateTypeWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/CertificateTypeWrapper.java similarity index 89% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateTypeWrapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/CertificateTypeWrapper.java index f9afd749..524cf7b7 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CertificateTypeWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/CertificateTypeWrapper.java @@ -2,8 +2,8 @@ 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.vo.CertificateTypeVO; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateTypeVO; import java.util.Objects; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CultivateDetailWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/CultivateDetailWrapper.java similarity index 89% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CultivateDetailWrapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/CultivateDetailWrapper.java index ab48529c..dd14a01e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/CultivateDetailWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/CultivateDetailWrapper.java @@ -2,8 +2,8 @@ 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.vo.CultivateDetailVO; +import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity; +import org.springblade.desk.jobtransfer.pojo.vo.CultivateDetailVO; import java.util.Objects; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/EquipmentMaintenanceWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/EquipmentMaintenanceWrapper.java similarity index 90% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/EquipmentMaintenanceWrapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/EquipmentMaintenanceWrapper.java index 29ba2694..ce221c2b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/EquipmentMaintenanceWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/EquipmentMaintenanceWrapper.java @@ -2,8 +2,8 @@ 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.vo.EquipmentMaintenanceVO; +import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.vo.EquipmentMaintenanceVO; import java.util.Objects; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/PostHandleWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/PostHandleWrapper.java similarity index 92% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/PostHandleWrapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/PostHandleWrapper.java index 94f77a6e..53619ce3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/PostHandleWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/PostHandleWrapper.java @@ -2,8 +2,8 @@ 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.vo.PostHandleVO; +import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity; +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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/TrainingPlanWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/TrainingPlanWrapper.java similarity index 89% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/TrainingPlanWrapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/TrainingPlanWrapper.java index 2c95150a..93a11065 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/wrapper/TrainingPlanWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/wrapper/TrainingPlanWrapper.java @@ -2,8 +2,8 @@ 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.vo.TrainingPlanVO; +import org.springblade.desk.jobtransfer.pojo.entity.TrainingPlanEntity; +import org.springblade.desk.jobtransfer.pojo.vo.TrainingPlanVO; import java.util.Objects; diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonAbilityController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonAbilityController.java index 3018502e..bd09de1b 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonAbilityController.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonAbilityController.java @@ -46,7 +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.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; diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.java index c3ed1971..5da215fe 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.java @@ -29,7 +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.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; diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.xml index a7736b17..54346ba7 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PersonAbilityMapper.xml @@ -43,7 +43,7 @@ SELECT * FROM MES_PERSON_ABILITY ${ew.customSqlSegment} - SELECT * FROM MES_CERTIFICATE_TYPE where is_deleted = 0 diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPersonAbilityService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPersonAbilityService.java index d1b0d5a2..9c77080c 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPersonAbilityService.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPersonAbilityService.java @@ -28,7 +28,7 @@ package org.springblade.scheduling.scheduling.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity; +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; diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PersonAbilityServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PersonAbilityServiceImpl.java index 7dd9ac23..28c60188 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PersonAbilityServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PersonAbilityServiceImpl.java @@ -28,7 +28,7 @@ package org.springblade.scheduling.scheduling.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity; +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.mapper.PersonAbilityMapper; From 4d36eeaac3925e2cbd6d30c25e7ff14e0208fa53 Mon Sep 17 00:00:00 2001 From: qinyulong Date: Sat, 17 Jan 2026 14:20:21 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=B8=8A=E5=B2=97=E8=AF=81=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CertificateMaintenanceServiceImpl.java | 30 ++++++++++++++++-- .../岗位处理导入模板下载.xls | Bin 21504 -> 21504 bytes .../jobTransfer/证书维护导入模板.xls | Bin 20480 -> 20480 bytes 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateMaintenanceServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateMaintenanceServiceImpl.java index b65316f9..4b30b14e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateMaintenanceServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateMaintenanceServiceImpl.java @@ -1,12 +1,15 @@ 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.PostHandleMapper; import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity; +import org.springblade.desk.jobtransfer.pojo.enums.MaintenanceStatusEnum; import org.springblade.desk.jobtransfer.pojo.enums.PostHandleStatusEnum; import org.springblade.desk.jobtransfer.pojo.enums.StaffTypeEnum; import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceExcel; @@ -72,6 +75,7 @@ public class CertificateMaintenanceServiceImpl extends BaseServiceImpl certificateMaintenanceImports) { //获取全部用户codes，通过code获取用户ID, Set codes = certificateMaintenanceImports.stream().map(CertificateMaintenanceImport::getUserCode) @@ -106,8 +110,30 @@ public class CertificateMaintenanceServiceImpl extends BaseServiceImpl certificateType = certificateMaintenanceImports.stream().map(CertificateMaintenanceImport::getCertificateType) .collect(Collectors.toSet()); - - return null; + LambdaQueryWrapper certificateTypeEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); + certificateTypeEntityLambdaQueryWrapper.in(CollectionUtils.isNotEmpty(certificateType), CertificateTypeEntity::getName, certificateType); // [8](@ref) + List certificateTypeEntities = certificateTypeMapper.selectList(certificateTypeEntityLambdaQueryWrapper); + Map 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 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); } diff --git a/blade-service/blade-desk/src/main/resources/Excel/jobTransfer/岗位处理导入模板下载.xls b/blade-service/blade-desk/src/main/resources/Excel/jobTransfer/岗位处理导入模板下载.xls index af6fc61bb5bbb59f27b7ad606af7ba019bfa902e..335e4a9b14fbfaa1549fdc95d5c4c853fb059826 100644 GIT binary patch delta 1036 zcmaKr%WD%+6vn?BCvnouBgsT!U04?)_1U`6DoJBP6w+E!Z2}6~Dnjf+aiOLlsmZvo zF1iseZbT)xX;)GimxAISPy}@sf-WMsR$NqKJU2;a@+i(Qcji04^SXyS<|;E++1gFX z^YPQ+_`OH`wzTBRCan!A>5-2G$x>n4_=9xBGJVe(tMc7ynAY^>I#_kFO%E}K<9O?8$5y*(1zl9rdNNB;nwgoX8|$SE zvXl8%KlM8FMK1*goSxVFY1E;A`)SOfM|3eanhC9Q;@eu#>jz!e$9X=omr49-B*9+u zO5`Np6CE>#^R?N+;_?Lv%)C}NCkiV?{w$g*`QY}`h&Ij-JEo%&`|E+I&{1rbhsb>uJ`}~FvD>>e-J^+=V${Ver58Zu2H=@9R<*kPebQFCo?6n z`Ib#4o7+}iQlj4$8z8maRz6a)trSvTTd6oh-E78bNH*)WvgpKuHuF=Q?}RM_NWrjG jkYLDG1}Vi>AyO)@pZ%%`fAOO>P8o*vV`|*>@|^S!I|JD~ delta 792 zcmZoz!Pu~ZaYGIZo4_?ehOV~BMJ#PhRZg3Ku{g7F>}&tu*>;DKd2*n?_2vfdxr~f5 zljV5DfutXdl$2p&?2ZohH)IfD*uucT@V|ZnBamWflbKw{D-M$NtlnP-lDz{I z;6k|h9Hy)dLiQh~tQ|sDj~^6nz%T)laUk~QGXB5XOnYo5ms+bZ3QV45?a0VJ`Hr63+QtX!{VOZk0E{W6t>fl;IMX>4^(cQ_jZJpd$m*WaYG6V-_6avzW-b9FgC0g^{Q;2T*T7G7_|8(OEVj1!`#`PmF;&JnI{W+ zTW>zV9m~k*Jz0)d97y`XNJ(!d#_s4~e?tZlhAj*X4FBsVFajxtHt)%Gyy75P&+7ek zAlW-WQBDT9>^f9g9Y#h5Glo4(P`&q1W$!Sc$nx=_nask#12&lvWUn2%EF%L4!sI+m zSx$uPJakzG1}=n~&tb~iAY}hx%Gx1h_4q;I1`HD*83$r-F5};(&17UVSjeWF z(B~jLd4Y9gJvRfZ0FZsKJI(KDs(iWzLrI)I14p_(!_!nvU{LTdurio~LJAC^ikT*8 zH4&}2JsO|l%>p)GxLG}H85pK*=Je2HWM^ea5Ori=o9yXX?+&u_FECUXfDUm6Vi=E! z!G!@7eGoZj23H1VIFAL$V}bKnfjrj9{9Y}5oIsC&%;5w=R@Ti6y<`~|`LF;0_C|`K delta 598 zcmZozz}T>WaYG6VUqsX8ssCE;Ffu6Iwqa$u6I}9kYe0*povoP?0O=bkyYlkk&$iRUxIS*5o z6CpbfU6z4?3*qK-n6fqq*?*X_b_iKLeo(jp!vsjif!LeN__t{@J+PjvXC0(4je!m5 za}Z`>U}T!0)$}w~J{`zxkA^TOcUedBvoNp<09739PV)mvZ;rD0!_E55hJhhubF_yh zqc{sggNP#oCK))~mL(-Xn8O~#3Z~ Date: Sat, 17 Jan 2026 16:22:25 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BsDischargeRecController.java | 30 +++++++++---------- .../controller/BsInsTestController.java | 1 - .../desk/energy/util/JasperReportUtil.java | 1 - 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDischargeRecController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDischargeRecController.java index f702d3d0..d8d08dde 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDischargeRecController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDischargeRecController.java @@ -25,40 +25,38 @@ */ package org.springblade.desk.energy.controller; -import io.swagger.v3.oas.annotations.tags.Tag; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import lombok.AllArgsConstructor; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; - -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.energy.excel.BsDischargeRecExcel; import org.springblade.desk.energy.pojo.entity.BsDischargeRecEntity; -import org.springblade.desk.energy.pojo.entity.BsDosingRecEntity; import org.springblade.desk.energy.pojo.vo.BsDischargeRecVO; import org.springblade.desk.energy.service.IBsDischargeRecService; import org.springblade.desk.energy.wrapper.BsDischargeRecWrapper; import org.springframework.core.io.Resource; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; -import java.util.Map; -import java.util.List; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; +import java.util.List; +import java.util.Map; + /** * 槽液排放记录表 控制器 * diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsInsTestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsInsTestController.java index 71a1c7db..19184ee1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsInsTestController.java +++ b/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; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/JasperReportUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/JasperReportUtil.java index 6816a3aa..e6740e70 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/JasperReportUtil.java +++ b/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; From b57d8d9add130c433399f52d04a822307b8c78c9 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Mon, 19 Jan 2026 09:24:17 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A8=A1=E5=9D=97=20?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-service-api/blade-desk-api/pom.xml | 6 + .../desk/quality/pojo/entity/ReviewSheet.java | 4 +- .../pojo/request/ReviewSheetErpSearch.java | 4 +- .../pojo/request/ReviewSheetHisWOSearch.java | 4 +- .../pojo/request/ReviewSheetInitSearch.java | 4 +- .../request/ReviewSheetRedoScrapSearch.java | 4 +- .../pojo/request/ReviewSheetSelfSearch.java | 4 +- .../DateBeginOfDayDeserializer.java | 51 ++++++ .../DateEndOfDayDeserializer.java | 52 ++++++ .../Integer0ToEmptyStringSerializer.java | 2 +- .../IntegerAllToStringSerializer.java | 2 +- .../springblade/system/pojo/entity/Dept.java | 163 +++++++++--------- blade-service/blade-desk/pom.xml | 7 - .../desk/basic/util/RequestUtil.java | 23 +++ .../controller/ReviewSheetController.java | 4 + .../desk/quality/mapper/ReviewSheetMapper.xml | 7 +- .../service/impl/ReviewSheetServiceImpl.java | 2 +- .../springblade/system/mapper/DeptMapper.xml | 1 + 18 files changed, 245 insertions(+), 99 deletions(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/deserializer/DateBeginOfDayDeserializer.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/deserializer/DateEndOfDayDeserializer.java rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/{ => serializer}/Integer0ToEmptyStringSerializer.java (95%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/{ => serializer}/IntegerAllToStringSerializer.java (93%) diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index 2182a907..3730c410 100644 --- a/blade-service-api/blade-desk-api/pom.xml +++ b/blade-service-api/blade-desk-api/pom.xml @@ -39,6 +39,12 @@ fastjson 1.2.83 + + + cn.hutool + hutool-all + 5.8.16 + diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java index 6599ca2b..1e23166d 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java @@ -5,13 +5,11 @@ package org.springblade.desk.quality.pojo.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; -import org.springblade.desk.util.json.Integer0ToEmptyStringSerializer; -import org.springblade.desk.util.json.IntegerAllToStringSerializer; +import org.springblade.desk.util.json.serializer.IntegerAllToStringSerializer; import java.io.Serial; import java.time.LocalDateTime; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetErpSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetErpSearch.java index 15acb61e..9249d360 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetErpSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetErpSearch.java @@ -3,13 +3,15 @@ package org.springblade.desk.quality.pojo.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springblade.desk.quality.pojo.entity.ReviewSheet; /** * ERP审理 搜索 */ @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class ReviewSheetErpSearch extends ReviewSheet { @Schema(description = "责任零件") diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetHisWOSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetHisWOSearch.java index c18b60a7..05df7d9c 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetHisWOSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetHisWOSearch.java @@ -2,12 +2,14 @@ package org.springblade.desk.quality.pojo.request; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; /** * 历史已完成车间订单 搜索 */ @Data -@EqualsAndHashCode() +@EqualsAndHashCode(callSuper = false) +@ToString(callSuper = true) public class ReviewSheetHisWOSearch { } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetInitSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetInitSearch.java index 3482b0e9..bb1201dc 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetInitSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetInitSearch.java @@ -3,13 +3,15 @@ package org.springblade.desk.quality.pojo.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springblade.desk.quality.pojo.entity.ReviewSheet; /** * 生产处置单 搜索 */ @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class ReviewSheetInitSearch extends ReviewSheet { @Schema(description = "单据编号") diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoScrapSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoScrapSearch.java index 5d73a62c..889bc7aa 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoScrapSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetRedoScrapSearch.java @@ -3,13 +3,15 @@ package org.springblade.desk.quality.pojo.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springblade.desk.quality.pojo.entity.ReviewSheet; /** * 返工审理 报废审理 搜索 */ @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class ReviewSheetRedoScrapSearch extends ReviewSheet { @Schema(description = "创建提请时间-开始") diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetSelfSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetSelfSearch.java index a0cd10f5..9d1a4367 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetSelfSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetSelfSearch.java @@ -3,13 +3,15 @@ package org.springblade.desk.quality.pojo.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springblade.desk.quality.pojo.entity.ReviewSheet; /** * 内部审理 搜索 */ @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class ReviewSheetSelfSearch extends ReviewSheet { @Schema(description = "车间订单号") diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/deserializer/DateBeginOfDayDeserializer.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/deserializer/DateBeginOfDayDeserializer.java new file mode 100644 index 00000000..8e9632d3 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/deserializer/DateBeginOfDayDeserializer.java @@ -0,0 +1,51 @@ +package org.springblade.desk.util.json.deserializer; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.deser.std.StdDeserializer; + +import java.io.IOException; +import java.util.Date; + +/** + * 自定义Date反序列化器：将yyyy-MM-dd字符串转为当天开始时间（00:00:00）的Date对象 + */ +public class DateBeginOfDayDeserializer extends StdDeserializer { + + // 固定日期格式 + private static final String DATE_PATTERN = "yyyy-MM-dd"; + + // 无参构造（Jackson要求） + public DateBeginOfDayDeserializer() { + this(null); + } + + // 带类型构造 + public DateBeginOfDayDeserializer(Class vc) { + super(vc); + } + + @Override + public Date deserialize(JsonParser jsonParser, DeserializationContext ctx) throws IOException { + // 1. 获取JSON中的字符串值（如：2026-01-01） + String dateStr = jsonParser.getText().trim(); + + // 2. 空值处理（避免空指针） + if (dateStr.isEmpty() || dateStr.equals("null")) { + return null; + } + try { + // 3. Hutool解析字符串为DateTime + DateTime dateTime = DateUtil.parse(dateStr, DATE_PATTERN); + // 4. 转为当天开始时间（00:00:00） + DateTime beginOfDay = DateUtil.beginOfDay(dateTime); + // 5. 转换为java.util.Date（适配Oracle DATE 7） + return beginOfDay.toJdkDate(); + } catch (Exception e) { + // 6. 解析失败时抛出友好异常 + throw new IOException("日期格式错误，仅支持yyyy-MM-dd格式（如：2026-01-01）", e); + } + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/deserializer/DateEndOfDayDeserializer.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/deserializer/DateEndOfDayDeserializer.java new file mode 100644 index 00000000..48c4a712 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/deserializer/DateEndOfDayDeserializer.java @@ -0,0 +1,52 @@ +package org.springblade.desk.util.json.deserializer; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.deser.std.StdDeserializer; + +import java.io.IOException; +import java.util.Date; + +/** + * 自定义Date反序列化器：将yyyy-MM-dd字符串转为当天结束时间（23:59:59）的Date对象 + */ +public class DateEndOfDayDeserializer extends StdDeserializer { + + // 固定日期格式 + private static final String DATE_PATTERN = "yyyy-MM-dd"; + + // 无参构造（Jackson要求） + public DateEndOfDayDeserializer() { + this(null); + } + + // 带类型构造 + public DateEndOfDayDeserializer(Class vc) { + super(vc); + } + + @Override + public Date deserialize(JsonParser jsonParser, DeserializationContext ctx) throws IOException { + // 1. 获取JSON中的字符串值（如：2026-01-01） + String dateStr = jsonParser.getText().trim(); + + // 2. 空值处理（避免空指针） + if (dateStr.isEmpty() || dateStr.equals("null")) { + return null; + } + + try { + // 3. Hutool解析字符串为DateTime + DateTime dateTime = DateUtil.parse(dateStr, DATE_PATTERN); + // 4. 转为当天结束时间（23:59:59.999，不影响Oracle查询） + DateTime endOfDay = DateUtil.endOfDay(dateTime); + // 5. 转换为java.util.Date（适配Oracle DATE 7） + return endOfDay.toJdkDate(); + } catch (Exception e) { + // 6. 解析失败时抛出友好异常 + throw new IOException("日期格式错误，仅支持yyyy-MM-dd格式（如：2026-01-01）", e); + } + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/Integer0ToEmptyStringSerializer.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/serializer/Integer0ToEmptyStringSerializer.java similarity index 95% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/Integer0ToEmptyStringSerializer.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/serializer/Integer0ToEmptyStringSerializer.java index 26767495..1580f33d 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/Integer0ToEmptyStringSerializer.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/serializer/Integer0ToEmptyStringSerializer.java @@ -1,4 +1,4 @@ -package org.springblade.desk.util.json; +package org.springblade.desk.util.json.serializer; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/IntegerAllToStringSerializer.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/serializer/IntegerAllToStringSerializer.java similarity index 93% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/IntegerAllToStringSerializer.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/serializer/IntegerAllToStringSerializer.java index d3006594..93261566 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/IntegerAllToStringSerializer.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/serializer/IntegerAllToStringSerializer.java @@ -1,4 +1,4 @@ -package org.springblade.desk.util.json; +package org.springblade.desk.util.json.serializer; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/Dept.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/Dept.java index 32da8442..d0ee3ba7 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/Dept.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/Dept.java @@ -47,84 +47,87 @@ import java.io.Serializable; @Schema(description = "Dept对象") public class Dept implements Serializable { - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @JsonSerialize(using = ToStringSerializer.class) - @Schema(description = "主键") - @TableId(value = "id", type = IdType.ASSIGN_ID) - private Long id; - - /** - * 租户ID - */ - @Schema(description = "租户ID") - private String tenantId; - - /** - * 父主键 - */ - @JsonSerialize(using = ToStringSerializer.class) - @Schema(description = "父主键") - private Long parentId; - - /** - * 机构名 - */ - @Schema(description = "机构名") - private String deptName; - - /** - * 机构全称 - */ - @Schema(description = "机构全称") - private String fullName; - - /** - * 祖级机构主键 - */ - @Schema(description = "祖级机构主键") - private String ancestors; - - /** - * 部门主管id - */ - @Schema(description = "部门主管id") - private String leaderId; - - /** - * 机构类型 - */ - @Schema(description = "机构类型") - private Integer deptCategory; - - /** - * 排序 - */ - @Schema(description = "排序") - private Integer sort; - - /** - * 备注 - */ - @Schema(description = "备注") - private String remark; - - /** - * 业务状态 - */ - @Schema(description = "业务状态") - private Integer status; - - /** - * 是否已删除 - */ - @TableLogic - @Schema(description = "是否已删除") - private Integer isDeleted; - - + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @JsonSerialize(using = ToStringSerializer.class) + @Schema(description = "主键") + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + /** + * 租户ID + */ + @Schema(description = "租户ID") + private String tenantId; + + /** + * 父主键 + */ + @JsonSerialize(using = ToStringSerializer.class) + @Schema(description = "父主键") + private Long parentId; + + /** + * 机构名 + */ + @Schema(description = "机构名") + private String deptName; + + /** + * 机构全称 + */ + @Schema(description = "机构全称") + private String fullName; + + /** + * 祖级机构主键 + */ + @Schema(description = "祖级机构主键") + private String ancestors; + + /** + * 部门主管id + */ + @Schema(description = "部门主管id") + private String leaderId; + + /** + * 机构类型 + */ + @Schema(description = "机构类型") + private Integer deptCategory; + + /** + * 排序 + */ + @Schema(description = "排序") + private Integer sort; + + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + + /** + * 业务状态 + */ + @Schema(description = "业务状态") + private Integer status; + + /** + * 是否已删除 + */ + @TableLogic + @Schema(description = "是否已删除") + private Integer isDeleted; + /** + * [部门]编码 + */ + @Schema(description = "[部门]编码") + private String deptCode; } diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index 10829b81..6ab9351d 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -71,13 +71,6 @@ 4.6.0.RELEASE compile - - - - cn.hutool - hutool-all - 5.8.16 - com.videasoft diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/RequestUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/RequestUtil.java index c61118d0..b0d27148 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/RequestUtil.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/RequestUtil.java @@ -1,5 +1,6 @@ package org.springblade.desk.basic.util; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.LocalDateTimeUtil; import org.apache.commons.lang3.StringUtils; @@ -96,6 +97,28 @@ public class RequestUtil { return DateUtil.endOfDay(date); } + /** + * + * @param start + * @return 年月日 一天 开始的 Date + */ + public static Date buildDateBeginOfDay(final String start) { + DateTime dt = new DateTime(start, PATTERN_DATE); + DateTime dtStart = DateUtil.beginOfDay(dt); + return dtStart.toJdkDate(); + } + + /** + * + * @param end + * @return 年月日 一天 开始的 Date + */ + public static Date buildDateEndOfDay(final String end) { + DateTime dt = new DateTime(end, PATTERN_DATE); + DateTime dtEnd = DateUtil.endOfDay(dt); + return dtEnd.toJdkDate(); + } + /** * @param map * @param key diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java index 094d6155..894f0cf0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java @@ -22,6 +22,7 @@ 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.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; @@ -113,6 +114,7 @@ public class ReviewSheetController extends BladeController { @Operation(summary = "生产处置单list分页", description = "传入ReviewSheet Obj") public R> listInit(@Valid @RequestBody ReviewSheetInitSearch search, @RequestBody Query query) { + log.info("ReviewSheetInitSearch = {}", search); // // Map demo = new HashMap(); @@ -140,6 +142,7 @@ public class ReviewSheetController extends BladeController { @Operation(summary = "返工报废审理list分页", description = "传入ReviewSheet Obj") public R> listReviewRedoScrap(@Valid @RequestBody ReviewSheetRedoScrapSearch search, @RequestBody Query query) { + log.info("ReviewSheetRedoScrapSearch = {}", search); // todo: mapper // Map demo = new HashMap(); // QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); @@ -188,6 +191,7 @@ public class ReviewSheetController extends BladeController { @Operation(summary = "Erplist分页", description = "传入ReviewSheet Obj") public R> listErp(@Valid @RequestBody ReviewSheetErpSearch search, @RequestBody Query query) { + log.info("ReviewSheetErpSearch = {}", search); // Map demo = new HashMap(); // // todo: mapper // QueryWrapper qw = Condition.getQueryWrapper(demo, ReviewSheet.class); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml index 9213efec..d377fa3f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml @@ -156,7 +156,12 @@ -- AND wo.IS_DELETED = 0 -- AND oem.IS_DELETED = 0 ) - AND rs.BIZ_TYPE IN (1, 2) + + AND rs.BIZ_TYPE = #{q.bizType} + + + AND rs.BIZ_TYPE IN (1, 2) + AND rs.STATUS = #{q.status} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java index dd790836..6d0f531b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java @@ -26,7 +26,6 @@ import org.springblade.desk.basic.constant.BaseValue; import org.springblade.desk.basic.service.en.impl.EnBaseServiceImpl; import org.springblade.desk.basic.util.IdUtil; import org.springblade.desk.quality.constant.InspectionTaskConst; -import org.springblade.desk.quality.constant.ProReTemplateConst; import org.springblade.desk.quality.constant.ReviewSheetConst; import org.springblade.desk.quality.excel.ReviewSheetExcel; import org.springblade.desk.quality.mapper.ReviewSheetMapper; @@ -319,6 +318,7 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl + From b0dbd5dcde6cba570b5858312b2d65aee3b74c9f Mon Sep 17 00:00:00 2001 From: qinyulong Date: Mon, 19 Jan 2026 10:47:28 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E8=BD=AC=E5=B2=97=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=9A=E8=AE=BE=E5=A4=87=E7=BB=B4=E6=8A=A4=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/EquipmentMaintenanceImport.java | 42 +++++++++ .../impl/IMeasurementRecordsServiceImpl.java | 6 +- .../EquipmentMaintenanceController.java | 35 ++++++++ .../service/IEquipmentMaintenanceService.java | 10 +++ .../impl/EquipmentMaintenanceServiceImpl.java | 85 +++++++++++++++++- .../jobTransfer/设备维护导入模板.xls | Bin 0 -> 20480 bytes .../src/main/resources/application-dev.yml | 2 +- 7 files changed, 175 insertions(+), 5 deletions(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/EquipmentMaintenanceImport.java create mode 100644 blade-service/blade-desk/src/main/resources/Excel/jobTransfer/设备维护导入模板.xls diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/EquipmentMaintenanceImport.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/EquipmentMaintenanceImport.java new file mode 100644 index 00000000..28269c29 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/jobtransfer/pojo/excel/EquipmentMaintenanceImport.java @@ -0,0 +1,42 @@ +package org.springblade.desk.jobtransfer.pojo.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.format.DateTimeFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.util.Date; + +/** + * 设备维护导入 + * + * @author qyl + * @since 2026-01-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class EquipmentMaintenanceImport extends BaseEntity { + + /** + * 用户code + */ + @ExcelProperty(index = 0) + private String userCode; + /** + * 设备编号 + */ + @ExcelProperty(index = 1) + private String deviceCode; + /** + * 设备有效期 + */ + @ExcelProperty(index = 2) + private Integer equipmentValidityPeriod; + /** + * 设备日期 + */ + @ExcelProperty(index = 3) + @DateTimeFormat("yyyy/MM/dd") + private Date equipmentDate; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/IMeasurementRecordsServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/IMeasurementRecordsServiceImpl.java index 6d01149b..bf57fd98 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/IMeasurementRecordsServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/IMeasurementRecordsServiceImpl.java @@ -54,7 +54,7 @@ public class IMeasurementRecordsServiceImpl implements IMeasurementRecordsServic return processResponse(response, page); } catch (Exception e) { - log.error("获取量具库存记录数据接口调用失败: {}", e.getMessage(), e); + log.error("获取计量记录记录数据接口调用失败: {}", e.getMessage(), e); return page.setRecords(List.of()); // 返回空列表而不是null } } @@ -91,11 +91,11 @@ public class IMeasurementRecordsServiceImpl implements IMeasurementRecordsServic try { JSONObject result = JSONObject.parseObject(responseBody); - if (result != null && result.getInteger("code") != null && result.getInteger("code").equals(200)) { + if (result != null && result.getBoolean("success")) { JSONObject data = result.getJSONObject("data"); if (data != null) { List records = JSONArray.parseArray(data.toJSONString(), JSONObject.class); - log.info("成功获取{}条量具库存记录", records != null ? records.size() : 0); + log.info("成功获取{}条计量记录记录", records != null ? records.size() : 0); return page.setRecords(records != null ? records : List.of()); } } else { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/EquipmentMaintenanceController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/EquipmentMaintenanceController.java index a89aef12..b9a76a7d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/EquipmentMaintenanceController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/EquipmentMaintenanceController.java @@ -16,10 +16,15 @@ 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.CertificateMaintenanceImport; import org.springblade.desk.jobtransfer.pojo.excel.EquipmentMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.excel.EquipmentMaintenanceImport; import org.springblade.desk.jobtransfer.pojo.request.EquipmentMaintenanceQuery; import org.springblade.desk.jobtransfer.pojo.vo.*; import org.springframework.beans.BeanUtils; +import org.springframework.core.io.Resource; +import org.springframework.http.ResponseEntity; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -34,6 +39,7 @@ import java.util.ArrayList; import java.util.List; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.web.multipart.MultipartFile; /** * 岗位设备维护 控制器 @@ -166,6 +172,35 @@ public class EquipmentMaintenanceController extends BladeController { ExcelUtil.export(response, "岗位设备维护数据" + DateUtil.time(), "岗位设备维护数据表", excels, EquipmentMaintenanceExcel.class); } + /** + * 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 10) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/jobtransfer/设备维护导入模板.xls", + "设备维护导入模板.xls"); + } + + /** + * 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 11) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, EquipmentMaintenanceImport.class + ); + return equipmentMaintenanceService.saveExcelData(importList); + } + @PostConstruct // 项目启动后立即执行一次 public void init() { updateMaintenanceStatus(); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/IEquipmentMaintenanceService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/IEquipmentMaintenanceService.java index b76f9f01..a656f8b8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/IEquipmentMaintenanceService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/IEquipmentMaintenanceService.java @@ -1,8 +1,10 @@ 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.EquipmentMaintenanceEntity; import org.springblade.desk.jobtransfer.pojo.excel.EquipmentMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.excel.EquipmentMaintenanceImport; import org.springblade.desk.jobtransfer.pojo.request.EquipmentMaintenanceQuery; import org.springblade.desk.jobtransfer.pojo.vo.EquipmentMaintenanceListVO; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -47,4 +49,12 @@ public interface IEquipmentMaintenanceService extends BaseService importList); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java index d8e040b6..177350b1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java @@ -1,17 +1,35 @@ 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.device.mapper.EquipmentMapper; +import org.springblade.desk.device.pojo.entity.EquipmentEntity; +import org.springblade.desk.jobtransfer.mapper.PostHandleMapper; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity; +import org.springblade.desk.jobtransfer.pojo.enums.MaintenanceStatusEnum; +import org.springblade.desk.jobtransfer.pojo.enums.PostHandleStatusEnum; +import org.springblade.desk.jobtransfer.pojo.enums.StaffTypeEnum; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceImport; import org.springblade.desk.jobtransfer.pojo.excel.EquipmentMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.excel.EquipmentMaintenanceImport; import org.springblade.desk.jobtransfer.pojo.request.EquipmentMaintenanceQuery; import org.springblade.desk.jobtransfer.pojo.vo.EquipmentMaintenanceListVO; import org.springblade.desk.jobtransfer.mapper.EquipmentMaintenanceMapper; import org.springblade.desk.jobtransfer.service.IEquipmentMaintenanceService; +import org.springblade.system.cache.UserCache; +import org.springblade.system.pojo.entity.UserInfo; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; /** * 岗位设备维护 服务实现类 @@ -22,6 +40,12 @@ import java.util.List; @Service public class EquipmentMaintenanceServiceImpl extends BaseServiceImpl implements IEquipmentMaintenanceService { + @Resource + private PostHandleMapper postHandleMapper; + + @Resource + private EquipmentMapper equipmentMapper; + @Override public IPage selectEquipmentMaintenancePage(IPage page, EquipmentMaintenanceQuery equipmentMaintenanceQuery) { return page.setRecords(baseMapper.selectEquipmentMaintenancePage(page, equipmentMaintenanceQuery)); @@ -50,4 +74,63 @@ public class EquipmentMaintenanceServiceImpl extends BaseServiceImpl importList) { + //获取全部用户codes，通过code获取用户ID, + Set codes = importList.stream().map(EquipmentMaintenanceImport::getUserCode) + .collect(Collectors.toSet()); + Map idCodeMap = codes.stream() + .map(code -> { + UserInfo userInfo = UserCache.getUserByCode(code); + return (userInfo != null && userInfo.getUser() != null) ? + new AbstractMap.SimpleEntry<>(code, userInfo.getUser().getId()) : null; + }) + .filter(Objects::nonNull) + .collect(Collectors.toMap(AbstractMap.SimpleEntry::getValue, AbstractMap.SimpleEntry::getKey)); + //根据用户id获取人员岗位数据 + Collection values = idCodeMap.keySet(); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(PostHandleEntity::getUserId, values) + .eq(PostHandleEntity::getStaffType, StaffTypeEnum.FORMAL.getCode().shortValue()) + .ne(PostHandleEntity::getPhStatus, PostHandleStatusEnum.DEPART.getCode().shortValue()); // 使用实体类的get方法引用 + List postHandleEntities = postHandleMapper.selectList(lambdaQueryWrapper); + Map idMap = postHandleEntities.stream().collect(Collectors.toMap( + entity -> entity.getUserId(), + entity -> entity.getId())); + //整合成一个用户code和PostHandleEntityId的map + Map codePostHandleIdMap = new HashMap<>(); + for (Long l : idMap.keySet()) { + codePostHandleIdMap.put(idCodeMap.get(l), idMap.get(l)); + } + codes.removeAll(codePostHandleIdMap.keySet()); + if (codes.size() > 0) { + return R.fail("工号:" + String.join(",", codes) + "不存在。"); + } + //查询设备信息 + Set deviceCode = importList.stream().map(EquipmentMaintenanceImport::getDeviceCode) + .collect(Collectors.toSet()); + LambdaQueryWrapper equipmentEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); + equipmentEntityLambdaQueryWrapper.in(CollectionUtils.isNotEmpty(deviceCode), EquipmentEntity::getDeviceCode, deviceCode); // [8](@ref) + List equipmentEntities = equipmentMapper.selectList(equipmentEntityLambdaQueryWrapper); + Map deviceNameIds = equipmentEntities.stream().collect(Collectors.toMap( + entity -> entity.getDeviceCode(), + entity -> entity.getId())); + deviceCode.removeAll(deviceNameIds.keySet()); + if (deviceCode.size() > 0) { + return R.fail("设备:" + String.join(",", deviceCode) + "不存在。"); + } + List saves = new ArrayList<>(); + importList.forEach(e -> { + EquipmentMaintenanceEntity entity = new EquipmentMaintenanceEntity(); + entity.setPhId(codePostHandleIdMap.get(e.getUserCode())); + entity.setEquipmentId(deviceNameIds.get(e.getDeviceCode())); + entity.setEquipmentDate(e.getEquipmentDate()); + entity.setEquipmentValidityPeriod(e.getEquipmentValidityPeriod()); + entity.setMaintenanceStatus(MaintenanceStatusEnum.NORMAL.getCode().shortValue()); + saves.add(entity); + }); + boolean saved = this.saveBatch(saves); + return R.status(saved); + } + } diff --git a/blade-service/blade-desk/src/main/resources/Excel/jobTransfer/设备维护导入模板.xls b/blade-service/blade-desk/src/main/resources/Excel/jobTransfer/设备维护导入模板.xls new file mode 100644 index 0000000000000000000000000000000000000000..a49665048f6344e72f015fb6c22aeaa45d670235 GIT binary patch literal 20480 zcmeG^2UrwY(r<rGw&ga+AUYYO!N5I@j3c8cImXezMjTBEpQjD@G6QH* z74a_y(3oLl0JMAxv^0j(y`UNo6R#=|d;(tR(m zLIR}|grt+PaGl%$B}d?oe6jCp${+i3nUp5Vj-sIaNCS1l)&H?iGW$Q?tLy(*hW#JU z|4aY3HJ~RnCOjQtl+V9|A)ku*pNvNE6VBcV>;oQ^1rAao_3D538Rd~rIM7issXIdv zL%#J-DP;P*VU9R?Q zD=k+(*BfCh(IaQN5i-k_o?!ssA4q?K?)9k%rd%1=lFHfNz5N)OX#D+BA#rv%c;6jh z1(4Cvu{;Pe`aw^~IM*2f8Rs(bkWs#Aka4~<4>Hbg@*rcZ+z!DK=P+0|F*TLC#`?G3 zJbfy<@FR7Pu`y!o=(LoHDGBMKuqmU(NfbX4+|=UacQ<%JP@X+tykb0r`+p>S4&mydfw0jAA@VgDyO+T^RqtGbtGoT1wK80y53R2&!L zrX3Z2 zqO1pm+XyV6UqNKCE3|9l(x#2OA6&$Ape}6$t%we;pyXx4qQvpTnFuxz$Y6OTLvVFx z)`vSAK^ss#1S%#5iwcG2L)sHhLSjXL*j_}jj}`ezZ>91m0CpYhsGFczk&VEWIKdC9 zGV8S$F)OtfDb)xhE~JYxGY~>SURqTN1_S~F6->Q}Gx1UG0hNNY+N%RmoePdLQwpAEVzSC$l>rgZ`p2C-8lI3)Y+Gzg1U{6U zI3uRuEIDyT%mp`-!Eck1L82fCsIq?KOyjG_>BI@gokWVhTyL~L;O-(Vr-=zICoMnj zILP31yJ&v{MbU7U{Hp$=&aXOAdQiou^`i>+QiC6$1}^hkshkBSCguj_U>7<*Si)Gx zBX;!mDYS)1y`f zQ57&=H>v^}wow(ZL5-?_p{G$5FeWvs0tTf~5Km^@YJrRt` z8W2GjR!;;&vIa!Zt<@93`2Cke%EBAA4hDM-h%{^+43HWSY1lgW2bTs!8nzDpL#6?d zhOL8tv1vf0Ve7P1A_6zcahUEqo?Z=G2mj<#NTQZV!`8taHVue0Y#m$8h%{^+k!D01 zwoYr!h$vf!Jxao;-f$>nS7@VD0srJ-4Xf<1XRjotN(G^GfNt3SZT}TS+G#>W5~wT* zyZsJ8L@{=#G)Fb;JIcA@y10PoNR$+Y{*MKc3)duy5Xa`~B=4KuKs=`v1=pKHGr1{G2gMODyvXzBWb)(LJ z_Lsvq{U4elkg|;o8^xLsX?P;xrx}rkCldae5ovfL(N!}d4NoKjG$W!skzo5+AP}J) zpR<3;9A6?SQ}M9_2M(yjHYQBw_y_|oRFcIuCM;9v$QlKL0GG!(fT`kkYXoj^1GxSy z8A1S;d#qFFgh*gSrxcSZWY-UEu)Y?#S_=p`BT!R6tdaHEI_wVhHPvAcwYbaqmhg0+ zKH+&1chZ)KNC(J4lhbC1U=wMXum@zQD@{CsjYJ>*KvKoT&dYmEmT~hj4e&8ImxA8!sm zo}7Gekd?MaPn_`h^-tV<%#lw=4lh#mH(TJtg(>GFC<{Mz?-e(n7TkQe{H+ZqAEv*R zg@3rRo12dXHywA`hDLlZay~Le7OA0k&_S8-#oo8UAn~0$CjH9m%q7i@?rX$ zrxr>!l~BGWT;qHd2v&~m;WJP8laCFv%vUcF4{tcB;gY*!6^zgmcryM zbimg#Uo(U!=mm6LdYtacs&5RB31fXMMc-ASp$pIU>%xx8u(fx9)pEWe4E}P8=&@{y zCUT0jmuf(`SOL}7_%4unO8VkRuTDOY?1QQh5vU!=FFk0GFySnnM0W}od0Wt7#j1i`Tc7ipBvn1bstJcS2K35DP2fZqs+OSS+SWu@FG zZ2^#USj-!N4MD69*}8xwVqximsE9QTf-`8I!qp?LDCx$9tEMg!rYKk7n*&)a!8Hxe zXHZkPW|y@XH!&!!q10H2n?|(MiaViFnV!5vdcEx03b?0qK~n1DN(K zOdW}?98=kkI-wu&b3621CiGFR#A^wDgeA$lFd+as%a{DoU)3L* z105`3`T)}((U401hyaB@(sxWB;K4I3w1((194CBe{$dXPW)y$15`Ww-lC>i+FhiMt z>J6QuQNKIVo~X*Yz#pwu(hmIW)Ruf zgbl&17I|mFp{k359u8G(dadR3m=h{OUS@hwicz8Gr=W)e6`NjLIX&jYi4a+5SE1*x zpoha0o1T-L9&>^OZ7d<&@^w|vLo2Z9b&%6zPK02>kam`vUVwrgPJY<*JmmD46COfR zclY3;rw5PILI?RZ>GINL!Vy4^8J_gPL9qm$N0$d|+!B$+MBFD*^auJ*)*t9QS%0AK za)d)j4ueB3Ff)PQ02u2=kt8C9x2)3P%{IJ>fE*9+RpDD#o}?dKWxzXD=?si;fQ=!E z0P}!eK9Yw!p0lC%! zN)XzwkCwm;^n~En09b< z99G}+^UUfFy$cQm3EMuKaUtizrfDS?*Vvn1`tiWFfuHKb%LfE+7nvuy-1n+q@Ao9_ zl&x-2>FR=Qz4yKicD8?E-D7y+BcI6oy9dqx*2=;^uFz=p@5fJ{bo7~<-D`e+RN>T` z)G^@)y5{7j+2(F3|HGGmrBg<`>@V3(uTJX!(Bj4XrM^!th1{#wI=rvdkgl()Kd!ca zoO|eapm*P0y+edE50)&uUAz5b_eBw>>QZJ$ZwV;Nv^7Y2u`bZmxKowdDHOrS47UzMg$*=FQCh<)s#FGu#Su zL)GhDcJa>JHaCine!Tkynxfj!ao?;op9u|I02v=UNKX`x7rQZz5pl_JW5j9bAx+96 z^h-s?K~C+FVx8GXVrY}A1(drrJ3Aq7_5E^H|O?!mq4Co_GnJu&o&^N!R_bJ=FS{imKS&$%R3U1(nOY>LIDLyMa|>UD8q|I9Xba%b-@su0~Ra=z30 zwM)f_WAl)FE_Yct}kb?qPfA0+tbjdBRfITYGwkyC%svx*OQ$GK_iZwYhL{@aU< zj>a3hzAMjKz9AwjbZ(x@a_@DSBaOzId>YmNQIo)Hi%z$$o?0KfwaL0>t(~qP@Ajo{ zhah`{Z$b|qwf1ji6nMf~v?J9#?z~sIp?RoIy-~oIUu=FJtk+AA|0(>{ljK~-6|Y~{ zUNoMw|77XJWoJ$~wQw4g>hySB&q{;3wFlN!e6_o1`KWwt$5N-GnH|@a=Wf`aVcF7U zosmUMLht9_=FVT55z*3M=Hi4&i*pU`kLIr%eb;d0`gyU7F7;_Hno~H#x?)2@z?o}j zPPIB2YvoaN?(PBW{K&C`twIkD_u4kk;m(%D-4EXEvg@-oiC%lO+teFYhuUZ9WS1Hb z`YLsQruULAJ-#H&FA6#rx#acq6UBok*R7PCGQ2i7;>)BuodF+Gk}Btx+JxRbW8LrD zl;le5#qX2%R#h5qFFE2}_wuK>;+q+DI(hE-SG{i(C5+p9Bxbz!nzW3^vnS^-j+=TU z{d91*P6O@~Zd?5}eEj!CX2q4Ggv2m@$jv4@!uoFYoz?zTTz7{Vo1(28dPmNz*E{^G zMaag77Uf=cmiqbMC)b7LR2>`gO=duk3o&gw9{SS7+`)I@_=S@Lvp!v461%ZD>(jG} z?_V$Ib?;62`Qk6{UL48#{4t=u&SJOl)W<*HJ$Mvb{IP0n@$_%1-%NL`J3D8|*xvSk z>*;!<+4>*K!((Cs;_dc~@#yP5$t9J4y6YZYV_)kJso$ z<;^>`Y5f{o`yE>TPYPO1s4^_k>bk0V)f@kXUzRUCws`7{H^)+5*<33S7}a#{>G1AY zZQHXOKd!C{uUZ`++B$Q|b>W*`uR0g@jk%uac=VU(+3TazXYKH@AKhhw{#bE(aP-A1 zKlCt;dU>{{*0RgvvLnv}I!|6&H)Lc@>%ewpdQUvoI~V*BlQZFRZT5GgR($B0V{Uh7 zg4PbvEswaChIV#^*K3w$zx%3J7I|J3`N?wF7S|}pF28;BKUeVJV!(IrObcoPYUd@) zU;HKJ+J;b%zm=^pntr~*Av89`CiQTqitCOO$}^7{`)gMna@wsQ`e=8Ften3Ioh;e>z#P>)CJK53~BM_%vmG z*LHQHq>REPn?Co?n<+Wvm@;)`O6-Ec&kcUqRiAav=0WYzTf41aIf;|Dm@g{meemhZ z8xuFRZt}I?#2@YN@LVD*w@qIb$JcFPkd%~L`Ml50W&LMN{BiF+t(W#I3ttS`RM5xQ zAwOZ2& z*E%kuX4#Lw5X9I!^M7s*pV202&^DV>`io!G96#85M@Zz{O^arSZO*LEbV<%1w{O@zot5`{pYcq;Y53LD z2*)+XPb)_1Kb`bpO-(<)sFVbcg;j-vw}-wdc@#P{t@S|LD_ev|P1Xe)M(vyzv}kKZ zkXvzYtt*S>SR}t2Zam9qWsGiobx0fCUXz!HZ;du>@AvZVyqxq2dit@6v+MVG6n7pn z>}}^QQ}aSwB>qtISZ|K$xWg~HWSgw0i`q6K)N50n%>mN`1HbI%GuhIjCyUx8$i1>L_Q4^0teNL3NC_m+TY+d2q-7lN%bmj5(K7RV_ z_~1mLdC{Htrk$=%iJnuGuxfMi>mjanre6;pYr69Jk(J5!9uImae4Xw-W%D(oj28n9 zLT*)`E)V_bb6lKcTZw~PkpCZb?=!CDb=)y4tBGKa;mwP+z1rV*->M7KSdM|s@Mi9J zhhadohGEZvHL%g6IW<}^hBxWx9-;q(yVy;T{*E>)g20YsQ{fweC{0(VjnhB<{2lc6qj9LjIZYM{9F}qRjiwzwZ~nZ{&=e z6rY#P$1LsR7}3r?%F)$hby`!0-pdPaEEw=HdynttC4+vk+q|{g#S=Gr)=$dZ@MbM< z+By4Eql~BCA(kuq?3Fx zJ*M;c9pKRwb<;gSV3zXm!nt~bK_40<3HzK+hLC=lXBrCWirGrS!vYzLW^f$Qjx3w0_D1R6q;Nv&;o zq_SBMMHBB~1Bh&BuDI8NZE}%$H+ean8X*3}7v7;ZB>{X>a+vbJAb`e0?g4orc-lgSmg7k@LrZ>czBOdMvIIQwty^yBQNT^Ct9KZ z%+~`H^2X@mcykkQm`h?x2UP~*Nw;|qpBW6F{ydc+qx^3bx7(3?|WCnl9d!cNWC zG_Vmz{0e}KH=Z@AY7R(aH9^!6r?LDsB&#vnKf}Kcxa@+AJqu0J6EePB(GN22J`913 zF>NGd+`UPJjQUH3jIaJofs8vu3n63o$8Td`RKZ$UACtPX4G>12xKm2+sgWiCLNYc| z@UboT>i55-DAEqI1qvVrQ^^sI2#tn}m4-n^-gBk*2t(XnA%iG5%HJnCvR_(C{G`$8 z!IQ=&#Sapv$;C#V_K>@Ud53lL_3jqx>*dukB)FTer)TGo?xCLD0T|rT1E0{MLVkrlp Date: Mon, 19 Jan 2026 11:10:09 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CertificateMaintenanceController.java | 2 +- .../jobtransfer/controller/EquipmentMaintenanceController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateMaintenanceController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateMaintenanceController.java index 4e244c9e..4f2ee2b6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateMaintenanceController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/CertificateMaintenanceController.java @@ -180,7 +180,7 @@ public class CertificateMaintenanceController extends BladeController { @Operation(summary = "下载Excel模板", description = "") public ResponseEntity downloadExcelTemplate() { return ExcelExtUtil.downloadXlsTemplate( - "Excel/jobtransfer/证书维护导入模板.xls", + "Excel/jobTransfer/证书维护导入模板.xls", "证书维护导入模板.xls"); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/EquipmentMaintenanceController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/EquipmentMaintenanceController.java index b9a76a7d..dec12458 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/EquipmentMaintenanceController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/EquipmentMaintenanceController.java @@ -180,7 +180,7 @@ public class EquipmentMaintenanceController extends BladeController { @Operation(summary = "下载Excel模板", description = "") public ResponseEntity downloadExcelTemplate() { return ExcelExtUtil.downloadXlsTemplate( - "Excel/jobtransfer/设备维护导入模板.xls", + "Excel/jobTransfer/设备维护导入模板.xls", "设备维护导入模板.xls"); } From 85b574e3a9366bd3bbdefd4103a0e150bdb844c0 Mon Sep 17 00:00:00 2001 From: qinyulong Date: Mon, 19 Jan 2026 14:58:44 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=91=BD=E4=B8=AD=EF=BC=8C=E5=B0=81=E8=A3=85?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CertificateMaintenanceServiceImpl.java | 3 +++ .../service/impl/EquipmentMaintenanceServiceImpl.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateMaintenanceServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateMaintenanceServiceImpl.java index 4b30b14e..3b7bae96 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateMaintenanceServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/CertificateMaintenanceServiceImpl.java @@ -90,6 +90,9 @@ public class CertificateMaintenanceServiceImpl extends BaseServiceImpl values = idCodeMap.keySet(); + if (null == values || values.size() < 1) { + return R.fail("工号:" + String.join(",", codes) + "不存在。"); + } LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.in(PostHandleEntity::getUserId, values) .eq(PostHandleEntity::getStaffType, StaffTypeEnum.FORMAL.getCode().shortValue()) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java index 177350b1..aecae90b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java @@ -89,6 +89,9 @@ public class EquipmentMaintenanceServiceImpl extends BaseServiceImpl values = idCodeMap.keySet(); + if (null == values || values.size() < 1) { + return R.fail("工号:" + String.join(",", codes) + "不存在。"); + } LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.in(PostHandleEntity::getUserId, values) .eq(PostHandleEntity::getStaffType, StaffTypeEnum.FORMAL.getCode().shortValue())