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/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/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-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-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java index 7299304e..75540a53 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java @@ -96,7 +96,7 @@ public class InspectionItem extends BaseEntity { */ public static final String COL_CODE = "CODE"; /** - * 特殊类型-[1]:测厚;[2]:测硬;[3]:尺寸; + * 特殊类型-[0]:普通;[1]:测厚;[2]:测硬;[3]:尺寸; */ public static final String COL_SPECIAL_TYPE = "SPECIAL_TYPE"; @@ -186,7 +186,7 @@ public class InspectionItem extends BaseEntity { @Schema(description = "[检验项目]编码") private String code; /** - * 特殊类型-[1]:测厚;[2]:测硬;[3]:尺寸; + * 特殊类型-[0]:普通;[1]:测厚;[2]:测硬;[3]:尺寸; */ @Schema(description = "特殊类型") private Integer specialType; 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/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 000e55cd..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 @@ -4,10 +4,12 @@ package org.springblade.desk.quality.pojo.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; +import org.springblade.desk.util.json.serializer.IntegerAllToStringSerializer; import java.io.Serial; import java.time.LocalDateTime; @@ -19,14 +21,17 @@ import java.time.LocalDateTime; * qc_review_sheet_internal QcReviewSheetInternal 热表内部审理记录表 * qc_review_sheet_internalredo QcReviewSheetInternalredo 热表内部审理记录表（返修） * qc_review_sheet_internalsj QcReviewSheetInternalsj 热表内部审理记录表（烧结） + *

+ *

+ * status 默认 -1 * * @author Tom Shuo * @since 2026-01-06 */ -@Data @TableName("QA_REVIEW_SHEET") -@Schema(description = "ReviewSheet Entity对象") +@Data @EqualsAndHashCode(callSuper = true) +@Schema(description = "ReviewSheet Entity对象") public class ReviewSheet extends BaseEntity { @Serial @@ -129,7 +134,7 @@ public class ReviewSheet extends BaseEntity { */ public static final String COL_BIZ_TYPE = "BIZ_TYPE"; /** - * 物料号 + * 物料号/零件号 */ public static final String COL_PART_CODE = "PART_CODE"; /** @@ -194,6 +199,8 @@ public class ReviewSheet extends BaseEntity { * [生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式; */ @Schema(description = "[生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式;") + @JsonSerialize(using = IntegerAllToStringSerializer.class) + // @JsonSerialize(using = ToStringSerializer.class) private Integer reviewOrderMode; /** * 名称 @@ -306,9 +313,9 @@ public class ReviewSheet extends BaseEntity { @Schema(description = "业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理;") private Integer bizType; /** - * 物料号 + * 物料号/零件号 */ - @Schema(description = "物料号") + @Schema(description = "物料号/零件号") private String partCode; /** * 批次号 @@ -349,12 +356,12 @@ public class ReviewSheet extends BaseEntity { * 总数量 */ @Schema(description = "总数量") - private Short totalNum; + private Integer totalNum; /** * 返修数量 */ @Schema(description = "返修数量") - private Short reDoNum; + private Integer reDoNum; /** * 返修原因 */ @@ -375,4 +382,34 @@ public class ReviewSheet extends BaseEntity { */ @Schema(description = "[作业中心]id") private Long wcId; + /** + * 报废数量 + */ + @Schema(description = "报废数量") + private Integer scrapNum; + /** + * 报废数量 + */ + @Schema(description = "内部审理是否通过/驳回-[1]:通过;[2]:驳回;") + private Integer selfReviewFlag; + /** + * 不良原因 + */ + @Schema(description = "不良原因") + private String poorReason; + /** + * 不良描述 + */ + @Schema(description = "不良描述") + private String poorDesc; + /** + * 复制引用[车间订单]id + */ + @Schema(description = "复制引用[车间订单]id") + private Long refWoId; + /** + * 是否已经保存-[1]:是;[0]否; + */ + @Schema(description = "是否已经保存-[1]:是;[0]否;") + private Integer hasSaved; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java index 99bd2a8c..053cc30a 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java @@ -95,6 +95,10 @@ public class WorkPlanItem extends BaseEntity { * [检验模板]id */ public static final String COL_TEMPLATE_ID = "TEMPLATE_ID"; + /** + * 特殊类型-[0]:普通;[1]:测厚;[2]:测硬;[3]:尺寸; + */ + public static final String COL_SPECIAL_TYPE = "SPECIAL_TYPE"; /** * [作业计划]id @@ -181,4 +185,9 @@ public class WorkPlanItem extends BaseEntity { */ @Schema(description = "[检验模板]id") private Long templateId; + /** + * 特殊类型-[0]:普通;[1]:测厚;[2]:测硬;[3]:尺寸; + */ + @Schema(description = "特殊类型-[0]:普通;[1]:测厚;[2]:测硬;[3]:尺寸;") + private Integer specialType; } 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..4843d8cf 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 @@ -3,12 +3,14 @@ package org.springblade.desk.quality.pojo.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springblade.desk.quality.pojo.entity.InspectionTask; import java.time.LocalDate; @Data @EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class InspectionTaskSearch extends InspectionTask { @Schema(description = "流程卡号") @@ -25,12 +27,16 @@ public class InspectionTaskSearch extends InspectionTask { private String prodIdent; @Schema(description = "需求部门") private String needDeptName; + @Schema(description = "需求[部门]id") + private String needDeptId; @Schema(description = "批次号") private String batchNo; @Schema(description = "分批号") private String poBatchNo; @Schema(description = "当前工序") private Long currentProcessId; + @Schema(description = "上个工序") + private Long frontProcessId; @Schema(description = "下个工序") private Long nextProcessId; @Schema(description = "生产数量") diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/RemindMsgSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/RemindMsgSearch.java new file mode 100644 index 00000000..119168cd --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/RemindMsgSearch.java @@ -0,0 +1,16 @@ +package org.springblade.desk.quality.pojo.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.springblade.desk.quality.pojo.entity.RemindMsg; + +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class RemindMsgSearch extends RemindMsg { + + @Schema(description = "零件名称") + private String partName; +} 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 690143ad..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 @@ -1,13 +1,27 @@ package org.springblade.desk.quality.pojo.request; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; /** - * todo: + * ERP审理 搜索 */ @Data -@EqualsAndHashCode() -public class ReviewSheetErpSearch { +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ReviewSheetErpSearch extends ReviewSheet { + @Schema(description = "责任零件") + private String dutyPart; + + private String createTimeStart; + + private String createTimeEnd; + + private String reviewTimeStart; + + private String reviewTimeEnd; } 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..05df7d9c --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/ReviewSheetHisWOSearch.java @@ -0,0 +1,15 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +/** + * 历史已完成车间订单 搜索 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ToString(callSuper = true) +public class ReviewSheetHisWOSearch { + +} 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..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 @@ -1,14 +1,43 @@ package org.springblade.desk.quality.pojo.request; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springblade.desk.quality.pojo.entity.ReviewSheet; /** - * todo: + * 生产处置单 搜索 */ @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class ReviewSheetInitSearch extends ReviewSheet { + @Schema(description = "单据编号") + private String docCode; + @Schema(description = "车间订单号") + private String woCode; + @Schema(description = "产品编号") + private String prodCode; + @Schema(description = "产品名称") + private String prodName; + @Schema(description = "产品型号名称") + private String prodTypeName; + @Schema(description = "生产标识") + private String prodIdent; + @Schema(description = "批次号") + private String batchNo; + @Schema(description = "流程卡号") + private String cardNo; + @Schema(description = "创建时间-开始") + private String createTimeStart; + @Schema(description = "创建时间-结束") + private String createTimeEnd; + @Schema(description = "审理时间-开始") + private String reviewTimeStart; + @Schema(description = "审理时间-结束") + private String reviewTimeEnd; + @Schema(description = "[外协厂商]名称") + private String oemName; } 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..889bc7aa --- /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 lombok.ToString; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; + +/** + * 返工审理 报废审理 搜索 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ReviewSheetRedoScrapSearch extends ReviewSheet { + + @Schema(description = "创建提请时间-开始") + private String createTimeStart; + @Schema(description = "创建提请时间-结束") + private String createTimeEnd; + @Schema(description = "提请人员[用户]真名") + private String createUserRealName; + @Schema(description = "审理[用户]真名") + private String reviewUserRealName; + @Schema(description = "供应商代码") + private String oemCode; + @Schema(description = "供应商名称") + private String oemName; + @Schema(description = "审理时间-开始") + private String reviewTimeStart; + @Schema(description = "审理时间-结束") + private String reviewTimeEnd; +} 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..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 @@ -1,13 +1,35 @@ package org.springblade.desk.quality.pojo.request; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; /** - * todo: + * 内部审理 搜索 */ @Data -@EqualsAndHashCode() -public class ReviewSheetSelfSearch { +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ReviewSheetSelfSearch extends ReviewSheet { + @Schema(description = "车间订单号") + private String woCode; + @Schema(description = "供应商名称") + private String oemName; + @Schema(description = "创建时间-开始") + private String createTimeStart; + @Schema(description = "创建时间-结束") + private String createTimeEnd; + @Schema(description = "审理时间-开始") + private String reviewTimeStart; + @Schema(description = "审理时间-结束") + private String reviewTimeEnd; + @Schema(description = "物料名称") + private String materialName; + @Schema(description = "需求数量") + private Long needQty; + @Schema(description = "故障原因") + private String faultReason; } 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/InspectionTaskListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java index 20f2164b..e000bf89 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 @@ -46,11 +46,11 @@ public class InspectionTaskListVO extends InspectionTask { @Schema(description = "车间订单号") private String woCode = "XXXX12345"; @Schema(description = "零件号") - private String partCode = "XXXX12345"; + private String partCode = ""; @Schema(description = "生产标识") private String prodIdent = "XXXX12345"; @Schema(description = "流程卡号") - private String cardNo = "XXXX12345"; + private String cardNo = ""; @Schema(description = "需求部门") private String needDeptName = "XXXX12345"; @Schema(description = "批次号") @@ -72,7 +72,7 @@ public class InspectionTaskListVO extends InspectionTask { @Schema(description = "生产数量") private Double poQty = 2002d; @Schema(description = "接收时间") - private LocalDateTime receiveDate = LocalDateTime.now(); + private LocalDateTime receiveDate; @Schema(description = "订单-产品号") @@ -106,5 +106,5 @@ public class InspectionTaskListVO extends InspectionTask { private String sameNo = "tank-1001"; // todo: @Schema(description = "材料") - private String material = "铜"; + private String material = "铜"; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java index e1afcb01..79744bf4 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java @@ -5,6 +5,7 @@ package org.springblade.desk.quality.pojo.vo; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springblade.desk.quality.pojo.entity.ReviewDuty; import java.io.Serial; @@ -17,6 +18,7 @@ import java.io.Serial; */ @Data @EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class ReviewDutyVO extends ReviewDuty { @Serial private static final long serialVersionUID = 1L; diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java index c683498b..4aa11a5b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java @@ -6,6 +6,7 @@ package org.springblade.desk.quality.pojo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springblade.desk.quality.pojo.entity.ReviewFault; import java.io.Serial; @@ -18,6 +19,7 @@ import java.io.Serial; */ @Data @EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class ReviewFaultVO extends ReviewFault { @Serial private static final long serialVersionUID = 1L; 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..a054dc0c --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetDetailVO.java @@ -0,0 +1,46 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; + +import java.io.Serial; +import java.util.List; + +/** + * [生产处置单] 视图实体类 detail详情 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class ReviewSheetDetailVO extends ReviewSheet { + @Serial + private static final long serialVersionUID = 1L; + + @Schema(description = "问题故障list") + private List 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/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/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..188d6ad4 --- /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; + + @Schema(description = "车间订单编码") + private String woCode; + + @Schema(description = "车间订单下拉显示信息") + private String woInfo; +} 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 93% 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..509edaa5 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; @@ -33,7 +33,7 @@ public class ReviewSheetSelfListVO extends ReviewSheet { @Schema(description = "[生产处置单]模式 名称") private String reviewOrderModeName; @Schema(description = "打回[用户]真名") - private String backUserRealName; + private String backUserRealName; @Schema(description = "审理状态 名称") private String reviewStatusName; @Schema(description = "审理[用户]真名") 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 83% 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..ce70a623 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; @@ -17,9 +17,7 @@ public class ReviewSheetScrapListVO extends ReviewSheet { @Schema(description = "审理[用户]真名") private String reviewUserRealName; @Schema(description = "打回[用户]真名") - private String backUserRealName; - @Schema(description = "车间订单号") - private String woCode; + private String backUserRealName; @Schema(description = "供应商代码") private String oemCode; @Schema(description = "供应商名称") 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/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-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-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-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/serializer/Integer0ToEmptyStringSerializer.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/serializer/Integer0ToEmptyStringSerializer.java new file mode 100644 index 00000000..1580f33d --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/serializer/Integer0ToEmptyStringSerializer.java @@ -0,0 +1,31 @@ +package org.springblade.desk.util.json.serializer; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer; + +import java.io.IOException; + +/** + * 自定义Integer序列化器：0值 或 null 序列化为空字符串，其他值正常序列化 + */ +public class Integer0ToEmptyStringSerializer extends StdScalarSerializer { + + /** + * 提供无参构造器，指定处理的类型为Integer + */ + public Integer0ToEmptyStringSerializer() { + super(Integer.class); + } + + @Override + public void serialize(Integer value, JsonGenerator gen, SerializerProvider provider) + throws IOException { + // 核心逻辑：判断值是否为null或0，是则写空字符串，否则写原数值 + if (value == null || value == 0) { + gen.writeString(""); // 0或null时返回空字符串 + } else { + gen.writeNumber(value); // 非0数值正常返回数字 + } + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/serializer/IntegerAllToStringSerializer.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/serializer/IntegerAllToStringSerializer.java new file mode 100644 index 00000000..93261566 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/util/json/serializer/IntegerAllToStringSerializer.java @@ -0,0 +1,30 @@ +package org.springblade.desk.util.json.serializer; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer; + +import java.io.IOException; + +/** + * + */ +public class IntegerAllToStringSerializer extends StdScalarSerializer { + + /** + * + */ + public IntegerAllToStringSerializer() { + super(Integer.class); + } + + @Override + public void serialize(Integer value, JsonGenerator gen, SerializerProvider provider) + throws IOException { + if (value == null || value == 0) { + gen.writeString(""); + } else { + gen.writeString("" + value); + } + } +} 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/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/constant/BaseRequest.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java index 54168a1f..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,9 @@ 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/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/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/basic/util/RoleUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/RoleUtil.java new file mode 100644 index 00000000..2366ca5c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/RoleUtil.java @@ -0,0 +1,52 @@ +package org.springblade.desk.basic.util; + +import org.apache.commons.lang3.StringUtils; +import org.springblade.core.secure.utils.AuthUtil; + +public class RoleUtil { + + /** + * @param roleAlias 角色别名 + * @return 登录用户是否有角色 + */ + public static Boolean hasRole(String roleAlias) { + if (StringUtils.isBlank(roleAlias)) { + throw new IllegalArgumentException("roleAlias参数错误"); + } + return AuthUtil.getUserRole().contains(roleAlias); + } + + /** + * + * @param roleAliasArray + * @return 登录用户是否有所有角色（逻辑与关系） + */ + public static Boolean hasAllRole(String... roleAliasArray) { + if (roleAliasArray == null || roleAliasArray.length == 0) { + throw new IllegalArgumentException("roleAliasArray参数错误"); + } + for (String roleAlias : roleAliasArray) { + if (!hasRole(roleAlias)) { + return false; + } + } + return true; + } + + /** + * + * @param roleAliasArray + * @return 登录用户是否有任意角色（逻辑或关系） + */ + public static Boolean hasAnyRole(String... roleAliasArray) { + if (roleAliasArray == null || roleAliasArray.length == 0) { + throw new IllegalArgumentException("roleAliasArray参数错误"); + } + for (String roleAlias : roleAliasArray) { + if (hasRole(roleAlias)) { + return true; + } + } + return true; + } +} 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/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; 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 deleted file mode 100644 index 8341ba92..00000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/jobTransfer/service/impl/EquipmentMaintenanceServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.springblade.desk.jobTransfer.service.impl; - -import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.excel.EquipmentMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.request.EquipmentMaintenanceQuery; -import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceListVO; -import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceVO; -import org.springblade.desk.jobTransfer.mapper.EquipmentMaintenanceMapper; -import org.springblade.desk.jobTransfer.service.IEquipmentMaintenanceService; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.mp.base.BaseServiceImpl; - -import java.util.List; - -/** - * 岗位设备维护 服务实现类 - * - * @author qyl - * @since 2026-01-08 - */ -@Service -public class EquipmentMaintenanceServiceImpl extends BaseServiceImpl implements IEquipmentMaintenanceService { - - @Override - public IPage selectEquipmentMaintenancePage(IPage page, EquipmentMaintenanceQuery equipmentMaintenanceQuery) { - return page.setRecords(baseMapper.selectEquipmentMaintenancePage(page, equipmentMaintenanceQuery)); - } - - - @Override - public List exportEquipmentMaintenance(Wrapper queryWrapper) { - List equipmentMaintenanceList = baseMapper.exportEquipmentMaintenance(queryWrapper); - //equipmentMaintenanceList.forEach(equipmentMaintenance -> { - // equipmentMaintenance.setTypeName(DictCache.getValue(DictEnum.YES_NO, EquipmentMaintenance.getType())); - //}); - return equipmentMaintenanceList; - } - - @Override - public Boolean submitList(List equipmentMaintenanceEntities) { - boolean saved = this.saveOrUpdateBatch(equipmentMaintenanceEntities); - //更新状态 - baseMapper.updateMaintenanceStatus(); - return saved; - } - - @Override - public void updateMaintenanceStatus() { - baseMapper.updateMaintenanceStatus(); - } - -} 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 90% 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 84321bfe..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 @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.controller; +package org.springblade.desk.jobtransfer.controller; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -12,33 +12,26 @@ import lombok.AllArgsConstructor; import jakarta.validation.Valid; import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceImport; -import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel; -import org.springblade.desk.jobTransfer.pojo.excel.PostHandleImport; -import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO; -import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO; -import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; -import org.springblade.system.cache.UserCache; -import org.springblade.system.pojo.entity.UserInfo; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceImport; +import org.springblade.desk.jobtransfer.pojo.request.CertificateLedgerQuery; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateLedgerVO; +import org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO; import org.springframework.beans.BeanUtils; import org.springframework.core.io.Resource; import org.springframework.http.ResponseEntity; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO; -import org.springblade.desk.jobTransfer.wrapper.CertificateMaintenanceWrapper; -import org.springblade.desk.jobTransfer.service.ICertificateMaintenanceService; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateMaintenanceVO; +import org.springblade.desk.jobtransfer.wrapper.CertificateMaintenanceWrapper; +import org.springblade.desk.jobtransfer.service.ICertificateMaintenanceService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; 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 90% 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 97b44fbf..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 @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.controller; +package org.springblade.desk.jobtransfer.controller; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; @@ -8,23 +8,21 @@ import lombok.AllArgsConstructor; import jakarta.validation.Valid; import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateTypeExcel; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateTypeExcel; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateTypeVO; -import org.springblade.desk.jobTransfer.wrapper.CertificateTypeWrapper; -import org.springblade.desk.jobTransfer.service.ICertificateTypeService; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateTypeEntity; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateTypeVO; +import org.springblade.desk.jobtransfer.wrapper.CertificateTypeWrapper; +import org.springblade.desk.jobtransfer.service.ICertificateTypeService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; import java.util.Map; import java.util.List; 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 90% 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 30bbbdf6..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 @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.controller; +package org.springblade.desk.jobtransfer.controller; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; @@ -8,34 +8,27 @@ import jakarta.annotation.PostConstruct; import lombok.AllArgsConstructor; import jakarta.validation.Valid; -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springblade.desk.jobTransfer.pojo.enums.TrainingStatusEnum; -import org.springblade.desk.jobTransfer.pojo.excel.CultivateDetailExcel; -import org.springblade.desk.jobTransfer.pojo.excel.PostHandleExcel; -import org.springblade.desk.jobTransfer.pojo.request.CultivateDetailQuery; -import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; +import org.springblade.desk.jobtransfer.pojo.enums.TrainingStatusEnum; +import org.springblade.desk.jobtransfer.pojo.excel.CultivateDetailExcel; +import org.springblade.desk.jobtransfer.pojo.request.CultivateDetailQuery; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity; -import org.springblade.desk.jobTransfer.pojo.vo.CultivateDetailVO; -import org.springblade.desk.jobTransfer.wrapper.CultivateDetailWrapper; -import org.springblade.desk.jobTransfer.service.ICultivateDetailService; +import org.springblade.desk.jobtransfer.pojo.entity.CultivateDetailEntity; +import org.springblade.desk.jobtransfer.pojo.vo.CultivateDetailVO; +import org.springblade.desk.jobtransfer.wrapper.CultivateDetailWrapper; +import org.springblade.desk.jobtransfer.service.ICultivateDetailService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; import java.util.ArrayList; import java.util.Date; -import java.util.Map; import java.util.List; import jakarta.servlet.http.HttpServletResponse; 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 82% 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 019f5f9e..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 @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.controller; +package org.springblade.desk.jobtransfer.controller; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -12,34 +12,34 @@ import lombok.AllArgsConstructor; import jakarta.validation.Valid; import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.excel.EquipmentMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.excel.EquipmentMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.request.EquipmentMaintenanceQuery; -import org.springblade.desk.jobTransfer.pojo.vo.*; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceImport; +import org.springblade.desk.jobtransfer.pojo.excel.EquipmentMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.excel.EquipmentMaintenanceImport; +import org.springblade.desk.jobtransfer.pojo.request.EquipmentMaintenanceQuery; +import org.springblade.desk.jobtransfer.pojo.vo.*; import org.springframework.beans.BeanUtils; +import org.springframework.core.io.Resource; +import org.springframework.http.ResponseEntity; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity; -import org.springblade.desk.jobTransfer.wrapper.EquipmentMaintenanceWrapper; -import org.springblade.desk.jobTransfer.service.IEquipmentMaintenanceService; +import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity; +import org.springblade.desk.jobtransfer.wrapper.EquipmentMaintenanceWrapper; +import org.springblade.desk.jobtransfer.service.IEquipmentMaintenanceService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; import java.util.ArrayList; -import java.util.Map; import java.util.List; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.web.multipart.MultipartFile; /** * 岗位设备维护 控制器 @@ -172,6 +172,35 @@ public class EquipmentMaintenanceController extends BladeController { ExcelUtil.export(response, "岗位设备维护数据" + DateUtil.time(), "岗位设备维护数据表", excels, EquipmentMaintenanceExcel.class); } + /** + * 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 10) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity 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/controller/PostHandleController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/controller/PostHandleController.java similarity index 92% 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 c96cf453..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; +package org.springblade.desk.jobtransfer.controller; -import io.micrometer.core.instrument.binder.BaseUnits; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; import io.swagger.v3.oas.annotations.media.Schema; @@ -11,35 +10,30 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import lombok.AllArgsConstructor; import jakarta.validation.Valid; -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; -import org.springblade.desk.jobTransfer.pojo.excel.PostHandleExcel; -import org.springblade.desk.jobTransfer.pojo.excel.PostHandleImport; -import org.springblade.desk.jobTransfer.pojo.request.JobTransferSave; -import org.springblade.desk.jobTransfer.pojo.request.PostHandleQuery; +import org.springblade.desk.jobtransfer.pojo.excel.PostHandleExcel; +import org.springblade.desk.jobtransfer.pojo.excel.PostHandleImport; +import org.springblade.desk.jobtransfer.pojo.request.JobTransferSave; +import org.springblade.desk.jobtransfer.pojo.request.PostHandleQuery; import org.springframework.beans.BeanUtils; import org.springframework.core.io.Resource; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity; -import org.springblade.desk.jobTransfer.pojo.vo.PostHandleVO; -import org.springblade.desk.jobTransfer.wrapper.PostHandleWrapper; -import org.springblade.desk.jobTransfer.service.IPostHandleService; +import org.springblade.desk.jobtransfer.pojo.entity.PostHandleEntity; +import org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO; +import org.springblade.desk.jobtransfer.wrapper.PostHandleWrapper; +import org.springblade.desk.jobtransfer.service.IPostHandleService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; import java.util.ArrayList; -import java.util.Map; import java.util.List; -import java.util.stream.Collectors; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; 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 88% 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 ff06551c..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 @@ -1,4 +1,4 @@ -package org.springblade.desk.jobTransfer.controller; +package org.springblade.desk.jobtransfer.controller; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -11,27 +11,22 @@ import lombok.AllArgsConstructor; import jakarta.validation.Valid; import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity; -import org.springblade.desk.jobTransfer.pojo.enums.TrainingStatusEnum; -import org.springblade.desk.jobTransfer.pojo.excel.TrainingPlanExcel; +import org.springblade.desk.jobtransfer.pojo.excel.TrainingPlanExcel; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.jobTransfer.pojo.entity.TrainingPlanEntity; -import org.springblade.desk.jobTransfer.pojo.vo.TrainingPlanVO; -import org.springblade.desk.jobTransfer.wrapper.TrainingPlanWrapper; -import org.springblade.desk.jobTransfer.service.ITrainingPlanService; +import org.springblade.desk.jobtransfer.pojo.entity.TrainingPlanEntity; +import org.springblade.desk.jobtransfer.pojo.vo.TrainingPlanVO; +import org.springblade.desk.jobtransfer.wrapper.TrainingPlanWrapper; +import org.springblade.desk.jobtransfer.service.ITrainingPlanService; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.tool.constant.BladeConstant; -import java.util.Date; import java.util.Map; import java.util.List; 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 74% 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 85ea27e8..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,10 +1,9 @@ -package org.springblade.desk.jobTransfer.mapper; +package org.springblade.desk.jobtransfer.mapper; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.excel.CertificateMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.request.CertificateLedgerQuery; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateLedgerVO; -import org.springblade.desk.jobTransfer.pojo.vo.CertificateMaintenanceVO; +import org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.excel.CertificateMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.request.CertificateLedgerQuery; +import org.springblade.desk.jobtransfer.pojo.vo.CertificateLedgerVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; 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 94% 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 fb44eea5..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 @@ -1,10 +1,10 @@ - + + type="org.springblade.desk.jobtransfer.pojo.entity.CertificateMaintenanceEntity"> @@ -23,16 +23,16 @@ - + - + - + @@ -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 79% 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 8c322867..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; +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 88% 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 e8d02765..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 @@ -1,10 +1,10 @@ - + + 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 76% 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 34b87a7d..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; +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 96% 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 ed763444..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 @@ -1,10 +1,10 @@ - + + 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 74% 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 79f59061..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,10 +1,9 @@ -package org.springblade.desk.jobTransfer.mapper; +package org.springblade.desk.jobtransfer.mapper; -import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.excel.EquipmentMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.request.EquipmentMaintenanceQuery; -import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceListVO; -import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceVO; +import org.springblade.desk.jobtransfer.pojo.entity.EquipmentMaintenanceEntity; +import org.springblade.desk.jobtransfer.pojo.excel.EquipmentMaintenanceExcel; +import org.springblade.desk.jobtransfer.pojo.request.EquipmentMaintenanceQuery; +import org.springblade.desk.jobtransfer.pojo.vo.EquipmentMaintenanceListVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; 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 94% 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 f7df004a..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 @@ -1,10 +1,10 @@ - + + 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 78% 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 ed153d93..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; +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 97% 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 d8334a6c..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 @@ -1,9 +1,9 @@ - + - + @@ -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 78% 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 74e8ad84..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; +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 90% 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 9996d23c..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 @@ -1,9 +1,9 @@ - + - + @@ -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 80% 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 dba9d2d0..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 @@ -1,12 +1,12 @@ -package org.springblade.desk.jobTransfer.service; +package org.springblade.desk.jobtransfer.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.springblade.core.tool.api.R; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.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 78% 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 e976a6dd..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; +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 79% 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 febffdc1..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 @@ -1,11 +1,11 @@ -package org.springblade.desk.jobTransfer.service; +package org.springblade.desk.jobtransfer.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.springblade.core.tool.api.R; -import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity; -import org.springblade.desk.jobTransfer.pojo.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 69% 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 6ef616a0..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,10 +1,12 @@ -package org.springblade.desk.jobTransfer.service; +package org.springblade.desk.jobtransfer.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.excel.EquipmentMaintenanceExcel; -import org.springblade.desk.jobTransfer.pojo.request.EquipmentMaintenanceQuery; -import org.springblade.desk.jobTransfer.pojo.vo.EquipmentMaintenanceListVO; +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; import org.springblade.core.mp.base.BaseService; @@ -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/IPostHandleService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/IPostHandleService.java similarity index 82% 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 fdb37701..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 @@ -1,13 +1,13 @@ -package org.springblade.desk.jobTransfer.service; +package org.springblade.desk.jobtransfer.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.springblade.core.tool.api.R; -import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity; -import org.springblade.desk.jobTransfer.pojo.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 77% 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 bd0bbacb..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,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 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 61% 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 89c27b2c..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 @@ -1,20 +1,23 @@ -package org.springblade.desk.jobTransfer.service.impl; +package org.springblade.desk.jobtransfer.service.impl; +import com.alibaba.nacos.common.utils.CollectionUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import jakarta.annotation.Resource; import org.springblade.core.tool.api.R; -import org.springblade.desk.jobTransfer.mapper.CertificateTypeMapper; -import org.springblade.desk.jobTransfer.mapper.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.mapper.CertificateMaintenanceMapper; -import org.springblade.desk.jobTransfer.service.ICertificateMaintenanceService; +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; +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; import org.springblade.system.pojo.entity.UserInfo; import org.springframework.stereotype.Service; @@ -72,6 +75,7 @@ public class CertificateMaintenanceServiceImpl extends BaseServiceImpl certificateMaintenanceImports) { //获取全部用户codes，通过code获取用户ID, Set codes = certificateMaintenanceImports.stream().map(CertificateMaintenanceImport::getUserCode) @@ -86,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()) @@ -106,8 +113,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/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 76% 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 a6bc9570..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,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.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; 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 similarity index 83% 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 4f7ad9d1..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 @@ -1,17 +1,16 @@ -package org.springblade.desk.jobTransfer.service.impl; +package org.springblade.desk.jobtransfer.service.impl; import jakarta.annotation.Resource; import org.springblade.core.tool.api.R; -import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity; -import org.springblade.desk.jobTransfer.pojo.entity.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; -import org.springframework.beans.factory.annotation.Autowired; +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; 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 new file mode 100644 index 00000000..aecae90b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/jobtransfer/service/impl/EquipmentMaintenanceServiceImpl.java @@ -0,0 +1,139 @@ +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.*; +import java.util.stream.Collectors; + +/** + * 岗位设备维护 服务实现类 + * + * @author qyl + * @since 2026-01-08 + */ +@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)); + } + + + @Override + public List exportEquipmentMaintenance(Wrapper queryWrapper) { + List equipmentMaintenanceList = baseMapper.exportEquipmentMaintenance(queryWrapper); + //equipmentMaintenanceList.forEach(equipmentMaintenance -> { + // equipmentMaintenance.setTypeName(DictCache.getValue(DictEnum.YES_NO, EquipmentMaintenance.getType())); + //}); + return equipmentMaintenanceList; + } + + @Override + public Boolean submitList(List equipmentMaintenanceEntities) { + boolean saved = this.saveOrUpdateBatch(equipmentMaintenanceEntities); + //更新状态 + baseMapper.updateMaintenanceStatus(); + return saved; + } + + @Override + public void updateMaintenanceStatus() { + baseMapper.updateMaintenanceStatus(); + } + + @Override + public R saveExcelData(List 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(); + 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()) + .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/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 93% 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 1f20fc62..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; +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.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.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.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 82% 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 f642b888..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 @@ -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.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; 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 similarity index 86% 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 49f91ec6..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 @@ -1,9 +1,9 @@ -package org.springblade.desk.jobTransfer.wrapper; +package org.springblade.desk.jobtransfer.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.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 85% 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 920d0d1c..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 @@ -1,9 +1,9 @@ -package org.springblade.desk.jobTransfer.wrapper; +package org.springblade.desk.jobtransfer.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; -import org.springblade.desk.jobTransfer.pojo.entity.CertificateTypeEntity; -import org.springblade.desk.jobTransfer.pojo.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 85% 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 39ef09f7..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 @@ -1,9 +1,9 @@ -package org.springblade.desk.jobTransfer.wrapper; +package org.springblade.desk.jobtransfer.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; -import org.springblade.desk.jobTransfer.pojo.entity.CultivateDetailEntity; -import org.springblade.desk.jobTransfer.pojo.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 86% 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 9cd1b3b9..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 @@ -1,9 +1,9 @@ -package org.springblade.desk.jobTransfer.wrapper; +package org.springblade.desk.jobtransfer.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; -import org.springblade.desk.jobTransfer.pojo.entity.EquipmentMaintenanceEntity; -import org.springblade.desk.jobTransfer.pojo.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 86% 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 3a1b5ad0..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 @@ -1,14 +1,13 @@ -package org.springblade.desk.jobTransfer.wrapper; +package org.springblade.desk.jobtransfer.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; -import org.springblade.desk.jobTransfer.pojo.entity.PostHandleEntity; -import org.springblade.desk.jobTransfer.pojo.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; 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 similarity index 84% 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 8eb00fa9..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 @@ -1,9 +1,9 @@ -package org.springblade.desk.jobTransfer.wrapper; +package org.springblade.desk.jobtransfer.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; -import org.springblade.desk.jobTransfer.pojo.entity.TrainingPlanEntity; -import org.springblade.desk.jobTransfer.pojo.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-desk/src/main/java/org/springblade/desk/quality/constant/InspectionItemConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionItemConst.java index bce93ec5..4487b3bb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionItemConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionItemConst.java @@ -2,17 +2,20 @@ package org.springblade.desk.quality.constant; public interface InspectionItemConst { - Integer SPECIAL_TYPE_0 = 0; + /** + * 常规 + */ + Integer SPECIAL_TYPE_NORMAL = 0; /** * 测厚 */ - Integer SPECIAL_TYPE_1 = 1; + Integer SPECIAL_TYPE_THICK = 1; /** * 测硬 */ - Integer SPECIAL_TYPE_2 = 2; + Integer SPECIAL_TYPE_HARD = 2; /** * 尺寸 */ - Integer SPECIAL_TYPE_3 = 3; + Integer SPECIAL_TYPE_SIZE = 3; } 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 ce9aa18a..c8a9d68a 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,33 +5,57 @@ 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 { + interface STATUS { + /** + * 初始化 + */ + Integer S_INIT = -1; /** - * 新建 + * 新建 内部 ERP 都用 */ - Integer S_NEW = 1; + Integer S_NEW = 0; /** - * 打回 + * 待审理 内部用 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_INIT = -1; /** * 让步接收 */ @@ -63,6 +87,26 @@ public interface ReviewSheetConst { } + // 一期状态 整合 +// interface SELF { +// /** +// * 编制中 +// */ +// Integer S_NEW = 1; +// /** +// * 待审理 +// */ +// Integer S_JUDGE = 2; +// /** +// * 待完成 +// */ +// Integer S_TODO = 3; +// /** +// * 已完成 +// */ +// Integer S_FINISH = 4; +// } + /** * 零件模式 */ @@ -72,7 +116,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/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index 0a1ca980..e1bfb6bd 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,25 @@ 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.basic.util.RoleUtil; +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; @@ -46,9 +54,11 @@ import java.util.Map; * 工序级的检验任务 * mes v1: rb_pr_work_check PrWorkCheck * + * ppsName:烧结包装防护 才有子件列表 * @author Tom Shuo * @since 2025-11-14 */ +@Slf4j @RestController @Data @EqualsAndHashCode(callSuper = true) @@ -60,6 +70,8 @@ public class InspectionTaskController extends BladeController { private IInspectionTaskService service; @Resource private InspectionTaskService2 service2; + @Resource + private RoleConfig roleConfig; /** * [检验任务] 详情 @@ -80,8 +92,21 @@ public class InspectionTaskController extends BladeController { @PostMapping("/listSearch") @ApiOperationSupport(order = 2) @Operation(summary = "分页", description = "传入inspectionTask") - public R> listSearch( - @Parameter(hidden = true) @RequestParam(required = false) InspectionTaskSearch search, Query query) { + public R> listSearch(@Valid @RequestBody InspectionTaskSearch search, + @RequestBody Query query) { + log.info("search = {}", search); + log.info("query = {}", query); + log.info("getUserRole = {}", AuthUtil.getUserRole()); + // 热表 烧结 检验员 数据区分。 + if (RoleUtil.hasRole(roleConfig.getRbCheckerAlias())) { + search.setFromType(InspectionTaskConst.FROM_TYPE_RB); + } + if (RoleUtil.hasRole(roleConfig.getSjCheckerAlias())) { + search.setFromType(InspectionTaskConst.FROM_TYPE_SJ); + } + if (RoleUtil.hasAllRole(roleConfig.getRbCheckerAlias(), roleConfig.getSjCheckerAlias())) { + search.setFromType(null); + } IPage pagesVO = service.listSearch(Condition.getPage(query), search); return R.data(pagesVO); } @@ -213,6 +238,7 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 101) @Operation(summary = "跳转-质量记录", description = "传入inspectionTask id") public R toQaRecord(@Parameter(hidden = true) @RequestParam Long id) { + // todo: fake url String url = "https://www.baidu.com" + "?id=" + id; return R.data(new UrlVO(url)); } @@ -221,6 +247,7 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 101) @Operation(summary = "跳转-合格证", description = "传入inspectionTask id") public R toCertificate(@Parameter(hidden = true) @RequestParam Long id) { + // todo: fake url String url = "https://www.baidu.com" + "?id=" + id; return R.data(new UrlVO(url)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java index fc1c2013..a769f8dd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java @@ -22,12 +22,14 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.BeanUtil; 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.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.RemindMsgExcel; import org.springblade.desk.quality.pojo.entity.RemindMsg; +import org.springblade.desk.quality.pojo.request.RemindMsgSearch; import org.springblade.desk.quality.pojo.vo.RemindMsgVO; import org.springblade.desk.quality.service.IRemindMsgService; import org.springblade.desk.quality.wrapper.RemindMsgWrapper; @@ -56,184 +58,186 @@ import java.util.stream.Collectors; public class RemindMsgController extends BladeController { @Resource - private IRemindMsgService service; - - /** - * [提醒信息] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入RemindMsg Obj") - public R detail(RemindMsg remindMsg) { - QueryWrapper qw = Condition.getQueryWrapper(remindMsg); - RemindMsg detail = service.getOne(qw); - RemindMsgVO detailVO = RemindMsgWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [提醒信息] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入RemindMsg Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map remindMsg, - Query query) { - QueryWrapper qw = Condition.getQueryWrapper(remindMsg, RemindMsg.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = RemindMsgWrapper.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 = "传入RemindMsg Obj") - public R> page(RemindMsgVO remindMsg, Query query) { - IPage pagesVO = service.selectRemindMsgPage( - Condition.getPage(query), remindMsg - ); - return R.data(pagesVO); - } - - /** + private IRemindMsgService service; + + /** + * [提醒信息] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入RemindMsg Obj") + public R detail(RemindMsg remindMsg) { + QueryWrapper qw = Condition.getQueryWrapper(remindMsg); + RemindMsg detail = service.getOne(qw); + RemindMsgVO detailVO = RemindMsgWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [提醒信息] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入RemindMsg Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map map, + Query query) { + RemindMsgSearch search = BeanUtil.toBean(map, RemindMsgSearch.class); + String partName = map.get("partName").toString(); + QueryWrapper qw = Condition.getQueryWrapper(map, RemindMsg.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = RemindMsgWrapper.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 = "传入RemindMsg Obj") + public R> page(RemindMsgVO remindMsg, Query query) { + IPage pagesVO = service.selectRemindMsgPage( + Condition.getPage(query), remindMsg + ); + 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 = RemindMsgWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = RemindMsgWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [提醒信息] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入RemindMsg Obj") + public R save(@Valid @RequestBody RemindMsg addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [提醒信息] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入RemindMsg Obj") - public R save(@Valid @RequestBody RemindMsg addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [提醒信息] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入RemindMsg 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 = "传入RemindMsg Obj") - public R update(@Valid @RequestBody RemindMsg updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入RemindMsg 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 = "传入RemindMsg Obj") + public R update(@Valid @RequestBody RemindMsg updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [提醒信息] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入RemindMsg List") + @Operation(summary = "修改批量", description = "传入RemindMsg List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [提醒信息] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入RemindMsg Obj") - public R submit(@Valid @RequestBody RemindMsg mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [提醒信息] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入RemindMsg Obj") + public R submit(@Valid @RequestBody RemindMsg mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [提醒信息] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入RemindMsg 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 = "传入RemindMsg") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map remindMsg, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(remindMsg, RemindMsg.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(RemindMsg::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(RemindMsgEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportRemindMsg(qw); - ExcelUtil.export(response, "[提醒信息]数据" + DateUtil.time(), - "[提醒信息]数据表", list, RemindMsgExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入RemindMsg 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 = "传入RemindMsg") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map remindMsg, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(remindMsg, RemindMsg.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(RemindMsg::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(RemindMsgEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportRemindMsg(qw); + ExcelUtil.export(response, "[提醒信息]数据" + DateUtil.time(), + "[提醒信息]数据表", list, RemindMsgExcel.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, RemindMsg.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, RemindMsg.class + ); + return R.status(service.saveBatch(importList)); + } } 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..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 @@ -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; @@ -23,34 +22,29 @@ 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.util.ExcelExtUtil; import org.springblade.desk.quality.constant.QAModuleConst; -import org.springblade.desk.quality.constant.ReviewSheetConst; import org.springblade.desk.quality.excel.ReviewSheetExcel; 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.ReviewSheetErpSearch; 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.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.request.ReviewSheetRedoScrapSearch; +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; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -84,11 +78,11 @@ 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); - service.setVOValue(detailVO); + ReviewSheetDetailVO detailVO = ReviewSheetDetailWrapper.build().entityVO(detail); + service.setDetailVOValue(detailVO); return R.data(detailVO); } @@ -118,99 +112,136 @@ 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) { - 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); - - // todo: -// pagesVO.getRecords() -// .stream() -// .peek(service::setVOValue) -// .collect(Collectors.toList()); + public R> listInit(@Valid @RequestBody ReviewSheetInitSearch search, + @RequestBody Query query) { + log.info("ReviewSheetInitSearch = {}", search); + // + +// Map demo = new HashMap(); +// if (search.getStatus() == null) { +// 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); +// for (ReviewSheetInitVO initVO : pagesVO.getRecords()) { +// // todo: fake data. +// initVO.setDocCode("" + initVO.getId()); +// } +// return R.data(pagesVO); + + IPage pagesVO = service.listInit(Condition.getPage(query), search); return R.data(pagesVO); } /** - * [生产处置单] 返工审理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) { - Map demo = new HashMap(); - demo.put("bizType", ReviewSheetConst.BizType.T_1); - 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) - .collect(Collectors.toList()); + @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); +// Integer bizType = 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); +// pagesVO.getRecords() +// .stream() +// .peek(service::setRedoScrapVOValue) +// .collect(Collectors.toList()); + IPage pagesVO = service.listReviewRedoScrap(Condition.getPage(query), search); return R.data(pagesVO); } /** - * [生产处置单] 返工审理list分页 + * [生产处置单] 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) - .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分页 */ - @PostMapping("/listSelf") + @PostMapping("/listErp") @ApiOperationSupport(order = 20) - @Operation(summary = "内部list分页", description = "传入ReviewSheet Obj") - public R> listSelf(@Parameter(hidden = true) @RequestParam(required = false) - 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); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ReviewSheetWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); + @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); +// 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() +// .stream() +// .peek(service::setErpVOValue) +// .collect(Collectors.toList()); +// return R.data(pagesVO); + IPage pagesVO = service.listErp(Condition.getPage(query), search); return R.data(pagesVO); } /** - * [生产处置单] list分页 + * SELECT + * * + * FROM + * "QA_REVIEW_SHEET" + * ORDER BY + * WO_ID ASC + * + * @param search + * @param query + * @return */ - @PostMapping("/listErp") + @PostMapping("/getHisWOList") @ApiOperationSupport(order = 20) - @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); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ReviewSheetWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); + @Operation(summary = "历史已经完成的车间订单", description = "Obj") + public R> getHisWOList(@Valid @RequestBody ReviewSheetErpSearch search, + @RequestBody Query query) { + List list = new ArrayList<>(); + 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); + } + + @GetMapping("/sameCopyFromHiWO") + @ApiOperationSupport(order = 10) + @Operation(summary = "copy相同数据到from车间订单id", description = "传入 [车间订单]id") + public R sameCopyFromHiWO(@Parameter(description = "列表id") @RequestParam Long id, + @Parameter(description = "车间订单Id") @RequestParam Long woId) { + return service.sameCopyFromHiWO(id, woId); } /** @@ -232,9 +263,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 +319,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 +339,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 +353,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") @RequestParam Integer selfReviewFlag, + @Parameter(description = "memo") @RequestParam String memo) { + return service.reviewSelf(id, selfReviewFlag, memo); } /** @@ -402,12 +430,80 @@ 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); } + + @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("21E6-575-16015_002-H13(SJ)"); + ReviewSheetRelevantPartVO vo2 = new ReviewSheetRelevantPartVO("21E6-575-13821-B1"); + ReviewSheetRelevantPartVO vo3 = new ReviewSheetRelevantPartVO("21E6-575-13635_001-H39-N"); + ReviewSheetRelevantPartVO vo4 = new ReviewSheetRelevantPartVO("21E6-575-14734-001-B1"); + ReviewSheetRelevantPartVO vo5 = new ReviewSheetRelevantPartVO("21E6-575-10381_002-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..0521ad3f 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.*, + wo.PART_CODE AS partCode, + wo.CARD_NO AS cardNo + 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/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 6681b62c..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 @@ -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.ReviewSheetVO; +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, ReviewSheetVO 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 3fbb2649..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 @@ -44,6 +44,12 @@ + + + + + + + + + + + + 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 @@ + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java index 90d3f175..c41a0474 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java @@ -105,7 +105,7 @@ public interface IInspectionTaskService extends BaseService { * @param start * @return */ - public R startNew(InspectionTaskStartNew start); + public R startNew(InspectionTaskStartNew start); public R fill(InspectionTaskDetailVO detailVO); @@ -115,5 +115,5 @@ public interface IInspectionTaskService extends BaseService { R sameResultCopy(Long sourceId, Long targetId); - Integer refreshStatusAndQty(Long id); + InspectionTask refreshStatusAndQty(Long id); } 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 64752abc..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,14 +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 org.springblade.core.mp.base.BaseService; 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.PpmReportDetailModel; -import org.springblade.desk.quality.pojo.vo.PrintChildReviewSheet; -import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; +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; @@ -32,7 +32,7 @@ public interface IReviewSheetService extends EnBaseService { * @param reviewSheet 查询参数 * @return IPage */ - IPage selectReviewSheetPage(IPage page, ReviewSheetVO reviewSheet); + IPage selectReviewSheetPage(IPage page, ReviewSheetDetailVO reviewSheet); /** * 导出数据 @@ -42,12 +42,13 @@ public interface IReviewSheetService extends EnBaseService { */ List exportReviewSheet(Wrapper queryWrapper); - /** - * VO - * - * @param vo - */ - void setVOValue(ReviewSheetVO vo); + void setDetailVOValue(ReviewSheetDetailVO vo); + + void setInitVOValue(ReviewSheetInitVO vo); + + void setRedoScrapVOValue(ReviewSheetRedoScrapVO vo); + + void setErpVOValue(ReviewSheetErpVO vo); /** *

方法名: getByTrialId

@@ -132,7 +133,17 @@ public interface IReviewSheetService extends EnBaseService { */ void deleteReviewOrder(String trialId) throws Exception; - R fill(ReviewSheetVO vo); + R fill(ReviewSheetDetailVO vo); + + R reviewSelf(Long id, Integer selfReviewFlag, String memo); + + 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/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 3744e34c..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 @@ -22,11 +22,13 @@ 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; import org.springblade.desk.quality.constant.InspectionItemConst; import org.springblade.desk.quality.constant.InspectionTaskConst; +import org.springblade.desk.quality.constant.ReviewSheetConst; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.mapper.InspectionTaskMapper; import org.springblade.desk.quality.pojo.entity.*; @@ -34,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; @@ -43,7 +44,6 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.*; -import java.util.stream.Collectors; /** * [检验任务] 服务实现类 @@ -94,7 +94,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl msgList = new ArrayList<>(); msgList.add(msg1); vo.setRemindMsgList(msgList); @@ -103,7 +103,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl startNew(InspectionTaskStartNew start) { + public R startNew(InspectionTaskStartNew start) { // todo:check工单有效性 // todo:check工序有效性 // todo:check制品有效性 + addTask(InspectionTaskConst.FROM_TYPE_RB); + addTask(InspectionTaskConst.FROM_TYPE_SJ); + // 最终返回R + return R.success("成功生成检测任务！"); + } + + public void addTask(Integer fromType) { // 新建 InspectionTask InspectionTask task = new InspectionTask(); task.setId(null); task.setStatus(InspectionTaskConst.CHECK_RESULT_TODO); + // todo: fake data + task.setWoId(2002227460172464129L); + // todo: fake data + task.setWoCode("WO-N251233302-R001"); + // todo: fake data + task.setWpId(2002227460206018562L); + // 接收时间为空 + task.setReceiveDate(null); + task.setFromType(fromType); // 新插入 Task save(task); // 查询工序用到的，所有启用的检验项目。 List itemList = null; { + // todo:实际要根据工序定义查询 itemList = itemService.getBaseMapper().selectList( new QueryWrapper() .eq(BaseCol.STATUS, BaseValue.STATE_ENABLE) @@ -175,7 +192,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl rFinal = R.success("成功生成检测任务！"); - rFinal.setData(task); - return rFinal; } @Override @@ -216,23 +230,26 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl listSearch(IPage page, InspectionTaskSearch search) { - return page.setRecords(baseMapper.listSearch(page, search)); + List listVO = baseMapper.listSearch(page, search); + for (InspectionTaskListVO oneVO : listVO) { + setListVOValue(oneVO); + } + return page.setRecords(listVO); } @Override public R getSamePlace(Long id) { - LambdaQueryWrapper qw = Wrappers.lambdaQuery(); +// LambdaQueryWrapper qw = Wrappers.lambdaQuery(); // todo: 需要生产支持 - qw.eq(InspectionTask::getId, 2010526540823642113L); - List list = baseMapper.selectList(qw); - List listVO = InspectionTaskListWrapper.build().listVO(list); - for (InspectionTaskListVO one : listVO) { - setListVOValue(one); +// qw.eq(InspectionTask::getId, 2010909559614988290L); + + LambdaQueryWrapper qw = Wrappers.lambdaQuery(InspectionTask.class) + .orderByAsc(InspectionTask::getId); + List listAll = baseMapper.selectList(qw); + List list = null; + // todo:fake + if (listAll.size() >= 2) { + list = listAll.subList(0, 2); + } + List listVO = null; + if (list != null && !list.isEmpty()) { + listVO = InspectionTaskListWrapper.build().listVO(list); + for (InspectionTaskListVO one : listVO) { + setListVOValue(one); + } } return R.data(listVO); } @SneakyThrows + @Transactional(rollbackFor = Exception.class) // todo: @Override public R sameResultCopy(Long sourceId, Long targetId) { - InspectionTask source = null; - InspectionTask target = null; - { - LambdaQueryWrapper 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); } + /** + * 刷新状态和数量。 + * + * @param id + * @return + */ @Override - public Integer refreshStatusAndQty(Long id) { + public InspectionTask refreshStatusAndQty(Long id) { InspectionTask task = getById(id); if (null == task) { throw new IllegalArgumentException("error id!"); @@ -310,8 +370,12 @@ public class InspectionTaskServiceImpl 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 3f8d9602..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 @@ -16,8 +16,13 @@ import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springblade.common.exception.BusinessException; +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.constant.BladeConstant; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BaseRequest; +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; @@ -28,13 +33,18 @@ import org.springblade.desk.quality.pojo.entity.InspectionTask; 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.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.springblade.desk.quality.service.IInspectionTaskService; import org.springblade.desk.quality.service.IReviewDutyService; import org.springblade.desk.quality.service.IReviewFaultService; import org.springblade.desk.quality.service.IReviewSheetService; import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.ISysClient; import org.springblade.system.feign.IUserClient; +import org.springblade.system.pojo.entity.UserInfo; import org.springframework.stereotype.Service; import java.time.LocalDateTime; @@ -64,10 +74,12 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl selectReviewSheetPage(IPage page, ReviewSheetVO reviewSheet) { + public IPage selectReviewSheetPage(IPage page, ReviewSheetDetailVO reviewSheet) { return page.setRecords(baseMapper.selectReviewSheetPage(page, reviewSheet)); } @@ -81,11 +93,54 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl uiR = userClient.userInfo(vo.getReviewUserId()); + if (uiR != null && uiR.isSuccess() && uiR.getData() != null) { + vo.setReviewUserRealName(uiR.getData().getUser().getRealName()); + } + } + } + + @Override + public void setErpVOValue(ReviewSheetErpVO vo) { + vo.setBase(setBaseVOValue(userClient, sysClient, dictClient, vo, "ReviewSheet-Status")); + if (IdUtil.isValid(vo.getReviewUserId())) { + R uiR = userClient.userInfo(vo.getReviewUserId()); + if (uiR != null && uiR.isSuccess() && uiR.getData() != null) { + vo.setReviewUserRealName(uiR.getData().getUser().getRealName()); + } + } + // 责任零件 + 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()); + } + /** *

方法名: getByTrialId

*

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

@@ -109,7 +164,7 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl qw = Wrappers.lambdaQuery(); qw.eq(ReviewSheet::getWcId, wcId); - qw.in(ReviewSheet::getStatus, ReviewSheetConst.ERP.S_NEW, ReviewSheetConst.ERP.S_HEAR); + qw.in(ReviewSheet::getStatus, ReviewSheetConst.STATUS.S_NEW, ReviewSheetConst.STATUS.S_HEAR); qw.orderByAsc(ReviewSheet::getRsCode); return baseMapper.selectList(qw); } @@ -121,7 +176,7 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl qw = Wrappers.lambdaQuery(); qw.eq(ReviewSheet::getWpId, wpId); - qw.eq(ReviewSheet::getStatus, ReviewSheetConst.ERP.S_HEAR); + qw.eq(ReviewSheet::getStatus, ReviewSheetConst.STATUS.S_HEAR); return baseMapper.selectOne(qw); } @@ -151,7 +206,7 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl listF = BeanUtil.copyToList(vo.getFaultList(), ReviewFault.class); + // 保存 或 更新 faultService.saveOrUpdateBatch(listF); // 关联rsId for (ReviewDutyVO voD : vo.getDutyList()) { voD.setReviewSheetId(vo.getId()); } + // 删除 if (StringUtils.isNotBlank(vo.getDutyDeleteIds())) { dutyService.deleteLogic(Func.toLongList(vo.getDutyDeleteIds())); } List listD = BeanUtil.copyToList(vo.getDutyList(), ReviewDuty.class); + // 保存 或 更新 dutyService.saveOrUpdateBatch(listD); - ReviewSheet bs = BeanUtil.copyProperties(vo, ReviewSheet.class); - // ReviewSheetVO - saveOrUpdate(bs); - return R.success(""); + // 审理单 + ReviewSheet rs = getById(vo.getId()); // 从数据库中查到 + log.info("ReviewSheet rs = {}", rs); + log.info("ReviewSheet vo = {}", vo); + BeanUtil.copyProperties(vo, rs, BaseRequest.ID); // 拷贝id之外的属性。 + // 提交类型 + Integer submitType = vo.getSubmitType(); + // 内部 + Integer bizType = vo.getBizType(); + // biz类型 + rs.setBizType(bizType); + if ( + ReviewSheetConst.BizType.T_SELF_REDO.equals(rs.getBizType()) || + ReviewSheetConst.BizType.T_SELF_SCRAP.equals(rs.getBizType()) + ) { + if (ReviewSheetConst.SUBMIT_TYPE.T_SELF.equals(submitType)) { // 内部提交 + // 当前状态 + rs.setStatus(ReviewSheetConst.STATUS.S_JUDGE); + // 审核状态 内部用不到 + rs.setReviewStatus(ReviewSheetConst.ERP_REVIEW_S.REVIEW_STATUS_INIT); + } + } + // ERP + if (ReviewSheetConst.BizType.T_ERP.equals(rs.getBizType())) { + if (ReviewSheetConst.SUBMIT_TYPE.T_ERP_TEMP.equals(submitType)) { // 暂存 + // 当前状态 + rs.setStatus(ReviewSheetConst.STATUS.S_NEW); + // 审核状态 + rs.setReviewStatus(ReviewSheetConst.ERP_REVIEW_S.REVIEW_STATUS_INIT); + } + if (ReviewSheetConst.SUBMIT_TYPE.T_ERP_QA.equals(submitType) || + ReviewSheetConst.SUBMIT_TYPE.T_ERP_CRAFT.equals(submitType) || + ReviewSheetConst.SUBMIT_TYPE.T_ERP_DES.equals(submitType) || + ReviewSheetConst.SUBMIT_TYPE.T_ERP_DES_CHANGE.equals(submitType)) { // 外部提交 + // 当前状态 + rs.setStatus(ReviewSheetConst.STATUS.S_HEAR); + // 审核状态 + rs.setReviewStatus(ReviewSheetConst.ERP_REVIEW_S.REVIEW_STATUS_INIT); + } + } + // 保存标记位 + rs.setHasSaved(BaseValue.YES); + // 处置单 + saveOrUpdate(rs); + return R.success("成功"); + } + + @Override + public R reviewSelf(Long id, Integer selfReviewFlag, String memo) { + // 参数校验 + if (!ReviewSheetConst.SELF_REVIEW_FLAG.YES.equals(selfReviewFlag) && + !ReviewSheetConst.SELF_REVIEW_FLAG.NO.equals(selfReviewFlag)) { + return R.fail("selfReviewFlag value error"); + } + ReviewSheet rs = getById(id); + rs.setSelfReviewFlag(selfReviewFlag); + rs.setMemo(memo); + // 修改状态， 内部审理没有审理状态概念。 + rs.setStatus(ReviewSheetConst.STATUS.S_COMPLETE); + BladeUser bu = AuthUtil.getUser(); + log.info("ReviewSheet bu = {}", bu); + if (bu != null) { + // 赋值 审理[用户]id + rs.setReviewUserId(bu.getUserId()); + } + // 审理时间 + rs.setReviewDate(LocalDateTime.now()); + updateById(rs); + Integer bizType = rs.getBizType(); + if (ReviewSheetConst.BizType.T_SELF_REDO.equals(bizType)) { // 返工 todo + + } else if (ReviewSheetConst.BizType.T_SELF_SCRAP.equals(bizType)) { // 报废 todo + + } + return R.success(); + } + + @Override + public R sameCopyFromHiWO(Long id, Long woId) { + // todo: + // todo: + // 找到的历史审理单 + ReviewSheet rsS = getOneByWoId(woId); + if (rsS == null) { + return R.fail("找不到对应历史数据！"); + } + // 目标 + ReviewSheet rsT = getById(id); + if (rsT == null) { + return R.fail(""); + } + // + faultService.deleteByReviewSheetId(rsT.getId()); + dutyService.deleteByReviewSheetId(rsS.getId()); + // 问题故障 list + List listF = faultService.listByReviewSheetId(rsS.getId()); + for (ReviewFault oneF : listF) { + oneF.setId(null); + oneF.setReviewSheetId(rsT.getId()); + faultService.saveOrUpdate(oneF); + } + // 责任零件 list + 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); + // 目标生产处置单 字段处理 + // 当前状态 + rsT.setStatus(ReviewSheetConst.STATUS.S_INIT); + rsT.setWoCode(""); + rsT.setWoId(null); + // 审理状态 + rsT.setReviewStatus(ReviewSheetConst.ERP_REVIEW_S.REVIEW_STATUS_INIT); + // 引用的 车间订单id + rsT.setRefWoId(woId); + return R.status(updateById(rsT)); + } + + @Override + public ReviewSheet getOneByWoId(Long woId) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(); + qw.eq(ReviewSheet::getWoId, woId); + qw.eq(ReviewSheet::getIsDeleted, BladeConstant.DB_NOT_DELETED); + return baseMapper.selectOne(qw); + } + + @Override + public IPage 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(); qw.eq(ReviewSheet::getRsCode, rsCode); + qw.eq(ReviewSheet::getIsDeleted, BladeConstant.DB_NOT_DELETED); qw.orderByDesc(ReviewSheet::getId); return baseMapper.selectOne(qw); } 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 { +public class ReviewSheetDetailWrapper extends BaseEntityWrapper { - public static ReviewSheetErpListWrapper build() { - return new ReviewSheetErpListWrapper(); + public static ReviewSheetDetailWrapper build() { + return new ReviewSheetDetailWrapper(); } @Override - public ReviewSheetErpListVO entityVO(ReviewSheet reviewSheet) { - ReviewSheetErpListVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetErpListVO.class)); + public ReviewSheetDetailVO entityVO(ReviewSheet reviewSheet) { + ReviewSheetDetailVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetDetailVO.class)); //User createUser = UserCache.getUser(reviewSheet.getCreateUser()); //User updateUser = UserCache.getUser(reviewSheet.getUpdateUser()); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetErpWrapper.java similarity index 61% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetWrapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetErpWrapper.java index 44932661..4cea4875 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetErpWrapper.java @@ -6,7 +6,7 @@ package org.springblade.desk.quality.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.desk.quality.pojo.entity.ReviewSheet; -import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; +import org.springblade.desk.quality.pojo.vo.ReviewSheetErpVO; import java.util.Objects; @@ -16,15 +16,15 @@ import java.util.Objects; * @author Tom Shuo * @since 2026-01-06 */ -public class ReviewSheetWrapper extends BaseEntityWrapper { +public class ReviewSheetErpWrapper extends BaseEntityWrapper { - public static ReviewSheetWrapper build() { - return new ReviewSheetWrapper(); + public static ReviewSheetErpWrapper build() { + return new ReviewSheetErpWrapper(); } @Override - public ReviewSheetVO entityVO(ReviewSheet reviewSheet) { - ReviewSheetVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetVO.class)); + public ReviewSheetErpVO entityVO(ReviewSheet reviewSheet) { + ReviewSheetErpVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetErpVO.class)); //User createUser = UserCache.getUser(reviewSheet.getCreateUser()); //User updateUser = UserCache.getUser(reviewSheet.getUpdateUser()); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetInitListWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetInitWrapper.java similarity index 56% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetInitListWrapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetInitWrapper.java index 5811050a..39616d6b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetInitListWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetInitWrapper.java @@ -6,8 +6,7 @@ package org.springblade.desk.quality.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.desk.quality.pojo.entity.ReviewSheet; -import org.springblade.desk.quality.pojo.vo.ReviewSheetInitListVO; -import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; +import org.springblade.desk.quality.pojo.vo.ReviewSheetInitVO; import java.util.Objects; @@ -17,15 +16,15 @@ import java.util.Objects; * @author Tom Shuo * @since 2026-01-06 */ -public class ReviewSheetInitListWrapper extends BaseEntityWrapper { +public class ReviewSheetInitWrapper extends BaseEntityWrapper { - public static ReviewSheetInitListWrapper build() { - return new ReviewSheetInitListWrapper(); + public static ReviewSheetInitWrapper build() { + return new ReviewSheetInitWrapper(); } @Override - public ReviewSheetInitListVO entityVO(ReviewSheet reviewSheet) { - ReviewSheetInitListVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetInitListVO.class)); + public ReviewSheetInitVO entityVO(ReviewSheet reviewSheet) { + ReviewSheetInitVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetInitVO.class)); //User createUser = UserCache.getUser(reviewSheet.getCreateUser()); //User updateUser = UserCache.getUser(reviewSheet.getUpdateUser()); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetSelfListWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetRedoScrapWrapper.java similarity index 56% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetSelfListWrapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetRedoScrapWrapper.java index bd14a938..d2dc7290 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetSelfListWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetRedoScrapWrapper.java @@ -6,8 +6,7 @@ package org.springblade.desk.quality.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.desk.quality.pojo.entity.ReviewSheet; -import org.springblade.desk.quality.pojo.vo.ReviewSheetScrapListVO; -import org.springblade.desk.quality.pojo.vo.ReviewSheetSelfListVO; +import org.springblade.desk.quality.pojo.vo.ReviewSheetRedoScrapVO; import java.util.Objects; @@ -17,15 +16,15 @@ import java.util.Objects; * @author Tom Shuo * @since 2026-01-06 */ -public class ReviewSheetSelfListWrapper extends BaseEntityWrapper { +public class ReviewSheetRedoScrapWrapper extends BaseEntityWrapper { - public static ReviewSheetSelfListWrapper build() { - return new ReviewSheetSelfListWrapper(); + public static ReviewSheetRedoScrapWrapper build() { + return new ReviewSheetRedoScrapWrapper(); } @Override - public ReviewSheetSelfListVO entityVO(ReviewSheet reviewSheet) { - ReviewSheetSelfListVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetSelfListVO.class)); + public ReviewSheetRedoScrapVO entityVO(ReviewSheet reviewSheet) { + ReviewSheetRedoScrapVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetRedoScrapVO.class)); //User createUser = UserCache.getUser(reviewSheet.getCreateUser()); //User updateUser = UserCache.getUser(reviewSheet.getUpdateUser()); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetScrapListWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetScrapListWrapper.java deleted file mode 100644 index 6070b494..00000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetScrapListWrapper.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.quality.wrapper; - -import org.springblade.core.mp.support.BaseEntityWrapper; -import org.springblade.core.tool.utils.BeanUtil; -import org.springblade.desk.quality.pojo.entity.ReviewSheet; -import org.springblade.desk.quality.pojo.vo.ReviewSheetRedoListVO; -import org.springblade.desk.quality.pojo.vo.ReviewSheetScrapListVO; - -import java.util.Objects; - -/** - * [生产处置单] 包装类,返回视图层所需的字段 - * - * @author Tom Shuo - * @since 2026-01-06 - */ -public class ReviewSheetScrapListWrapper extends BaseEntityWrapper { - - public static ReviewSheetScrapListWrapper build() { - return new ReviewSheetScrapListWrapper(); - } - - @Override - public ReviewSheetScrapListVO entityVO(ReviewSheet reviewSheet) { - ReviewSheetScrapListVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetScrapListVO.class)); - - //User createUser = UserCache.getUser(reviewSheet.getCreateUser()); - //User updateUser = UserCache.getUser(reviewSheet.getUpdateUser()); - //reviewSheetVO.setCreateUserName(createUser.getName()); - //reviewSheetVO.setUpdateUserName(updateUser.getName()); - - return VO; - } -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetRedoListWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetSelfWrapper.java similarity index 56% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetRedoListWrapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetSelfWrapper.java index a16f05d6..601ec760 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetRedoListWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetSelfWrapper.java @@ -6,8 +6,7 @@ package org.springblade.desk.quality.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.desk.quality.pojo.entity.ReviewSheet; -import org.springblade.desk.quality.pojo.vo.ReviewSheetErpListVO; -import org.springblade.desk.quality.pojo.vo.ReviewSheetRedoListVO; +import org.springblade.desk.quality.pojo.vo.ReviewSheetSelfVO; import java.util.Objects; @@ -17,15 +16,15 @@ import java.util.Objects; * @author Tom Shuo * @since 2026-01-06 */ -public class ReviewSheetRedoListWrapper extends BaseEntityWrapper { +public class ReviewSheetSelfWrapper extends BaseEntityWrapper { - public static ReviewSheetRedoListWrapper build() { - return new ReviewSheetRedoListWrapper(); + public static ReviewSheetSelfWrapper build() { + return new ReviewSheetSelfWrapper(); } @Override - public ReviewSheetRedoListVO entityVO(ReviewSheet reviewSheet) { - ReviewSheetRedoListVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetRedoListVO.class)); + public ReviewSheetSelfVO entityVO(ReviewSheet reviewSheet) { + ReviewSheetSelfVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetSelfVO.class)); //User createUser = UserCache.getUser(reviewSheet.getCreateUser()); //User updateUser = UserCache.getUser(reviewSheet.getUpdateUser()); 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 af6fc61b..335e4a9b 100644 Binary files a/blade-service/blade-desk/src/main/resources/Excel/jobTransfer/岗位处理导入模板下载.xls and b/blade-service/blade-desk/src/main/resources/Excel/jobTransfer/岗位处理导入模板下载.xls differ 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 00000000..a4966504 Binary files /dev/null and b/blade-service/blade-desk/src/main/resources/Excel/jobTransfer/设备维护导入模板.xls differ 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 5cd5f217..da162ac7 100644 Binary files a/blade-service/blade-desk/src/main/resources/Excel/jobTransfer/证书维护导入模板.xls and b/blade-service/blade-desk/src/main/resources/Excel/jobTransfer/证书维护导入模板.xls differ diff --git a/blade-service/blade-desk/src/main/resources/application-dev.yml b/blade-service/blade-desk/src/main/resources/application-dev.yml index defff7f1..dd9852ab 100644 --- a/blade-service/blade-desk/src/main/resources/application-dev.yml +++ b/blade-service/blade-desk/src/main/resources/application-dev.yml @@ -23,17 +23,25 @@ business: #角色配置 role-config: - #工艺员角色id + #工艺员[角色]id process-engineer-id: "1993624442365915137" # 49 tencent cloud #process-engineer-id: "2004331529923555330" - #工艺员角色alias + #工艺员[角色]alias process-engineer-alias: "process_engineer" + #热表检验员[角色]id + rb-checker-id: "2011703987044114434" + #热表检验员[角色]alias + rb-checker-alias: "sj_checker" + #烧结检验员[角色]id + sj-checker-id: "2011704109077389313" + #烧结检验员[角色]alias + sj-checker-alias: "rb_checker" request: measuringTool: #量具使用记录 - url: "http://203.15.10.153:80300" + url: "192.168.191.11:8888" lims: #计量记录 url: "http://192.168.169.50:30000" 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; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml index 9f825fac..85693fd3 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml @@ -13,6 +13,7 @@ +