zgty/zt-qms
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
FCL
2025-10-21 17:04:01 +08:00
parent 8e89318376 766a749d15
commit 910b997bc5
9 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

5
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDetailDO.java
View File

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

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java
View File

@@ -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));
}

1
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignManualCmp.java
View File

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

1
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignMethodCmp.java
View File

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

1
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/taskassign/SampleTaskAssignSampleCmp.java
View File

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