diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDetailPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDetailPageReqVO.java index 38f7127..cd86e94 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDetailPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDetailPageReqVO.java @@ -15,6 +15,9 @@ public class BusinessAssayTaskDetailPageReqVO extends PageParam { @Schema(description = "指派单ID", example = "21102") private Long businessAssayTaskId; + + @Schema(description = "检测任务ID", example = "16505") + private Long businessAssayTaskDataId; @Schema(description = "样品id", example = "9299") private Long sampleId; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDetailReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDetailReqVO.java index 35c7f8d..1fb05aa 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDetailReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDetailReqVO.java @@ -13,6 +13,9 @@ public class BusinessAssayTaskDetailReqVO { @Schema(description = "指派单ID", example = "21102") private Long businessAssayTaskId; + + @Schema(description = "检测任务ID", example = "16505") + private Long businessAssayTaskDataId; @Schema(description = "样品id", example = "9299") private Long sampleId; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDetailRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDetailRespVO.java index 720d878..8379609 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDetailRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDetailRespVO.java @@ -19,6 +19,9 @@ public class BusinessAssayTaskDetailRespVO { @Schema(description = "指派单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21102") @ExcelProperty("指派单ID") private Long businessAssayTaskId; + + @Schema(description = "检测任务ID", example = "16505") + private Long businessAssayTaskDataId; @Schema(description = "样品id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9299") @ExcelProperty("样品id") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDetailSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDetailSaveReqVO.java index b9f32f2..b3c0b3d 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDetailSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDetailSaveReqVO.java @@ -15,6 +15,9 @@ public class BusinessAssayTaskDetailSaveReqVO { @Schema(description = "指派单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21102") @NotNull(message = "指派单ID不能为空") private Long businessAssayTaskId; + + @Schema(description = "检测任务ID", example = "16505") + private Long businessAssayTaskDataId; @Schema(description = "样品id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9299") @NotNull(message = "样品id不能为空") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDetailDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDetailDO.java index 5bcc29e..a15d76f 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDetailDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDetailDO.java @@ -37,6 +37,11 @@ public class BusinessAssayTaskDetailDO extends BusinessBaseDO { @TableField("BSN_ASY_TSK_ID") private Long businessAssayTaskId; /** + * 检测任务ID + */ + @TableField("BSN_ASY_TSK_DAT_ID") + private Long businessAssayTaskDataId; + /** * 样品id */ @TableField("SMP_ID") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java index 1695c08..804cb2c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java @@ -70,7 +70,7 @@ public interface BusinessAssayTaskMapper extends BaseMapperX() .eq(BusinessAssayTaskDO::getConfigAssayMethodId, configAssayMethodId) - .eq(BusinessAssayTaskDO::getAssayOperator, assignUser) + .eq(BusinessAssayTaskDO::getAssayOperator, assayUser) .eq(BusinessAssayTaskDO::getTaskAssignOperator, assignUser) .eq(BusinessAssayTaskDO::getTaskAssignStatus, QmsCommonConstant.IN_PROGRESS)); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignManualCmp.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignManualCmp.java index 9943871..b8ebddd 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignManualCmp.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignManualCmp.java @@ -121,6 +121,7 @@ public class SampleTaskAssignManualCmp extends NodeComponent { BusinessSubSampleDO businessSubSampleDO = sampleTaskAssignContext.getBusinessSubSampleById(val.getBusinessSubSampleId()); businessAssayTaskDetailDO = new BusinessAssayTaskDetailDO(); + businessAssayTaskDetailDO.setBusinessAssayTaskDataId(val.getId()); businessAssayTaskDetailDO.setBusinessAssayTaskId(businessAssayTaskDO.getId()); businessAssayTaskDetailDO.setTaskNo(businessAssayTaskDO.getTaskNo()); businessAssayTaskDetailDO.setSampleId(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 5a4b230..0b274ae 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 @@ -125,6 +125,7 @@ public class SampleTaskAssignMethodCmp extends NodeComponent { BusinessSubSampleDO businessSubSampleDO = sampleTaskAssignContext.getBusinessSubSampleById(businessAssayTaskDataDO.getBusinessSubSampleId()); businessAssayTaskDetailDO = new BusinessAssayTaskDetailDO(); + businessAssayTaskDetailDO.setBusinessAssayTaskDataId(businessAssayTaskDataDO.getId()); businessAssayTaskDetailDO.setBusinessAssayTaskId(businessAssayTaskDO.getId()); businessAssayTaskDetailDO.setTaskNo(businessAssayTaskDO.getTaskNo()); businessAssayTaskDetailDO.setSampleId(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/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 7ccbb4a..8fe4b6d 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 @@ -121,6 +121,7 @@ public class SampleTaskAssignSampleCmp extends NodeComponent { BusinessSubSampleDO businessSubSampleDO = sampleTaskAssignContext.getBusinessSubSampleById(val.getBusinessSubSampleId()); businessAssayTaskDetailDO = new BusinessAssayTaskDetailDO(); + businessAssayTaskDetailDO.setBusinessAssayTaskDataId(val.getId()); businessAssayTaskDetailDO.setBusinessAssayTaskId(businessAssayTaskDO.getId()); businessAssayTaskDetailDO.setTaskNo(businessAssayTaskDO.getTaskNo()); businessAssayTaskDetailDO.setSampleId(val.getBusinessSubSampleId());