diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataPageReqVO.java index 70dcea3..ff1e6a3 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataPageReqVO.java @@ -49,6 +49,9 @@ public class BusinessAssayTaskDataPageReqVO extends PageParam { @Schema(description = "分析人") private String assayOperator; + @Schema(description = "分析人ID", example = "27835") + private Long assayOperatorId; + @Schema(description = "分配任务时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] assignTaskTime; @@ -62,6 +65,9 @@ public class BusinessAssayTaskDataPageReqVO extends PageParam { @Schema(description = "上报人") private String reporter; + @Schema(description = "上报人ID", example = "15920") + private Long reporterId; + @Schema(description = "上报时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] reportTime; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataReqVO.java index c91101a..c9064d3 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataReqVO.java @@ -49,6 +49,9 @@ public class BusinessAssayTaskDataReqVO { @Schema(description = "分析人") private String assayOperator; + @Schema(description = "分析人ID", example = "27835") + private Long assayOperatorId; + @Schema(description = "分配任务时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] assignTaskTime; @@ -62,6 +65,9 @@ public class BusinessAssayTaskDataReqVO { @Schema(description = "上报人") private String reporter; + @Schema(description = "上报人ID", example = "15920") + private Long reporterId; + @Schema(description = "上报时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] reportTime; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataRespVO.java index fb3dfc9..40b3b8b 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataRespVO.java @@ -63,6 +63,10 @@ public class BusinessAssayTaskDataRespVO { @ExcelProperty("分析人") private String assayOperator; + @Schema(description = "分析人ID", example = "27835") + @ExcelProperty("分析人ID") + private Long assayOperatorId; + @Schema(description = "分配任务时间") @ExcelProperty("分配任务时间") private LocalDateTime assignTaskTime; @@ -79,6 +83,10 @@ public class BusinessAssayTaskDataRespVO { @ExcelProperty("上报人") private String reporter; + @Schema(description = "上报人ID", example = "15920") + @ExcelProperty("上报人ID") + private Long reporterId; + @Schema(description = "上报时间") @ExcelProperty("上报时间") private LocalDateTime reportTime; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataSaveReqVO.java index b825997..7e2bf4c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDataSaveReqVO.java @@ -2,9 +2,7 @@ package com.zt.plat.module.qms.business.bus.controller.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; import jakarta.validation.constraints.*; -import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; @Schema(description = "管理后台 - 子样检测任务业务新增/修改 Request VO") @@ -59,6 +57,9 @@ public class BusinessAssayTaskDataSaveReqVO { @Schema(description = "分析人") private String assayOperator; + @Schema(description = "分析人ID", example = "27835") + private Long assayOperatorId; + @Schema(description = "分配任务时间") private LocalDateTime assignTaskTime; @@ -71,6 +72,9 @@ public class BusinessAssayTaskDataSaveReqVO { @Schema(description = "上报人") private String reporter; + @Schema(description = "上报人ID", example = "15920") + private Long reporterId; + @Schema(description = "上报时间") private LocalDateTime reportTime; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java index 4e31fc1..cbdade7 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java @@ -34,6 +34,9 @@ public class BusinessAssayTaskPageReqVO extends PageParam { @Schema(description = "任务单分配人") private String taskAssignOperator; + @Schema(description = "任务单分配人ID", example = "14545") + private Long taskAssignOperatorId; + @Schema(description = "任务单分配时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] taskAssignTime; @@ -54,6 +57,9 @@ public class BusinessAssayTaskPageReqVO extends PageParam { @Schema(description = "分析人") private String assayOperator; + @Schema(description = "分析人", example = "17685") + private Long assayOperatorId; + @Schema(description = "分析时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] assayTime; @@ -75,6 +81,9 @@ public class BusinessAssayTaskPageReqVO extends PageParam { @Schema(description = "上报人") private String reportOperator; + @Schema(description = "上报人ID", example = "7393") + private Long reportOperatorId; + @Schema(description = "任务单完成时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] taskFinishTime; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskReqVO.java index 445dc92..3767ed4 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskReqVO.java @@ -33,6 +33,9 @@ public class BusinessAssayTaskReqVO { @Schema(description = "任务单分配人") private String taskAssignOperator; + @Schema(description = "任务单分配人ID", example = "14545") + private Long taskAssignOperatorId; + @Schema(description = "任务单分配时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] taskAssignTime; @@ -53,6 +56,9 @@ public class BusinessAssayTaskReqVO { @Schema(description = "分析人") private String assayOperator; + @Schema(description = "分析人", example = "17685") + private Long assayOperatorId; + @Schema(description = "分析时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] assayTime; @@ -74,6 +80,9 @@ public class BusinessAssayTaskReqVO { @Schema(description = "上报人") private String reportOperator; + @Schema(description = "上报人ID", example = "7393") + private Long reportOperatorId; + @Schema(description = "任务单完成时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] taskFinishTime; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskRespVO.java index 9bae38a..a31f6ed 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskRespVO.java @@ -42,6 +42,10 @@ public class BusinessAssayTaskRespVO { @ExcelProperty("任务单分配人") private String taskAssignOperator; + @Schema(description = "任务单分配人ID", example = "14545") + @ExcelProperty("任务单分配人ID") + private Long taskAssignOperatorId; + @Schema(description = "任务单分配时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("任务单分配时间") private LocalDateTime taskAssignTime; @@ -64,6 +68,10 @@ public class BusinessAssayTaskRespVO { @ExcelProperty("分析人") private String assayOperator; + @Schema(description = "分析人", example = "17685") + @ExcelProperty("分析人") + private Long assayOperatorId; + @Schema(description = "分析时间") @ExcelProperty("分析时间") private LocalDateTime assayTime; @@ -84,6 +92,10 @@ public class BusinessAssayTaskRespVO { @ExcelProperty("上报人") private String reportOperator; + @Schema(description = "上报人ID", example = "7393") + @ExcelProperty("上报人ID") + private Long reportOperatorId; + @Schema(description = "任务单完成时间") @ExcelProperty("任务单完成时间") private LocalDateTime taskFinishTime; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskSaveReqVO.java index aa444e5..fb95ba7 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskSaveReqVO.java @@ -40,9 +40,11 @@ public class BusinessAssayTaskSaveReqVO { private String taskSourceType; @Schema(description = "任务单分配人", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "任务单分配人不能为空") private String taskAssignOperator; + @Schema(description = "任务单分配人ID", example = "14545") + private Long taskAssignOperatorId; + @Schema(description = "任务单分配时间", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "任务单分配时间不能为空") private LocalDateTime taskAssignTime; @@ -64,6 +66,9 @@ public class BusinessAssayTaskSaveReqVO { @Schema(description = "分析人") private String assayOperator; + @Schema(description = "分析人", example = "17685") + private Long assayOperatorId; + @Schema(description = "分析时间") private LocalDateTime assayTime; @@ -79,6 +84,9 @@ public class BusinessAssayTaskSaveReqVO { @Schema(description = "上报人") private String reportOperator; + @Schema(description = "上报人ID", example = "7393") + private Long reportOperatorId; + @Schema(description = "任务单完成时间") private LocalDateTime taskFinishTime; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataPageReqVO.java index 0223ac0..89f816d 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataPageReqVO.java @@ -46,6 +46,9 @@ public class BusinessQCCoefficientDataPageReqVO extends PageParam { @Schema(description = "分析人") private String assayOperator; + @Schema(description = "分析人ID", example = "10644") + private Long assayOperatorId; + @Schema(description = "分配任务时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] assignTaskTime; @@ -59,6 +62,9 @@ public class BusinessQCCoefficientDataPageReqVO extends PageParam { @Schema(description = "上报人") private String reporter; + @Schema(description = "上报人ID", example = "2683") + private Long reporterId; + @Schema(description = "上报时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] reportTime; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataReqVO.java index cf8ca9d..4eff26e 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataReqVO.java @@ -46,6 +46,9 @@ public class BusinessQCCoefficientDataReqVO { @Schema(description = "分析人") private String assayOperator; + @Schema(description = "分析人ID", example = "10644") + private Long assayOperatorId; + @Schema(description = "分配任务时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] assignTaskTime; @@ -59,6 +62,9 @@ public class BusinessQCCoefficientDataReqVO { @Schema(description = "上报人") private String reporter; + @Schema(description = "上报人ID", example = "2683") + private Long reporterId; + @Schema(description = "上报时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] reportTime; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataRespVO.java index b0cc663..11c44f8 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataRespVO.java @@ -60,6 +60,9 @@ public class BusinessQCCoefficientDataRespVO { @ExcelProperty("分析人") private String assayOperator; + @Schema(description = "分析人ID", example = "10644") + private Long assayOperatorId; + @Schema(description = "分配任务时间") @ExcelProperty("分配任务时间") private LocalDateTime assignTaskTime; @@ -76,6 +79,9 @@ public class BusinessQCCoefficientDataRespVO { @ExcelProperty("上报人") private String reporter; + @Schema(description = "上报人ID", example = "2683") + private Long reporterId; + @Schema(description = "上报时间") @ExcelProperty("上报时间") private LocalDateTime reportTime; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataSaveReqVO.java index a02d79e..fac424c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCCoefficientDataSaveReqVO.java @@ -50,6 +50,9 @@ public class BusinessQCCoefficientDataSaveReqVO { @Schema(description = "分析人") private String assayOperator; + @Schema(description = "分析人ID", example = "10644") + private Long assayOperatorId; + @Schema(description = "分配任务时间") private LocalDateTime assignTaskTime; @@ -59,6 +62,9 @@ public class BusinessQCCoefficientDataSaveReqVO { @Schema(description = "是否已上报") private Integer isReported; + @Schema(description = "上报人ID", example = "2683") + private Long reporterId; + @Schema(description = "上报人") private String reporter; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataPageReqVO.java index f9c44bf..761f5d9 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataPageReqVO.java @@ -46,6 +46,9 @@ public class BusinessQCManagementDataPageReqVO extends PageParam { @Schema(description = "分析人") private String assayOperator; + @Schema(description = "分析人ID", example = "6498") + private Long assayOperatorId; + @Schema(description = "分配任务时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] assignTaskTime; @@ -59,6 +62,9 @@ public class BusinessQCManagementDataPageReqVO extends PageParam { @Schema(description = "上报人") private String reporter; + @Schema(description = "上报人ID", example = "17517") + private Long reporterId; + @Schema(description = "上报时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] reportTime; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataReqVO.java index 43a2f19..8ad382a 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataReqVO.java @@ -46,6 +46,9 @@ public class BusinessQCManagementDataReqVO { @Schema(description = "分析人") private String assayOperator; + @Schema(description = "分析人ID", example = "6498") + private Long assayOperatorId; + @Schema(description = "分配任务时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] assignTaskTime; @@ -59,6 +62,9 @@ public class BusinessQCManagementDataReqVO { @Schema(description = "上报人") private String reporter; + @Schema(description = "上报人ID", example = "17517") + private Long reporterId; + @Schema(description = "上报时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] reportTime; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataRespVO.java index fc265de..e7723c4 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataRespVO.java @@ -60,6 +60,9 @@ public class BusinessQCManagementDataRespVO { @ExcelProperty("分析人") private String assayOperator; + @Schema(description = "分析人ID", example = "6498") + private Long assayOperatorId; + @Schema(description = "分配任务时间") @ExcelProperty("分配任务时间") private LocalDateTime assignTaskTime; @@ -76,6 +79,9 @@ public class BusinessQCManagementDataRespVO { @ExcelProperty("上报人") private String reporter; + @Schema(description = "上报人ID", example = "17517") + private Long reporterId; + @Schema(description = "上报时间") @ExcelProperty("上报时间") private LocalDateTime reportTime; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataSaveReqVO.java index 77dc4d1..0a15599 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessQCManagementDataSaveReqVO.java @@ -51,6 +51,9 @@ public class BusinessQCManagementDataSaveReqVO { @Schema(description = "分析人") private String assayOperator; + @Schema(description = "分析人ID", example = "6498") + private Long assayOperatorId; + @Schema(description = "分配任务时间") private LocalDateTime assignTaskTime; @@ -63,6 +66,9 @@ public class BusinessQCManagementDataSaveReqVO { @Schema(description = "上报人") private String reporter; + @Schema(description = "上报人ID", example = "17517") + private Long reporterId; + @Schema(description = "上报时间") private LocalDateTime reportTime; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDO.java index 81ff2e7..c88515e 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDO.java @@ -24,7 +24,6 @@ import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; public class BusinessAssayTaskDO extends BusinessBaseDO { - /** * ID */ @@ -66,6 +65,11 @@ public class BusinessAssayTaskDO extends BusinessBaseDO { @TableField("TSK_ASN_OPTR") private String taskAssignOperator; /** + * 任务单分配人ID + */ + @TableField("TSK_ASN_OPTR_ID") + private Long taskAssignOperatorId; + /** * 任务单分配时间 */ @TableField("TSK_ASN_TM") @@ -76,8 +80,8 @@ public class BusinessAssayTaskDO extends BusinessBaseDO { @TableField("TSK_ASN_STS") private String taskAssignStatus; /** - * 任务单分配提交时间 - */ + * 任务单分配提交时间 + */ @TableField("TSK_ASN_SBM_TM") private LocalDateTime taskAssignSubmitTime; /** @@ -96,6 +100,11 @@ public class BusinessAssayTaskDO extends BusinessBaseDO { @TableField("ASY_OPTR") private String assayOperator; /** + * 分析人 + */ + @TableField("ASY_OPTR_ID") + private Long assayOperatorId; + /** * 分析时间 */ @TableField("ASY_TM") @@ -121,6 +130,11 @@ public class BusinessAssayTaskDO extends BusinessBaseDO { @TableField("RPT_OPTR") private String reportOperator; /** + * 上报人ID + */ + @TableField("RPT_OPTR_ID") + private Long reportOperatorId; + /** * 任务单完成时间 */ @TableField("TSK_FIN_TM") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDataDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDataDO.java index 6121427..3be86ec 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDataDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDataDO.java @@ -46,11 +46,6 @@ public class BusinessAssayTaskDataDO extends BusinessBaseDO { @TableField("BSN_SB_SMP_ID") private Long businessSubSampleId; /** - * 分样子样判定ID - */ - @TableField("BSN_SB_SMP_ASMT_ID") - private Long businessSubSampleAssessmentId; - /** * 检测方法配置ID */ @TableField("CFG_ASY_MTHD_ID") @@ -61,6 +56,11 @@ public class BusinessAssayTaskDataDO extends BusinessBaseDO { @TableField(value = "BSN_ASY_TSK_ID", updateStrategy = FieldStrategy.ALWAYS) private Long businessAssayTaskId; /** + * 子样判定ID + */ + @TableField("BSN_SB_SMP_ASMT_ID") + private Long businessSubSampleAssessmentId; + /** * 任务类型,【字典】【jy_sample_task_type】常规、抽查... */ @TableField("TSK_TP") @@ -91,6 +91,11 @@ public class BusinessAssayTaskDataDO extends BusinessBaseDO { @TableField(value = "ASY_OPTR", updateStrategy = FieldStrategy.ALWAYS) private String assayOperator; /** + * 分析人ID + */ + @TableField(value = "ASY_OPTR_ID", updateStrategy = FieldStrategy.ALWAYS) + private Long assayOperatorId; + /** * 分配任务时间 */ @TableField(value = "ASN_TSK_TM", updateStrategy = FieldStrategy.ALWAYS) @@ -111,6 +116,11 @@ public class BusinessAssayTaskDataDO extends BusinessBaseDO { @TableField("RPTR") private String reporter; /** + * 上报人ID + */ + @TableField("RPTR_ID") + private Long reporterId; + /** * 上报时间 */ @TableField("RPT_TM") @@ -131,7 +141,7 @@ public class BusinessAssayTaskDataDO extends BusinessBaseDO { @TableField("SMP_FLW_NDE_TM") private LocalDateTime sampleFlowNodeTime; /** - * 分析次数,复检的累加次数 + * 分析次数,值为0为分析,大于0为第几次复检 */ @TableField("ANL_CNT") private Integer analysisCount; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCCoefficientDataDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCCoefficientDataDO.java index 76e5dc6..b884247 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCCoefficientDataDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCCoefficientDataDO.java @@ -89,6 +89,11 @@ public class BusinessQCCoefficientDataDO extends BusinessBaseDO { @TableField("ASY_OPTR") private String assayOperator; /** + * 分析人ID + */ + @TableField("ASY_OPTR_ID") + private Long assayOperatorId; + /** * 分配任务时间 */ @TableField("ASN_TSK_TM") @@ -109,6 +114,11 @@ public class BusinessQCCoefficientDataDO extends BusinessBaseDO { @TableField("RPTR") private String reporter; /** + * 上报人ID + */ + @TableField("RPTR_ID") + private Long reporterId; + /** * 上报时间 */ @TableField("RPT_TM") @@ -129,4 +139,5 @@ public class BusinessQCCoefficientDataDO extends BusinessBaseDO { @TableField("RMK") private String remark; + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementDataDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementDataDO.java index 3938b80..9f3102b 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementDataDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessQCManagementDataDO.java @@ -89,6 +89,11 @@ public class BusinessQCManagementDataDO extends BusinessBaseDO { @TableField("ASY_OPTR") private String assayOperator; /** + * 分析人ID + */ + @TableField("ASY_OPTR_ID") + private Long assayOperatorId; + /** * 分配任务时间 */ @TableField("ASN_TSK_TM") @@ -109,6 +114,11 @@ public class BusinessQCManagementDataDO extends BusinessBaseDO { @TableField("RPTR") private String reporter; /** + * 上报人ID + */ + @TableField("RPTR_ID") + private Long reporterId; + /** * 上报时间 */ @TableField("RPT_TM") @@ -128,5 +138,4 @@ public class BusinessQCManagementDataDO extends BusinessBaseDO { */ @TableField("RMK") private String remark; - } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java index aec5f55..978cbb2 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.java @@ -51,19 +51,21 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX assayTaskDataIdList = sampleTaskAssignContext.getAssayTaskDataIdList(); @@ -91,12 +93,14 @@ public class SampleTaskAssignManualCmp extends NodeComponent { businessAssayTaskDO.setTaskNo(taskNo); businessAssayTaskDO.setTaskName(configAssayMethod.getName()); businessAssayTaskDO.setAssayOperator(assignAssayUser.getRealName()); + businessAssayTaskDO.setAssayOperatorId(assignAssayUser.getUserId()); businessAssayTaskDO.setConfigAssayMethodId(key); businessAssayTaskDO.setTaskSourceType(QmsCommonConstant.TASK_ASSIGN); businessAssayTaskDO.setConfigReportTemplateId(configReportTemplate.getId()); businessAssayTaskDO.setConfigReportTemplateKey(configReportTemplate.getKey()); businessAssayTaskDO.setTaskAssignOperator(loginRealname); + businessAssayTaskDO.setTaskAssignOperatorId(loginUser.getId()); businessAssayTaskDO.setTaskAssignTime(currentDateTime); businessAssayTaskDO.setTaskAssignStatus(QmsCommonConstant.IN_PROGRESS); businessAssayTaskDO.setTaskAssayStatus(QmsCommonConstant.NOT_START); @@ -116,6 +120,7 @@ public class SampleTaskAssignManualCmp extends NodeComponent { val.setIsAssignTasked(QmsCommonConstant.YES); val.setAssignTaskTime(currentDateTime); val.setAssayOperator(assignAssayUser.getRealName()); + val.setAssayOperatorId(assignAssayUser.getUserId()); val.setBusinessAssayTaskId(businessAssayTaskDO.getId()); BusinessSubSampleDO businessSubSampleDO = sampleTaskAssignContext.getBusinessSubSampleById(val.getBusinessSubSampleId()); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignMethodCmp.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignMethodCmp.java index 0b274ae..57712aa 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignMethodCmp.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignMethodCmp.java @@ -11,6 +11,7 @@ import com.yomahub.liteflow.core.NodeComponent; import cn.hutool.core.collection.CollUtil; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zt.plat.framework.security.core.LoginUser; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO; @@ -54,6 +55,7 @@ public class SampleTaskAssignMethodCmp extends NodeComponent { public void process() throws Exception { SampleTaskAssignContext sampleTaskAssignContext = this.getContextBean(SampleTaskAssignContext.class); String loginRealname = sampleTaskAssignContext.getLoginRealname(); + LoginUser loginUser = sampleTaskAssignContext.getLoginUser(); LocalDateTime currentDateTime = sampleTaskAssignContext.getCurrentDateTime(); Long assignConfigAssayMethodId = sampleTaskAssignContext.getAssignConfigAssayMethodId(); List assignAssayUserList = sampleTaskAssignContext.getAssignAssayUserList(); @@ -100,8 +102,10 @@ public class SampleTaskAssignMethodCmp extends NodeComponent { businessAssayTaskDO.setConfigReportTemplateId(configReportTemplate.getId()); businessAssayTaskDO.setConfigReportTemplateKey(configReportTemplate.getKey()); businessAssayTaskDO.setAssayOperator(assignAssayUser.getRealName()); + businessAssayTaskDO.setAssayOperatorId(assignAssayUser.getUserId()); businessAssayTaskDO.setTaskAssignOperator(loginRealname); + businessAssayTaskDO.setTaskAssignOperatorId(loginUser.getId()); businessAssayTaskDO.setTaskAssignTime(currentDateTime); businessAssayTaskDO.setTaskAssignStatus(QmsCommonConstant.IN_PROGRESS); businessAssayTaskDO.setTaskAssayStatus(QmsCommonConstant.NOT_START); @@ -120,6 +124,7 @@ public class SampleTaskAssignMethodCmp extends NodeComponent { businessAssayTaskDataDO.setIsAssignTasked(QmsCommonConstant.YES); businessAssayTaskDataDO.setAssignTaskTime(currentDateTime); businessAssayTaskDataDO.setAssayOperator(assignAssayUser.getRealName()); + businessAssayTaskDataDO.setAssayOperatorId(assignAssayUser.getUserId()); businessAssayTaskDataDO.setBusinessAssayTaskId(businessAssayTaskDO.getId()); BusinessSubSampleDO businessSubSampleDO = sampleTaskAssignContext.getBusinessSubSampleById(businessAssayTaskDataDO.getBusinessSubSampleId()); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignQCSampleCmp.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignQCSampleCmp.java index cc2f4e8..e19d749 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignQCSampleCmp.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignQCSampleCmp.java @@ -118,6 +118,7 @@ public class SampleTaskAssignQCSampleCmp extends NodeComponent { businessQCCoefficientDataDO.setAssayDepartmentId(configAssayMethodDO.getAssayDepartmentId()); businessQCCoefficientDataDO.setAssayDepartmentName(configAssayMethodDO.getAssayDepartmentName()); businessQCCoefficientDataDO.setAssayOperator(businessAssayTaskDO.getAssayOperator()); + businessQCCoefficientDataDO.setAssayOperatorId(businessAssayTaskDO.getAssayOperatorId()); businessQCCoefficientDataDO.setAssayProject(""); businessQCCoefficientDataDO.setAssignTaskTime(businessAssayTaskDO.getTaskAssignTime()); businessQCCoefficientDataDO.setIsAssignTasked(QmsCommonConstant.YES); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignSampleCmp.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignSampleCmp.java index 8fe4b6d..27ecd31 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignSampleCmp.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignSampleCmp.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.core.NodeComponent; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zt.plat.framework.security.core.LoginUser; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO; import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO; @@ -53,6 +54,7 @@ public class SampleTaskAssignSampleCmp extends NodeComponent { public void process() throws Exception { SampleTaskAssignContext sampleTaskAssignContext = this.getContextBean(SampleTaskAssignContext.class); String loginRealname = sampleTaskAssignContext.getLoginRealname(); + LoginUser loginUser = sampleTaskAssignContext.getLoginUser(); LocalDateTime currentDateTime = sampleTaskAssignContext.getCurrentDateTime(); AssignAssayUser assignAssayUser = sampleTaskAssignContext.getAssignAssayUser(); List assignSampleIdList = sampleTaskAssignContext.getAssignSampleIdList(); @@ -91,12 +93,14 @@ public class SampleTaskAssignSampleCmp extends NodeComponent { businessAssayTaskDO.setTaskNo(taskNo); businessAssayTaskDO.setTaskName(configAssayMethod.getName()); businessAssayTaskDO.setAssayOperator(assignAssayUser.getRealName()); + businessAssayTaskDO.setAssayOperatorId(assignAssayUser.getUserId()); businessAssayTaskDO.setConfigAssayMethodId(key); businessAssayTaskDO.setTaskSourceType(QmsCommonConstant.TASK_ASSIGN); businessAssayTaskDO.setConfigReportTemplateId(configReportTemplate.getId()); businessAssayTaskDO.setConfigReportTemplateKey(configReportTemplate.getKey()); businessAssayTaskDO.setTaskAssignOperator(loginRealname); + businessAssayTaskDO.setTaskAssignOperatorId(loginUser.getId()); businessAssayTaskDO.setTaskAssignTime(currentDateTime); businessAssayTaskDO.setTaskAssignStatus(QmsCommonConstant.IN_PROGRESS); businessAssayTaskDO.setTaskAssayStatus(QmsCommonConstant.NOT_START); @@ -116,6 +120,7 @@ public class SampleTaskAssignSampleCmp extends NodeComponent { val.setIsAssignTasked(QmsCommonConstant.YES); val.setAssignTaskTime(currentDateTime); val.setAssayOperator(assignAssayUser.getRealName()); + val.setAssayOperatorId(assignAssayUser.getUserId()); val.setBusinessAssayTaskId(businessAssayTaskDO.getId()); BusinessSubSampleDO businessSubSampleDO = sampleTaskAssignContext.getBusinessSubSampleById(val.getBusinessSubSampleId()); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java index fc903c0..3d6fc4b 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java @@ -437,6 +437,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic businessAssayTaskDO.setFlowStatus(QmsCommonConstant.APPROVED); businessAssayTaskDO.setReportTime(LocalDateTime.now()); businessAssayTaskDO.setReportOperator(SecurityFrameworkUtils.getLoginUserNickname()); + businessAssayTaskDO.setReportOperatorId(SecurityFrameworkUtils.getLoginUserId()); //查询分析任务明细 List businessAssayTaskDataDOList = businessAssayTaskDataMapper.selectByBusinessAssayTaskId(businessAssayTaskId); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java index e70cb1d..d837dd0 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java @@ -519,6 +519,7 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService { businessQCCoefficientDataDO.setAssayDepartmentId(configAssayMethodDO.getAssayDepartmentId()); businessQCCoefficientDataDO.setAssayDepartmentName(configAssayMethodDO.getAssayDepartmentName()); businessQCCoefficientDataDO.setAssayOperator(businessAssayTaskDO.getAssayOperator()); + businessQCCoefficientDataDO.setAssayOperatorId(businessAssayTaskDO.getAssayOperatorId()); businessQCCoefficientDataDO.setAssayProject(""); businessQCCoefficientDataDO.setAssignTaskTime(businessAssayTaskDO.getTaskAssignTime()); businessQCCoefficientDataDO.setIsAssignTasked(QmsCommonConstant.YES); @@ -562,6 +563,7 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService { businessQCManagementDataDO.setAssayDepartmentId(configAssayMethodDO.getAssayDepartmentId()); businessQCManagementDataDO.setAssayDepartmentName(configAssayMethodDO.getAssayDepartmentName()); businessQCManagementDataDO.setAssayOperator(businessAssayTaskDO.getAssayOperator()); + businessQCManagementDataDO.setAssayOperatorId(businessAssayTaskDO.getAssayOperatorId()); businessQCManagementDataDO.setAssayProject(assayProject); businessQCManagementDataDO.setAssignTaskTime(businessAssayTaskDO.getTaskAssignTime()); businessQCManagementDataDO.setIsAssignTasked(QmsCommonConstant.YES); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/service/AutoIngredientsServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/service/AutoIngredientsServiceImpl.java index 48f2685..90c6d10 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/service/AutoIngredientsServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/thirdpartyapi/service/AutoIngredientsServiceImpl.java @@ -1,11 +1,9 @@ package com.zt.plat.module.qms.thirdpartyapi.service; -import java.lang.reflect.Field; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; @@ -13,6 +11,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.alibaba.fastjson2.JSON; +import com.zt.plat.framework.common.exception.ServiceException; +import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayParameterDataExtendRespVO; import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectDataExtendRespVO; @@ -42,15 +42,19 @@ import com.zt.plat.module.qms.thirdpartyapi.controller.vo.AutoIngredientsTaskDet import com.zt.plat.module.qms.thirdpartyapi.controller.vo.AutoIngredientsTaskDetailRespVO; import com.zt.plat.module.qms.thirdpartyapi.controller.vo.AutoIngredientsTaskQueryReqVO; import com.zt.plat.module.qms.thirdpartyapi.controller.vo.AutoIngredientsTaskRespVO; +import com.zt.plat.module.system.api.user.AdminUserApi; +import com.zt.plat.module.system.api.user.dto.AdminUserRespDTO; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ReflectUtil; import jakarta.annotation.Resource; @Service public class AutoIngredientsServiceImpl implements AutoIngredientsService { + @Resource + private AdminUserApi adminUserApi; + @Resource private BusinessSubSampleMapper businessSubSampleMapper; @@ -82,7 +86,16 @@ public class AutoIngredientsServiceImpl implements AutoIngredientsService { search.setTaskAssignSubmitTime(taskAssignSubmiTimes); } List list = businessAssayTaskMapper.selectList(search); - List resultList = list.stream().map(m -> new AutoIngredientsTaskRespVO(m.getId(), m.getTaskNo(), m.getTaskAssignSubmitTime(), m.getAssayOperator(), m.getAssayOperator())).collect(Collectors.toList()); + List assayOperatorIdList = list.stream().filter(f -> f.getAssayOperatorId() != null).map(m -> m.getAssayOperatorId()).distinct().collect(Collectors.toList()); + CommonResult> userListResult = adminUserApi.getUserList(assayOperatorIdList); + if (userListResult.isError()) { + throw new ServiceException(userListResult.getCode(), userListResult.getMsg()); + } + List userList = userListResult.getData(); + List resultList = list.stream().map(m -> { + AdminUserRespDTO user = userList.stream().filter(f -> f.getId().equals(m.getAssayOperatorId())).findFirst().orElse(null); + return new AutoIngredientsTaskRespVO(m.getId(), m.getTaskNo(), m.getTaskAssignSubmitTime(), user.getUsername(), m.getAssayOperator()); + }).collect(Collectors.toList()); return resultList; } @@ -95,6 +108,9 @@ public class AutoIngredientsServiceImpl implements AutoIngredientsService { search.setBusinessAssayTaskId(taskId); List list = businessAssayTaskDataMapper.selectList(search); + //分析人员id列表 + List assayOperatorIdList = list.stream().filter(f -> f.getAssayOperatorId() != null).map(m -> m.getAssayOperatorId()).distinct().collect(Collectors.toList()); + //子样配置id列表 List configSubSampleIdList = list.stream().map(m -> m.getConfigSubSampleId()).distinct().collect(Collectors.toList()); @@ -110,7 +126,14 @@ public class AutoIngredientsServiceImpl implements AutoIngredientsService { //查询检测项目参数 List businessAssayParameterDataList = businessAssayParameterDataMapper.selectExtendByBusinessAssayProjectDataIds(businessAssayProjectDataIdList); + CommonResult> userListResult = adminUserApi.getUserList(assayOperatorIdList); + if (userListResult.isError()) { + throw new ServiceException(userListResult.getCode(), userListResult.getMsg()); + } + List userList = userListResult.getData(); List resultList = list.stream().map(m -> { + //分析人员信息 + AdminUserRespDTO user = userList.stream().filter(f -> f.getId().equals(m.getAssayOperatorId())).findFirst().orElse(null); //子样配置信息 ConfigSubSampleMethodDO configSubSampleMethodDO = configSubSampleMethodList.stream().filter(f -> f.getConfigSubSampleId().equals(m.getConfigSubSampleId())).findFirst().orElse(null); String configInfomation = configSubSampleMethodDO.getConfigInfomation(); @@ -141,7 +164,7 @@ public class AutoIngredientsServiceImpl implements AutoIngredientsService { } } autoIngredientsTaskDetailRespVO.setAssayProject(m.getAssayProject()); - autoIngredientsTaskDetailRespVO.setAssayOperator(m.getAssayOperator()); + autoIngredientsTaskDetailRespVO.setAssayOperator(user.getUsername()); autoIngredientsTaskDetailRespVO.setAssayOperatorName(m.getAssayOperator()); autoIngredientsTaskDetailRespVO.setRemark(m.getRemark());