Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDetailPageReqVO.java

@@ -16,6 +16,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;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDetailReqVO.java

@@ -14,6 +14,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;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDetailRespVO.java

@@ -20,6 +20,9 @@ public class BusinessAssayTaskDetailRespVO {
     @ExcelProperty("指派单ID")
     private Long businessAssayTaskId;
     
+    @Schema(description = "检测任务ID", example = "16505")
+    private Long businessAssayTaskDataId;
+
     @Schema(description = "样品id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9299")
     @ExcelProperty("样品id")
     private Long sampleId;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskDetailSaveReqVO.java

@@ -16,6 +16,9 @@ public class BusinessAssayTaskDetailSaveReqVO {
     @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不能为空")
     private Long sampleId;

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")

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<BusinessAssayTaskDO
     default BusinessAssayTaskDO selectAssignInProgressByAssayUserAndAssignUser(Long configAssayMethodId, String assayUser, String assignUser) {
     	return selectOne(new LambdaQueryWrapperX<BusinessAssayTaskDO>()
                 .eq(BusinessAssayTaskDO::getConfigAssayMethodId, configAssayMethodId)
-    			.eq(BusinessAssayTaskDO::getAssayOperator, assignUser)
+    			.eq(BusinessAssayTaskDO::getAssayOperator, assayUser)
     			.eq(BusinessAssayTaskDO::getTaskAssignOperator, assignUser)
     			.eq(BusinessAssayTaskDO::getTaskAssignStatus, QmsCommonConstant.IN_PROGRESS));
     }

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());

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());

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());