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/admin/TestController.java

@@ -46,20 +46,22 @@ public class TestController {
     	bzr.setNodeKey("flw_team_receive");
     	bzr.setSort(3300);
 
-    	SampleFlowNode ypbm = new SampleFlowNode();
+//    	SampleFlowNode ypbm = new SampleFlowNode();
-    	ypbm.setNodeName("样品编密");
+//    	ypbm.setNodeName("样品编密");
-    	ypbm.setNodeKey("flw_sample_encrypt");
+//    	ypbm.setNodeKey("flw_sample_encrypt");
-    	ypbm.setSort(3400);
+//    	ypbm.setSort(3400);
 
 //    	SampleFlowNode fxr = new SampleFlowNode();
 //    	fxr.setNodeName("分析收样");
 //    	fxr.setNodeKey("flw_analysis_receive");
 //    	fxr.setSort(3500);
 //
-    	SampleFlowNode fx = new SampleFlowNode();
+    	
-    	fx.setNodeName("样品分析");
+//    	SampleFlowNode fx = new SampleFlowNode();
-    	fx.setNodeKey("flw_analysis");
+//    	fx.setNodeName("样品分析");
-    	fx.setSort(3550);
+//    	fx.setNodeKey("flw_analysis");
+//    	fx.setSort(3550);
+    	
 //
 //    	SampleFlowNode fxs = new SampleFlowNode();
 //    	fxs.setNodeName("分析送样");
@@ -101,19 +103,20 @@ public class TestController {
 			private static final long serialVersionUID = 6376704859477839016L;
 
 		{
-    		add(BeanUtils.toBean(ypbm,SampleFlowNode.class).setCondition("subSampleEncrypt"));//样品需要编密并且没编密过
+    		add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true));//
-    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setCondition("subSampleNotEncrypt"));//样品无需编密或样品已编密过
+//    		add(BeanUtils.toBean(ypbm,SampleFlowNode.class).setCondition("subSampleEncrypt"));//样品需要编密并且没编密过
+//    		add(BeanUtils.toBean(bzs,SampleFlowNode.class).setCondition("subSampleNotEncrypt"));//样品无需编密或样品已编密过
     	}});
     	flowNodeList.add(bzr);
     	
 
-    	ypbm.setNextFlowNodeList(new ArrayList<>() {
+//    	ypbm.setNextFlowNodeList(new ArrayList<>() {
-			private static final long serialVersionUID = 1014984817516902869L;
+//			private static final long serialVersionUID = 1014984817516902869L;
-
+//
-		{
+//		{
-    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setIsDefault(true));
+//    		add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true));
-    	}});
+//    	}});
-    	flowNodeList.add(ypbm);
+//    	flowNodeList.add(ypbm);
     	
 
 //    	fxr.setNextFlowNodeList(new ArrayList<>() {{
@@ -127,13 +130,13 @@ public class TestController {
 //    	}});
 //    	flowNodeList.add(fxs);
     	
-    	fx.setNextFlowNodeList(new ArrayList<>() {
+//    	fx.setNextFlowNodeList(new ArrayList<>() {
-			private static final long serialVersionUID = -610440034210287957L;
+//			private static final long serialVersionUID = -610440034210287957L;
-
+//
-		{
+//		{
-    		add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true).setCondition("当前部门任务已全部分析完"));
+//    		add(BeanUtils.toBean(bzs,SampleFlowNode.class).setIsDefault(true).setCondition("当前部门任务已全部分析完"));
-    	}});
+//    	}});
-    	flowNodeList.add(fx);
+//    	flowNodeList.add(fx);
 
     	bzs.setNextFlowNodeList(new ArrayList<>() {
 			private static final long serialVersionUID = -5057434004685743838L;

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

@@ -145,6 +145,9 @@ public class BusinessSubSamplePageReqVO extends PageParam {
 	@Schema(description = "分析部门状态")
 	private String assayDepartmentStatus;
 	
+	@Schema(description = "分析部门状态列表")
+	private List<String> assayDepartmentStatusList;
+	
 	@Schema(description = "是否已送样")
 	private Integer isSendSample;
 	

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleMapper.java

@@ -144,6 +144,7 @@ public interface BusinessSubSampleMapper extends BaseMapperX<BusinessSubSampleDO
                 .eqIfPresent(BusinessSubSampleAnalysisGroupDO::getAssayDepartmentId, reqVO.getAssayDepartmentId())
                 .eqIfPresent(BusinessSubSampleAnalysisGroupDO::getAssayDepartmentName, reqVO.getAssayDepartmentName())
                 .eqIfPresent(BusinessSubSampleAnalysisGroupDO::getSampleStatus, reqVO.getAssayDepartmentStatus())
+                .inIfPresent(BusinessSubSampleAnalysisGroupDO::getSampleStatus, reqVO.getAssayDepartmentStatusList())
                 .eqIfPresent(BusinessSubSampleAnalysisGroupDO::getIsSend, reqVO.getIsSendSample())
                 .orderByDesc(BusinessSubSampleDO::getSampleFlowNodeTime).orderByAsc(BusinessSubSampleDO::getSampleCode));
 	}

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

@@ -572,9 +572,9 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 						businessAssayTaskDataDO.setConfigAssayMethodId(configAssayMethodId);
 						businessAssayTaskDataDO.setAssayType(assayType);
 						businessAssayTaskDataDO.setTaskType("常规");
-						businessAssayTaskDataDO.setConfigSampleFlowId(configSampleFlowSub.getId());
+//						businessAssayTaskDataDO.setConfigSampleFlowId(configSampleFlowSub.getId());
-						businessAssayTaskDataDO.setSampleFlowNodeKey(sampleFlowNodeSub.getNodeKey());
+//						businessAssayTaskDataDO.setSampleFlowNodeKey(sampleFlowNodeSub.getNodeKey());
-						businessAssayTaskDataDO.setSampleFlowNodeTime(currentDateTime);
+//						businessAssayTaskDataDO.setSampleFlowNodeTime(currentDateTime);
 						businessAssayTaskDataDO.setAssayDepartmentId(configAssayMethodDO.getAssayDepartmentId());
 						businessAssayTaskDataDO.setAssayDepartmentName(configAssayMethodDO.getAssayDepartmentName());
 						
@@ -832,9 +832,9 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 				businessAssayTaskDataDO.setConfigAssayMethodId(addAssayTaskConfigAssayMethod.getId());
 				businessAssayTaskDataDO.setAssayType(assayType);
 				businessAssayTaskDataDO.setTaskType("常规");
-				businessAssayTaskDataDO.setConfigSampleFlowId(configSampleFlowSub.getId());
+//				businessAssayTaskDataDO.setConfigSampleFlowId(configSampleFlowSub.getId());
-				businessAssayTaskDataDO.setSampleFlowNodeKey(sampleFlowNodeSub.getNodeKey());
+//				businessAssayTaskDataDO.setSampleFlowNodeKey(sampleFlowNodeSub.getNodeKey());
-				businessAssayTaskDataDO.setSampleFlowNodeTime(currentDateTime);
+//				businessAssayTaskDataDO.setSampleFlowNodeTime(currentDateTime);
 				businessAssayTaskDataDO.setAssayDepartmentId(addAssayTaskConfigAssayMethod.getAssayDepartmentId());
 				businessAssayTaskDataDO.setAssayDepartmentName(addAssayTaskConfigAssayMethod.getAssayDepartmentName());
 				

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/flow/SampleSubCheckCmp.java

@@ -1,5 +1,6 @@
 package com.zt.plat.module.qms.business.bus.liteflow.sample.flow;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -19,6 +20,8 @@ import com.zt.plat.module.qms.business.bus.liteflow.param.SampleFlowInfo;
 import com.zt.plat.module.qms.business.bus.liteflow.slot.SampleFlowContext;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigSubSampleDO;
 import com.zt.plat.module.qms.business.config.dal.mapper.ConfigSubSampleMapper;
+import com.zt.plat.module.qms.enums.QmsCommonConstant;
+
 import jakarta.annotation.Resource;
 
 @LiteflowComponent(id = "sampleSubCheckCmp", name = "子样检查")
@@ -62,7 +65,11 @@ public class SampleSubCheckCmp extends NodeComponent {
 		List<Long> configSubSampleIdList = businessSubSampleDOList.stream().map(m -> m.getConfigSubSampleId()).distinct().collect(Collectors.toList());
 		List<ConfigSubSampleDO> configSubSampleList = configSubSampleMapper.selectByIds(configSubSampleIdList);
 		
-		List<BusinessAssayTaskDataDO> businessAssayTaskDataList = businessAssayTaskDataMapper.selectList(new LambdaQueryWrapperX<BusinessAssayTaskDataDO>().in(BusinessAssayTaskDataDO::getBusinessSubSampleId, sampleIdList));
+		List<BusinessAssayTaskDataDO> businessAssayTaskDataList = new ArrayList<>();
+		//如果是班组收样或者内部简码时，才需要更新分析任务节点
+		if (QmsCommonConstant.FLOW_NODE_TEAM_RECEIVE.equals(currentSampleFlowKey) || QmsCommonConstant.FlOW_NODE_SAMPLE_ENCRYPT.equals(currentSampleFlowKey)) {
+			businessAssayTaskDataList = businessAssayTaskDataMapper.selectList(new LambdaQueryWrapperX<BusinessAssayTaskDataDO>().in(BusinessAssayTaskDataDO::getBusinessSubSampleId, sampleIdList));
+		}
 		
 		//上一次交接记录
 		List<Long> upSampleRecordIdList = businessSubSampleDOList.stream().filter(f -> f.getUpSampleRecordId() != null).map(m -> m.getUpSampleRecordId()).collect(Collectors.toList());

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/flow/SampleSubProcessUpdateCmp.java

@@ -98,8 +98,8 @@ public class SampleSubProcessUpdateCmp extends NodeComponent {
 			        
 			        if (CollUtil.isNotEmpty(businessSubSampleAnalysisGroupDOList)) {
 			        	List<BusinessSubSampleAnalysisGroupDO> curSubSampleAnalysisGroupDOList = businessSubSampleAnalysisGroupDOList.stream().filter(f -> f.getBusinessSubSampleId().equals(businessSubSample.getId())).collect(Collectors.toList());
-						Boolean hasAllDeptAnalyzed = curSubSampleAnalysisGroupDOList.stream().allMatch(m -> "已完成".equals(m.getSampleStatus()));
+						Boolean hasAllDeptAnalyzed = curSubSampleAnalysisGroupDOList.stream().allMatch(m -> ( "已完成".equals(m.getSampleStatus()) || "已收样".equals(m.getSampleStatus()) ) );
-						Boolean hasCurDeptAnalyzed = curSubSampleAnalysisGroupDOList.stream().filter(f -> f.getAssayDepartmentId().equals(loginUser.getVisitDeptId())).allMatch(m -> "已完成".equals(m.getSampleStatus()));
+						Boolean hasCurDeptAnalyzed = curSubSampleAnalysisGroupDOList.stream().filter(f -> f.getAssayDepartmentId().equals(loginUser.getVisitDeptId())).allMatch(m -> ( "已完成".equals(m.getSampleStatus()) || "已收样".equals(m.getSampleStatus()) ) );
 				        context.put("hasAllDeptAnalyzed", hasAllDeptAnalyzed);
 						context.put("hasCurDeptAnalyzed", hasCurDeptAnalyzed);
 					}
@@ -127,7 +127,7 @@ public class SampleSubProcessUpdateCmp extends NodeComponent {
 			
 			List<BusinessAssayTaskDataDO> subSampleAssayTaskDataList = businessAssayTaskDataList.stream().filter(f -> f.getBusinessSubSampleId().equals(businessSubSample.getId())).collect(Collectors.toList());
 			for (BusinessAssayTaskDataDO businessAssayTaskDataDO : subSampleAssayTaskDataList) {
-				businessAssayTaskDataDO.setSampleFlowNodeKey(nextFlowNode.getNodeKey());
+				businessAssayTaskDataDO.setSampleFlowNodeKey(QmsCommonConstant.FLOW_NODE_ANALYSIS);//样品分析
 				businessAssayTaskDataDO.setSampleFlowNodeTime(currentDateTime);
 
 			}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleResultReportingServiceImpl.java

@@ -810,7 +810,7 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 			businessSampleEntrustRegistrationMapper.updateBatch(updatebBusinessSampleEntrustRegistrationDOList);
 		}
 		
-		if (updateBusinessSubSampleDOList.size() > 0) {
+		if (updateBusinessSubSampleDOList.size() > 0 && QmsCommonConstant.FLOW_NODE_ANALYSIS.equals(updateBusinessSubSampleDOList.get(0).getSampleFlowNodeKey())) {//仅当前节点在分析时，才操作
 			SampleFlowParam sampleFlowParam = new SampleFlowParam();
 			sampleFlowParam.setCurrentSampleFlowKey(QmsCommonConstant.FLOW_NODE_ANALYSIS);
 			sampleFlowParam.setSampleSourceType(2);