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

任务状态修改

Browse Source
This commit is contained in:
王兴荣
2025-10-15 19:22:33 +08:00
parent 1721a201ff
commit c7a673b88a
12 changed files with 193 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@@ -4,8 +4,6 @@ import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
import com.zt.plat.module.qms.business.bus.controller.vo.*;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskExtendRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskPageReqVO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDO;
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO;
import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO;
@@ -29,17 +27,21 @@ public interface BusinessAssayTaskMapper extends BaseMapperX<BusinessAssayTaskDO
.eqIfPresent(BusinessAssayTaskDO::getTaskNo, reqVO.getTaskNo())
.likeIfPresent(BusinessAssayTaskDO::getTaskName, reqVO.getTaskName())
.eqIfPresent(BusinessAssayTaskDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
.eqIfPresent(BusinessAssayTaskDO::getTaskSourceType, reqVO.getTaskSourceType())
.eqIfPresent(BusinessAssayTaskDO::getConfigReportTemplateId, reqVO.getConfigReportTemplateId())
.eqIfPresent(BusinessAssayTaskDO::getConfigReportTemplateKey, reqVO.getConfigReportTemplateKey())
.eqIfPresent(BusinessAssayTaskDO::getTaskOperator, reqVO.getTaskOperator())
.betweenIfPresent(BusinessAssayTaskDO::getTaskOperatorTime, reqVO.getTaskOperatorTime())
.eqIfPresent(BusinessAssayTaskDO::getTaskSourceType, reqVO.getTaskSourceType())
.eqIfPresent(BusinessAssayTaskDO::getTaskAssignOperator, reqVO.getTaskAssignOperator())
.betweenIfPresent(BusinessAssayTaskDO::getTaskAssignTime, reqVO.getTaskAssignTime())
.eqIfPresent(BusinessAssayTaskDO::getTaskAssignStatus, reqVO.getTaskAssignStatus())
.betweenIfPresent(BusinessAssayTaskDO::getTaskAssignSubmitTime, reqVO.getTaskAssignSubmitTime())
.eqIfPresent(BusinessAssayTaskDO::getAssayOperator, reqVO.getAssayOperator())
.betweenIfPresent(BusinessAssayTaskDO::getAssayTime, reqVO.getAssayTime())
.betweenIfPresent(BusinessAssayTaskDO::getAssaySubmitTime, reqVO.getAssaySubmitTime())
.eqIfPresent(BusinessAssayTaskDO::getTaskAssayStatus, reqVO.getTaskAssayStatus())
.inIfPresent(BusinessAssayTaskDO::getTaskAssayStatus, reqVO.getTaskAssayStatusList())
.betweenIfPresent(BusinessAssayTaskDO::getReportTime, reqVO.getReportTime())
.eqIfPresent(BusinessAssayTaskDO::getReportOperator, reqVO.getReportOperator())
.betweenIfPresent(BusinessAssayTaskDO::getSubmitTime, reqVO.getSubmitTime())
.eqIfPresent(BusinessAssayTaskDO::getTaskStatus, reqVO.getTaskStatus())
.betweenIfPresent(BusinessAssayTaskDO::getTaskFinishTime, reqVO.getTaskFinishTime())
.eqIfPresent(BusinessAssayTaskDO::getStandardSampleId, reqVO.getStandardSampleId())
.eqIfPresent(BusinessAssayTaskDO::getStandardSampleCode, reqVO.getStandardSampleCode())
.eqIfPresent(BusinessAssayTaskDO::getStandardSampleTypeId, reqVO.getStandardSampleTypeId())

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

@@ -409,7 +409,7 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
}
sampleEntrustRegistration.setRegistrationStatus(QmsCommonConstant.SUBMIT);
sampleEntrustRegistration.setRegistrationStatus(QmsCommonConstant.SUBMITTED);
businessSampleEntrustRegistrationMapper.updateById(sampleEntrustRegistration);
if (CollUtil.isNotEmpty(sampleEntrustDetailList)) {

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

@@ -98,14 +98,18 @@ public class SampleTaskAssignMethodCmp extends NodeComponent {
businessAssayTaskDO.setId(IdWorker.getId());
businessAssayTaskDO.setTaskNo(taskNo);
businessAssayTaskDO.setTaskName(configAssayMethod.getName());
businessAssayTaskDO.setConfigAssayMethodId(assignConfigAssayMethodId);
businessAssayTaskDO.setAssayOperator(assignAssayUser.getRealName());
businessAssayTaskDO.setTaskOperator(loginRealname);
businessAssayTaskDO.setTaskOperatorTime(currentDateTime);
businessAssayTaskDO.setTaskStatus("in_progress");
businessAssayTaskDO.setConfigAssayMethodId(assignConfigAssayMethodId);
businessAssayTaskDO.setTaskSourceType(QmsCommonConstant.TASK_ASSIGN);
businessAssayTaskDO.setConfigReportTemplateId(configReportTemplate.getId());
businessAssayTaskDO.setConfigReportTemplateKey(configReportTemplate.getKey());
businessAssayTaskDO.setAssayOperator(assignAssayUser.getRealName());
businessAssayTaskDO.setTaskAssignOperator(loginRealname);
businessAssayTaskDO.setTaskAssignTime(currentDateTime);
businessAssayTaskDO.setTaskAssignStatus(QmsCommonConstant.IN_PROGRESS);
businessAssayTaskDO.setTaskAssayStatus(QmsCommonConstant.NOT_START);
businessAssayTaskDO.setFinishStatus(QmsCommonConstant.NOT_START);
businessAssayTaskDO.setFlowStatus(QmsCommonConstant.NOT_START);
BusinessAssayTaskDetailDO businessAssayTaskDetailDO = null;
for (int i = 0; i < sampleNum; i++) {

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

@@ -94,13 +94,17 @@ public class SampleTaskAssignSampleCmp extends NodeComponent {
businessAssayTaskDO.setTaskNo(taskNo);
businessAssayTaskDO.setTaskName(configAssayMethod.getName());
businessAssayTaskDO.setAssayOperator(assignAssayUser.getRealName());
businessAssayTaskDO.setTaskOperator(loginRealname);
businessAssayTaskDO.setTaskOperatorTime(currentDateTime);
businessAssayTaskDO.setConfigAssayMethodId(key);
businessAssayTaskDO.setTaskStatus("in_progress");
businessAssayTaskDO.setTaskSourceType(QmsCommonConstant.TASK_ASSIGN);
businessAssayTaskDO.setConfigReportTemplateId(configReportTemplate.getId());
businessAssayTaskDO.setConfigReportTemplateKey(configReportTemplate.getKey());
businessAssayTaskDO.setTaskAssignOperator(loginRealname);
businessAssayTaskDO.setTaskAssignTime(currentDateTime);
businessAssayTaskDO.setTaskAssignStatus(QmsCommonConstant.IN_PROGRESS);
businessAssayTaskDO.setTaskAssayStatus(QmsCommonConstant.NOT_START);
businessAssayTaskDO.setFinishStatus(QmsCommonConstant.NOT_START);
businessAssayTaskDO.setFlowStatus(QmsCommonConstant.NOT_START);
BusinessAssayTaskDetailDO businessAssayTaskDetailDO = null;
List<BusinessAssayTaskDataDO> valList = entry.getValue();

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

@@ -249,7 +249,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
BusinessAssayTaskDO businessAssayTaskDO = businessAssayTaskMapper.selectById(businessAssayTaskId);
if (QmsCommonConstant.APPROVE.equals(auditStatus)) {
businessAssayTaskDO.setFinishStatus(QmsCommonConstant.COMPLETED);
businessAssayTaskDO.setFinishStatus(QmsCommonConstant.APPROVED);
businessAssayTaskDO.setFlowStatus(QmsCommonConstant.APPROVED);
businessAssayTaskDO.setReportTime(LocalDateTime.now());
businessAssayTaskDO.setReportOperator(SecurityFrameworkUtils.getLoginUserNickname());

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

@@ -188,7 +188,7 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
BusinessAssayTaskDO businessAssayTaskDO = businessAssayTaskMapper.selectById(vo.getBusinessAssayTaskId());
businessAssayTaskDO.setFormValue(vo.getFormValue());
businessAssayTaskDO.setAssayTime(vo.getAssayTime());
businessAssayTaskDO.setTaskAssayStatus(QmsCommonConstant.SAVED);
//赋值数据集id
if (vo.getDataCollectionId() == null) {
ConfigAssayMethodDO configAssayMethodDO = configAssayMethodMapper.selectById(businessAssayTaskDO.getConfigAssayMethodId());
@@ -305,8 +305,9 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
public void submitSampleAnalysisByTaskId(Long businessAssayTaskId) {
String loginUserNickname = SecurityFrameworkUtils.getLoginUserNickname();
BusinessAssayTaskDO businessAssayTaskDO = businessAssayTaskMapper.selectById(businessAssayTaskId);
businessAssayTaskDO.setReportOperator(loginUserNickname);
businessAssayTaskDO.setReportTime(LocalDateTime.now());
businessAssayTaskDO.setTaskAssayStatus(QmsCommonConstant.SUBMITTED);
businessAssayTaskDO.setAssaySubmitTime(LocalDateTime.now());
businessAssayTaskDO.setFinishStatus(QmsCommonConstant.NOT_START);
businessAssayTaskDO.setFlowStatus(QmsCommonConstant.NOT_START);
businessAssayTaskMapper.updateById(businessAssayTaskDO);
}

Some files were not shown because too many files have changed in this diff Show More