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

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

@@ -122,6 +122,9 @@ public interface QmsCommonConstant {
     /** 分析收样 **/
     String FLOW_NODE_ANALYSIS_RECEIVE = "flw_analysis_receive";
     
+    /** 分析 **/
+    String FLOW_NODE_ANALYSIS = "flw_analysis";
+    
     /** 分析送样 **/
     String FLOW_NODE_ANALYSIS_SEND = "flw_analysis_send";
     

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleFlowController.java

@@ -146,9 +146,9 @@ public class SampleFlowController {
     	flowNodeList.add(fx);
 
     	bzs.setNextFlowNodeList(new ArrayList<>() {{
-    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setCondition("样品当前分析班组结果超差，需要发起复检"));
+//    		add(BeanUtils.toBean(fx,SampleFlowNode.class).setCondition("样品当前分析班组结果超差，需要发起复检"));
-    		add(BeanUtils.toBean(bzr,SampleFlowNode.class).setCondition("当前部门数据已全部判断上报"));
+    		add(BeanUtils.toBean(bzr,SampleFlowNode.class).setCondition("subSampleSelfReportedOthersPending"));//当前部门数据已全部判断上报
-    		add(BeanUtils.toBean(ypgk,SampleFlowNode.class).setCondition("当前样品所有分析任务已全部上报完"));
+    		add(BeanUtils.toBean(ypgk,SampleFlowNode.class).setCondition("subSampleAlldeptAnalyzed"));//当前样品所有分析任务已全部上报完
     	}});
     	flowNodeList.add(bzs);
     	

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/SampleResultReportingController.java

@@ -35,8 +35,8 @@ public class SampleResultReportingController {
 	
 	//获取未上报的方法
 	@GetMapping("/getUnReportMethodGroupList")
-	public CommonResult<?> getUnReportMethodGroupList() {
+	public CommonResult<?> getUnReportMethodGroupList(BusinessSubParentSampleAssessmentGroupReqVO reqVO) {
-		List<BusinessSubParentSampleAssessmentGroupRespVO> list = sampleResultReportingService.getUnReportMethodGroupList();
+		List<BusinessSubParentSampleAssessmentGroupRespVO> list = sampleResultReportingService.getUnReportMethodGroupList(reqVO);
 		return success(list);
 	}
 	

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

@@ -107,6 +107,9 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "不等于当前分析人")
+    private String neAssayOperator;
+    
     @Schema(description = "部门id")
     private Long deptId;
 }

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

@@ -64,4 +64,5 @@ public class BusinessHandoverRecordSubPageReqVO extends PageParam {
     @Schema(description = "备注")
     private String remark;
 
+    private Long deptId;
 }

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

@@ -60,4 +60,6 @@ public class BusinessSampleHandoverPageReqVO extends PageParam {
     @Schema(description = "备注")
     private String remark;
 
+    private Long deptId;
+
 }

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

@@ -0,0 +1,20 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class BusinessSubParentSampleAssessmentGroupReqVO {
+
+	@Schema(description = "分析方法id")
+	private Long configAssayMethodId;
+	
+	@Schema(description = "分析方法名称")
+	private String configAssayMethodName;
+
+    @Schema(description = "分析部门ID")
+    private Long assayDepartmentId;
+
+    @Schema(description = "分析部门名称")
+    private String assayDepartmentName;
+}

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

@@ -1,13 +1,22 @@
 package com.zt.plat.module.qms.business.bus.controller.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Data
 public class BusinessSubParentSampleAssessmentGroupRespVO {
 
+	@Schema(description = "分析方法id")
 	private Long configAssayMethodId;
 	
+	@Schema(description = "分析方法名称")
 	private String configAssayMethodName;
 
+    @Schema(description = "分析部门ID")
+    private Long assayDepartmentId;
+
+    @Schema(description = "分析部门名称")
+    private String assayDepartmentName;
+    
 	private Integer sampleCount;
 }

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

@@ -3,6 +3,8 @@ package com.zt.plat.module.qms.business.bus.controller.vo;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.StringUtils;
+
 import cn.hutool.core.collection.CollUtil;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -32,6 +34,9 @@ public class BusinessSubSampleExtendRespVO extends BusinessSubSampleRespVO {
 			List<String> collect = this.businessSubSampleAnalysisGroupList.stream().filter(f -> f.getSampleStatus().equals("待收样")).map(m -> m.getAssayDepartmentName()).collect(Collectors.toList());
 			_sampleDestination = CollUtil.join(collect, ",");
 		}
+		if (StringUtils.isBlank(_sampleDestination)) {//所有分析班组已完成，去向显示为库名
+			_sampleDestination = this.getWarehouseName();
+		}
 		return _sampleDestination;
 	}
 	

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

@@ -15,6 +15,7 @@ import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDataPa
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDataReqVO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAnalysisGroupDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAssessmentDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO;
 import com.zt.plat.module.qms.enums.QmsCommonConstant;
@@ -154,7 +155,7 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
 		if (ObjectUtil.isNotEmpty(reqVO.getConfigAssayMethodId())) {
 			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId());
 		}
-		mpjLambdaWrapper.ne(BusinessSubSampleAnalysisGroupDO::getSampleStatus, "待收样");
+		mpjLambdaWrapper.ne(BusinessSubSampleAnalysisGroupDO::getSampleStatus, "已收样");
 		mpjLambdaWrapper.orderByAsc(BusinessAssayTaskDataDO::getBusinessSubSampleId).orderByAsc(BusinessAssayTaskDataDO::getReportTime);
 		
 		return selectJoinList(BusinessAssayTaskDataExtendRespVO.class, mpjLambdaWrapper);
@@ -242,6 +243,16 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
 				.eq(BusinessAssayTaskDataDO::getConfigAssayMethodId, configAssayMethodId));
 	}
 	
+	/**
+	 * 根据分样主样id列表查询分析任务
+	 * @param businessSubParentSampleIds
+	 * @return
+	 */
+	default List<BusinessAssayTaskDataDO> selectByBusinessSubParentSampleIds(List<Long> businessSubParentSampleIds) {
+		return selectList(new LambdaQueryWrapperX<BusinessAssayTaskDataDO>()
+				.in(BusinessAssayTaskDataDO::getBusinessSubParentSampleId, businessSubParentSampleIds));
+	}
+	
 	/**
 	 * 根据分样查询分析任务
 	 * @param businessSubParentSampleId 分样样id