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

任务分配调整

Browse Source
This commit is contained in:
王兴荣
2026-03-03 14:55:51 +08:00
parent fa06a85893
commit 367cc204fa
6 changed files with 125 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsCommonConstant.java
View File

@@ -158,6 +158,9 @@ public interface QmsCommonConstant {
/** 平行 **/ /** 平行 **/
String ASSAY_TYPE_SINGLE_PARALLEL = "single_parallel"; String ASSAY_TYPE_SINGLE_PARALLEL = "single_parallel";
/** 双杯平行 **/
String ASSAY_TYPE_DOUBLE_PARALLEL = "double_parallel";
/** 配料 **/ /** 配料 **/
String ASSAY_PROJECT_USAGE_INGREDIENT = "ingredient"; String ASSAY_PROJECT_USAGE_INGREDIENT = "ingredient";

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleEntrustController.java
View File

@@ -14,14 +14,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson2.JSONObject;
import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.core.FlowExecutor;
import com.yomahub.liteflow.flow.LiteflowResponse; import com.yomahub.liteflow.flow.LiteflowResponse;
import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore; import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.liteflow.param.SampleEntrustParam; import com.zt.plat.module.qms.business.bus.liteflow.param.SampleEntrustParam;
import com.zt.plat.module.qms.business.bus.liteflow.slot.SampleEntrustContext; import com.zt.plat.module.qms.business.bus.liteflow.slot.SampleEntrustContext;
import com.zt.plat.module.qms.business.bus.service.SampleEntrustService; import com.zt.plat.module.qms.business.bus.service.SampleEntrustService;

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/param/SampleTaskAssignManualTypeParam.java
View File

@@ -13,7 +13,7 @@ import lombok.experimental.Accessors;
public class SampleTaskAssignManualTypeParam { public class SampleTaskAssignManualTypeParam {
/** 分析人员 **/ /** 分析人员 **/
private AssignAssayUser assignAssayUser; private List<AssignAssayUser> assignAssayUserList;
/** 检测任务id列表 **/ /** 检测任务id列表 **/
private List<Long> assayTaskDataIdList; private List<Long> assayTaskDataIdList;

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

@@ -57,7 +57,7 @@ public class SampleTaskAssignContextInitCmp extends NodeComponent {
if (this.getRequestData() instanceof SampleTaskAssignManualTypeParam) { if (this.getRequestData() instanceof SampleTaskAssignManualTypeParam) {
SampleTaskAssignManualTypeParam sampleTaskAssignManualParam = this.getRequestData(); SampleTaskAssignManualTypeParam sampleTaskAssignManualParam = this.getRequestData();
sampleTaskAssignContext.setSampleTaskAssignType(SampleTaskAssignTypeEnum.MANUAL_TYPE); sampleTaskAssignContext.setSampleTaskAssignType(SampleTaskAssignTypeEnum.MANUAL_TYPE);
sampleTaskAssignContext.setAssignAssayUser(sampleTaskAssignManualParam.getAssignAssayUser()); sampleTaskAssignContext.setAssignAssayUserList(sampleTaskAssignManualParam.getAssignAssayUserList());
sampleTaskAssignContext.setAssayTaskDataIdList(sampleTaskAssignManualParam.getAssayTaskDataIdList()); sampleTaskAssignContext.setAssayTaskDataIdList(sampleTaskAssignManualParam.getAssayTaskDataIdList());
} }

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

File diff suppressed because it is too large Load Diff

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleTaskAssignServiceImpl.java
View File

@@ -1345,7 +1345,7 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public LiteflowResponse manualTypeAssign(SampleTaskAssignManualTypeParam param) { public LiteflowResponse manualTypeAssign(SampleTaskAssignManualTypeParam param) {
if (param.getAssignAssayUser() == null) { if (CollUtil.isEmpty(param.getAssignAssayUserList())) {
throw new ServiceException(1_032_100_000, "无任务分配人员"); throw new ServiceException(1_032_100_000, "无任务分配人员");
} }
if (CollUtil.isEmpty(param.getAssayTaskDataIdList())) { if (CollUtil.isEmpty(param.getAssayTaskDataIdList())) {