委托登记修改

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

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import com.zt.plat.module.qms.business.bus.service.SampleAnalysisAuditService;
@@ -25,7 +26,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/qms/bus/sample/analysis-audit")
 @Validated
-public class SampleAnalysisAuditController {
+public class SampleAnalysisAuditController implements BusinessControllerMarker {
 	
 	@Resource
 	private SampleAnalysisAuditService sampleAnalysisAuditService;

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

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import com.zt.plat.module.qms.business.bus.service.SampleAnalysisService;
@@ -23,7 +24,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 @RestController
 @RequestMapping("/qms/bus/sample/analysis")
 @Validated
-public class SampleAnalysisController {
+public class SampleAnalysisController implements BusinessControllerMarker {
 	
 	@Resource
 	private SampleAnalysisService sampleAnalysisService ;

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

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson2.JSONObject;
 import com.yomahub.liteflow.core.FlowExecutor;
 import com.yomahub.liteflow.flow.LiteflowResponse;
-
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
@@ -34,7 +34,7 @@ import jakarta.validation.Valid;
 @RestController
 @RequestMapping("/qms/bus/sample/entrust")
 @Validated
-public class SampleEntrustController {
+public class SampleEntrustController implements BusinessControllerMarker {
 
     @Resource
     private FlowExecutor flowExecutor;

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

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson2.JSON;
 import com.yomahub.liteflow.core.FlowExecutor;
 import com.yomahub.liteflow.flow.LiteflowResponse;
-
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
 import com.zt.plat.framework.tenant.core.context.TenantContextHolder;
@@ -33,7 +33,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.error;
 @RestController
 @RequestMapping("/qms/bus/sample/flow")
 @Validated
-public class SampleFlowController {
+public class SampleFlowController implements BusinessControllerMarker {
 	
 	@Resource
 	private SampleFlowService sampleFlowService;

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

@@ -6,6 +6,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
 import com.zt.plat.module.qms.business.bus.service.SampleResultReportingService;
@@ -28,7 +29,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 @RestController
 @RequestMapping("/qms/bus/sample/result-reporting")
 @Validated
-public class SampleResultReportingController {
+public class SampleResultReportingController implements BusinessControllerMarker {
 	
 	@Resource
 	private SampleResultReportingService sampleResultReportingService;

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

@@ -11,6 +11,7 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 import java.util.List;
 
+import com.zt.plat.framework.business.interceptor.BusinessControllerMarker;
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
@@ -27,7 +28,7 @@ import jakarta.annotation.Resource;
 @RestController
 @RequestMapping("/qms/bus/sample/task-assign")
 @Validated
-public class SampleTaskAssignController {
+public class SampleTaskAssignController implements BusinessControllerMarker {
 	
 	@Resource
 	private SampleTaskAssignService sampleTaskAssignService;

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

@@ -98,4 +98,8 @@ public class BusinessAssayTaskDataPageReqVO extends PageParam {
     @Schema(description = "备注")
     private String remark;
 
+    //===================================扩展字段===============================================
+
+    @Schema(description = "样品状态")
+    private String sampleStatus;
 }

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

@@ -102,5 +102,7 @@ public class BusinessAssayTaskDataReqVO {
     @Schema(description = "判定上报状态")
     private String asmtReportedStatus;
 
+    @Schema(description = "样品状态")
+    private String sampleStatus;
 
 }

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

@@ -39,83 +39,207 @@ import org.apache.ibatis.annotations.Param;
 public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTaskDataDO> {
 	
 	default List<BusinessAssayTaskDataExtendRespVO> selectList(BusinessAssayTaskDataReqVO reqVO) {
-		return selectJoinList(BusinessAssayTaskDataExtendRespVO.class, new MPJLambdaWrapperX<BusinessAssayTaskDataDO>()
+		MPJLambdaWrapper<BusinessAssayTaskDataDO> mpjLambdaWrapper = new MPJLambdaWrapperX<BusinessAssayTaskDataDO>()
-        		.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessAssayTaskDataDO::getConfigAssayMethodId)
+		.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessAssayTaskDataDO::getConfigAssayMethodId)
-        		.leftJoin(BusinessSubSampleDO.class, BusinessSubSampleDO::getId, BusinessAssayTaskDataDO::getBusinessSubSampleId)
+		.leftJoin(BusinessSubSampleDO.class, BusinessSubSampleDO::getId, BusinessAssayTaskDataDO::getBusinessSubSampleId)
-        		.selectAll(BusinessAssayTaskDataDO.class)
+		.leftJoin(BusinessSubSampleAnalysisGroupDO.class, on -> on
-        		.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodName)
+				.eq(BusinessSubSampleAnalysisGroupDO::getBusinessSubSampleId, BusinessAssayTaskDataDO::getBusinessSubSampleId)
-        		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
+				.eq(BusinessSubSampleAnalysisGroupDO::getAssayDepartmentId, BusinessAssayTaskDataDO::getAssayDepartmentId))
-        		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
+		.selectAll(BusinessAssayTaskDataDO.class)
-        		.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayTaskDataExtendRespVO::getSampleAssayCode)
+		.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodName)
-        		.selectAs(BusinessSubSampleDO::getConfigSubSampleId, BusinessAssayTaskDataExtendRespVO::getConfigSubSampleId)
+		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
-                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessBaseSampleId, reqVO.getBusinessBaseSampleId())
+		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
-                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId())
+		.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayTaskDataExtendRespVO::getSampleAssayCode)
-                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessSubSampleId, reqVO.getBusinessSubSampleId())
+		.selectAs(BusinessSubSampleDO::getConfigSubSampleId, BusinessAssayTaskDataExtendRespVO::getConfigSubSampleId);
-                .eqIfPresent(BusinessAssayTaskDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
+    	if (ObjectUtil.isNotEmpty(reqVO.getBusinessBaseSampleId())) {
-                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId())
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getBusinessBaseSampleId, reqVO.getBusinessBaseSampleId());
-                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessSubSampleAssessmentId, reqVO.getBusinessSubSampleAssessmentId())
+		}
-                .eqIfPresent(BusinessAssayTaskDataDO::getTaskType, reqVO.getTaskType())
+    	if (ObjectUtil.isNotEmpty(reqVO.getBusinessSubParentSampleId())) {
-                .eqIfPresent(BusinessAssayTaskDataDO::getAssayType, reqVO.getAssayType())
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId());			
-                .eqIfPresent(BusinessAssayTaskDataDO::getAssayProject, reqVO.getAssayProject())
+		}
-                .eqIfPresent(BusinessAssayTaskDataDO::getAssayDepartmentId, reqVO.getAssayDepartmentId())
+		if (ObjectUtil.isNotEmpty(reqVO.getBusinessSubSampleId())) {
-                .likeIfPresent(BusinessAssayTaskDataDO::getAssayDepartmentName, reqVO.getAssayDepartmentName())
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getBusinessSubSampleId, reqVO.getBusinessSubSampleId());
-                .eqIfPresent(BusinessAssayTaskDataDO::getAssayOperator, reqVO.getAssayOperator())
+		}
-                .eqIfPresent(BusinessAssayTaskDataDO::getAssayOperatorId, reqVO.getAssayOperatorId())
+		if (ObjectUtil.isNotEmpty(reqVO.getConfigAssayMethodId())) {
-                .betweenIfPresent(BusinessAssayTaskDataDO::getAssignTaskTime, reqVO.getAssignTaskTime())
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId());
-                .eqIfPresent(BusinessAssayTaskDataDO::getIsAssignTasked, reqVO.getIsAssignTasked())
+		}
-                .eqIfPresent(BusinessAssayTaskDataDO::getIsReported, reqVO.getIsReported())
+		if (ObjectUtil.isNotEmpty(reqVO.getBusinessAssayTaskId())) {
-                .eqIfPresent(BusinessAssayTaskDataDO::getReporter, reqVO.getReporter())
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId());
-                .eqIfPresent(BusinessAssayTaskDataDO::getReporterId, reqVO.getReporterId())
+		}
-                .betweenIfPresent(BusinessAssayTaskDataDO::getReportTime, reqVO.getReportTime())
+		if (ObjectUtil.isNotEmpty(reqVO.getBusinessSubSampleAssessmentId())) {
-                .eqIfPresent(BusinessAssayTaskDataDO::getConfigSampleFlowId, reqVO.getConfigSampleFlowId())
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getBusinessSubSampleAssessmentId, reqVO.getBusinessSubSampleAssessmentId());
-                .eqIfPresent(BusinessAssayTaskDataDO::getSampleFlowNodeKey, reqVO.getSampleFlowNodeKey())
+		}
-                .betweenIfPresent(BusinessAssayTaskDataDO::getSampleFlowNodeTime, reqVO.getSampleFlowNodeTime())
+		if (ObjectUtil.isNotEmpty(reqVO.getTaskType())) {
-                .eqIfPresent(BusinessAssayTaskDataDO::getAnalysisCount, reqVO.getAnalysisCount())
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getTaskType, reqVO.getTaskType());
-                .eqIfPresent(BusinessAssayTaskDataDO::getUpdateCount, reqVO.getUpdateCount())
+		}
-                .eqIfPresent(BusinessAssayTaskDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+		if (ObjectUtil.isNotEmpty(reqVO.getAssayType())) {
-                .betweenIfPresent(BusinessAssayTaskDataDO::getCreateTime, reqVO.getCreateTime())
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAssayType, reqVO.getAssayType());
-                .eqIfPresent(BusinessAssayTaskDataDO::getRemark, reqVO.getRemark())
+		}
-                .orderByDesc(BusinessAssayTaskDataDO::getId));
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssayProject())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAssayProject, reqVO.getAssayProject());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssayDepartmentId())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAssayDepartmentId, reqVO.getAssayDepartmentId());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssayDepartmentName())) {
+    		mpjLambdaWrapper.like(BusinessAssayTaskDataDO::getAssayDepartmentName, reqVO.getAssayDepartmentName());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssayOperator())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAssayOperator, reqVO.getAssayOperator());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssayOperatorId())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAssayOperatorId, reqVO.getAssayOperatorId());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssignTaskTime()) && ObjectUtil.isNotEmpty(reqVO.getAssignTaskTime()[0]) && ObjectUtil.isNotEmpty(reqVO.getAssignTaskTime()[1])) {
+    		mpjLambdaWrapper.between(BusinessAssayTaskDataDO::getAssignTaskTime, reqVO.getAssignTaskTime()[0], reqVO.getAssignTaskTime()[1]);
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getIsAssignTasked())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getIsAssignTasked, reqVO.getIsAssignTasked());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getIsReported())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getIsReported, reqVO.getIsReported());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getReporter())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getReporter, reqVO.getReporter());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getReporterId())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getReporterId, reqVO.getReporterId());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getReportTime()) && ObjectUtil.isNotEmpty(reqVO.getReportTime()[0]) && ObjectUtil.isNotEmpty(reqVO.getReportTime()[1])) {
+    		mpjLambdaWrapper.between(BusinessAssayTaskDataDO::getReportTime, reqVO.getReportTime()[0], reqVO.getReportTime()[1]);
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getConfigSampleFlowId())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getConfigSampleFlowId, reqVO.getConfigSampleFlowId());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeKey())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getSampleFlowNodeKey, reqVO.getSampleFlowNodeKey());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeTime()) && ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeTime()[0]) && ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeTime()[1])) {
+    		mpjLambdaWrapper.between(BusinessAssayTaskDataDO::getSampleFlowNodeTime, reqVO.getSampleFlowNodeTime()[0], reqVO.getSampleFlowNodeTime()[1]);
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAnalysisCount())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAnalysisCount, reqVO.getAnalysisCount());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getUpdateCount())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getUpdateCount, reqVO.getUpdateCount());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getSystemDepartmentCode())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode());
+		}
+        if (ObjectUtil.isNotEmpty(reqVO.getCreateTime()) && ObjectUtil.isNotEmpty(reqVO.getCreateTime()[0]) && ObjectUtil.isNotEmpty(reqVO.getCreateTime()[1])) {
+        	mpjLambdaWrapper.between(BusinessAssayTaskDataDO::getCreateTime, reqVO.getCreateTime()[0], reqVO.getCreateTime()[1]);
+		}
+        if (ObjectUtil.isNotEmpty(reqVO.getRemark())) {
+        	mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getRemark, reqVO.getRemark());
+		}
+        
+        if (ObjectUtil.isNotEmpty(reqVO.getSampleStatus())) {
+    		mpjLambdaWrapper.eq(BusinessSubSampleAnalysisGroupDO::getSampleStatus, reqVO.getSampleStatus());
+		}
+        mpjLambdaWrapper.orderByDesc(BusinessAssayTaskDataDO::getId);
+		return selectJoinList(BusinessAssayTaskDataExtendRespVO.class, mpjLambdaWrapper);
     }
 
     default PageResult<BusinessAssayTaskDataExtendRespVO> selectPage(BusinessAssayTaskDataPageReqVO reqVO) {
-        return selectJoinPage(reqVO, BusinessAssayTaskDataExtendRespVO.class, new MPJLambdaWrapperX<BusinessAssayTaskDataDO>()
+    	MPJLambdaWrapper<BusinessAssayTaskDataDO> mpjLambdaWrapper = new MPJLambdaWrapperX<BusinessAssayTaskDataDO>()
-        		.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessAssayTaskDataDO::getConfigAssayMethodId)
+		.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessAssayTaskDataDO::getConfigAssayMethodId)
-        		.leftJoin(BusinessSubSampleDO.class, BusinessSubSampleDO::getId, BusinessAssayTaskDataDO::getBusinessSubSampleId)
+		.leftJoin(BusinessSubSampleDO.class, BusinessSubSampleDO::getId, BusinessAssayTaskDataDO::getBusinessSubSampleId)
-        		.selectAll(BusinessAssayTaskDataDO.class)
+		.leftJoin(BusinessSubSampleAnalysisGroupDO.class, on -> on
-        		.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodName)
+				.eq(BusinessSubSampleAnalysisGroupDO::getBusinessSubSampleId, BusinessAssayTaskDataDO::getBusinessSubSampleId)
-        		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
+				.eq(BusinessSubSampleAnalysisGroupDO::getAssayDepartmentId, BusinessAssayTaskDataDO::getAssayDepartmentId))
-        		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
+		.selectAll(BusinessAssayTaskDataDO.class)
-        		.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayTaskDataExtendRespVO::getSampleAssayCode)
+		.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodName)
-        		.selectAs(BusinessSubSampleDO::getConfigSubSampleId, BusinessAssayTaskDataExtendRespVO::getConfigSubSampleId)
+		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
-                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessBaseSampleId, reqVO.getBusinessBaseSampleId())
+		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
-                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId())
+		.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayTaskDataExtendRespVO::getSampleAssayCode)
-                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessSubSampleId, reqVO.getBusinessSubSampleId())
+		.selectAs(BusinessSubSampleDO::getConfigSubSampleId, BusinessAssayTaskDataExtendRespVO::getConfigSubSampleId);
-                .eqIfPresent(BusinessAssayTaskDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
+    	if (ObjectUtil.isNotEmpty(reqVO.getBusinessBaseSampleId())) {
-                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId())
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getBusinessBaseSampleId, reqVO.getBusinessBaseSampleId());
-                .eqIfPresent(BusinessAssayTaskDataDO::getBusinessSubSampleAssessmentId, reqVO.getBusinessSubSampleAssessmentId())
+		}
-                .eqIfPresent(BusinessAssayTaskDataDO::getTaskType, reqVO.getTaskType())
+    	if (ObjectUtil.isNotEmpty(reqVO.getBusinessSubParentSampleId())) {
-                .eqIfPresent(BusinessAssayTaskDataDO::getAssayType, reqVO.getAssayType())
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId());			
-                .eqIfPresent(BusinessAssayTaskDataDO::getAssayProject, reqVO.getAssayProject())
+		}
-                .eqIfPresent(BusinessAssayTaskDataDO::getAssayDepartmentId, reqVO.getAssayDepartmentId())
+		if (ObjectUtil.isNotEmpty(reqVO.getBusinessSubSampleId())) {
-                .likeIfPresent(BusinessAssayTaskDataDO::getAssayDepartmentName, reqVO.getAssayDepartmentName())
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getBusinessSubSampleId, reqVO.getBusinessSubSampleId());
-                .eqIfPresent(BusinessAssayTaskDataDO::getAssayOperator, reqVO.getAssayOperator())
+		}
-                .eqIfPresent(BusinessAssayTaskDataDO::getAssayOperatorId, reqVO.getAssayOperatorId())
+		if (ObjectUtil.isNotEmpty(reqVO.getConfigAssayMethodId())) {
-                .betweenIfPresent(BusinessAssayTaskDataDO::getAssignTaskTime, reqVO.getAssignTaskTime())
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId());
-                .eqIfPresent(BusinessAssayTaskDataDO::getIsAssignTasked, reqVO.getIsAssignTasked())
+		}
-                .eqIfPresent(BusinessAssayTaskDataDO::getIsReported, reqVO.getIsReported())
+		if (ObjectUtil.isNotEmpty(reqVO.getBusinessAssayTaskId())) {
-                .eqIfPresent(BusinessAssayTaskDataDO::getReporter, reqVO.getReporter())
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getBusinessAssayTaskId, reqVO.getBusinessAssayTaskId());
-                .eqIfPresent(BusinessAssayTaskDataDO::getReporterId, reqVO.getReporterId())
+		}
-                .betweenIfPresent(BusinessAssayTaskDataDO::getReportTime, reqVO.getReportTime())
+		if (ObjectUtil.isNotEmpty(reqVO.getBusinessSubSampleAssessmentId())) {
-                .eqIfPresent(BusinessAssayTaskDataDO::getConfigSampleFlowId, reqVO.getConfigSampleFlowId())
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getBusinessSubSampleAssessmentId, reqVO.getBusinessSubSampleAssessmentId());
-                .eqIfPresent(BusinessAssayTaskDataDO::getSampleFlowNodeKey, reqVO.getSampleFlowNodeKey())
+		}
-                .betweenIfPresent(BusinessAssayTaskDataDO::getSampleFlowNodeTime, reqVO.getSampleFlowNodeTime())
+		if (ObjectUtil.isNotEmpty(reqVO.getTaskType())) {
-                .eqIfPresent(BusinessAssayTaskDataDO::getAnalysisCount, reqVO.getAnalysisCount())
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getTaskType, reqVO.getTaskType());
-                .eqIfPresent(BusinessAssayTaskDataDO::getUpdateCount, reqVO.getUpdateCount())
+		}
-                .eqIfPresent(BusinessAssayTaskDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
+		if (ObjectUtil.isNotEmpty(reqVO.getAssayType())) {
-                .betweenIfPresent(BusinessAssayTaskDataDO::getCreateTime, reqVO.getCreateTime())
+			mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAssayType, reqVO.getAssayType());
-                .eqIfPresent(BusinessAssayTaskDataDO::getRemark, reqVO.getRemark())
+		}
-                .orderByDesc(BusinessAssayTaskDataDO::getId));
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssayProject())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAssayProject, reqVO.getAssayProject());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssayDepartmentId())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAssayDepartmentId, reqVO.getAssayDepartmentId());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssayDepartmentName())) {
+    		mpjLambdaWrapper.like(BusinessAssayTaskDataDO::getAssayDepartmentName, reqVO.getAssayDepartmentName());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssayOperator())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAssayOperator, reqVO.getAssayOperator());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssayOperatorId())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAssayOperatorId, reqVO.getAssayOperatorId());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAssignTaskTime()) && ObjectUtil.isNotEmpty(reqVO.getAssignTaskTime()[0]) && ObjectUtil.isNotEmpty(reqVO.getAssignTaskTime()[1])) {
+    		mpjLambdaWrapper.between(BusinessAssayTaskDataDO::getAssignTaskTime, reqVO.getAssignTaskTime()[0], reqVO.getAssignTaskTime()[1]);
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getIsAssignTasked())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getIsAssignTasked, reqVO.getIsAssignTasked());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getIsReported())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getIsReported, reqVO.getIsReported());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getReporter())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getReporter, reqVO.getReporter());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getReporterId())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getReporterId, reqVO.getReporterId());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getReportTime()) && ObjectUtil.isNotEmpty(reqVO.getReportTime()[0]) && ObjectUtil.isNotEmpty(reqVO.getReportTime()[1])) {
+    		mpjLambdaWrapper.between(BusinessAssayTaskDataDO::getReportTime, reqVO.getReportTime()[0], reqVO.getReportTime()[1]);
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getConfigSampleFlowId())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getConfigSampleFlowId, reqVO.getConfigSampleFlowId());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeKey())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getSampleFlowNodeKey, reqVO.getSampleFlowNodeKey());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeTime()) && ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeTime()[0]) && ObjectUtil.isNotEmpty(reqVO.getSampleFlowNodeTime()[1])) {
+    		mpjLambdaWrapper.between(BusinessAssayTaskDataDO::getSampleFlowNodeTime, reqVO.getSampleFlowNodeTime()[0], reqVO.getSampleFlowNodeTime()[1]);
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getAnalysisCount())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getAnalysisCount, reqVO.getAnalysisCount());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getUpdateCount())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getUpdateCount, reqVO.getUpdateCount());
+		}
+    	if (ObjectUtil.isNotEmpty(reqVO.getSystemDepartmentCode())) {
+    		mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode());
+		}
+        if (ObjectUtil.isNotEmpty(reqVO.getCreateTime()) && ObjectUtil.isNotEmpty(reqVO.getCreateTime()[0]) && ObjectUtil.isNotEmpty(reqVO.getCreateTime()[1])) {
+        	mpjLambdaWrapper.between(BusinessAssayTaskDataDO::getCreateTime, reqVO.getCreateTime()[0], reqVO.getCreateTime()[1]);
+		}
+        if (ObjectUtil.isNotEmpty(reqVO.getRemark())) {
+        	mpjLambdaWrapper.eq(BusinessAssayTaskDataDO::getRemark, reqVO.getRemark());
+		}
+        
+        if (ObjectUtil.isNotEmpty(reqVO.getSampleStatus())) {
+    		mpjLambdaWrapper.eq(BusinessSubSampleAnalysisGroupDO::getSampleStatus, reqVO.getSampleStatus());
+		}
+        mpjLambdaWrapper.orderByDesc(BusinessAssayTaskDataDO::getId);
+        return selectJoinPage(reqVO, BusinessAssayTaskDataExtendRespVO.class, mpjLambdaWrapper);
     }
     
 

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

@@ -6,6 +6,8 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.StringUtils;
+
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.yomahub.liteflow.annotation.LiteflowComponent;
@@ -44,6 +46,8 @@ import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleAssessmen
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleMapper;
 import com.zt.plat.module.qms.business.bus.liteflow.param.SampleFlowInfo;
 import com.zt.plat.module.qms.business.bus.liteflow.slot.SampleEntrustContext;
+import com.zt.plat.module.qms.business.config.controller.vo.ConfigSubSampleMethodConfAdd;
+import com.zt.plat.module.qms.business.config.controller.vo.ConfigSubSampleMethodConfInfo;
 import com.zt.plat.module.qms.business.config.dal.dataobject.BaseSampleDO;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodProjectDO;
@@ -179,23 +183,23 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 		List<BusinessSampleAssayResultDO> sampleAssayResultList = sampleEntrustContext.getSampleAssayResultList();
 		
 		//金银检测项目字典id列表
-		List<Long> auAgDictionaryProjectIdList = new ArrayList<>() {
+//		List<Long> auAgDictionaryProjectIdList = new ArrayList<>() {
-			private static final long serialVersionUID = 1L;
+//			private static final long serialVersionUID = 1L;
-
+//
-		{
+//		{
-			add(1000000000000000002L);
+//			add(1000000000000000002L);
-			add(1000000000000000003L);
+//			add(1000000000000000003L);
-		}};
+//		}};
 		//硫的检测项目字典id
-		Long sDictionaryProjectId = 1000000000000000004L;
+//		Long sDictionaryProjectId = 1000000000000000004L;
 		
 		//商检样品来源id
-		List<Long> sjEntrustSourceIdList = new ArrayList<>() {
+//		List<Long> sjEntrustSourceIdList = new ArrayList<>() {
-			private static final long serialVersionUID = 1L;
+//			private static final long serialVersionUID = 1L;
-
+//
-		{
+//		{
-			add(1000000000000000002L);//中铜国贸
+//			add(1000000000000000002L);//中铜国贸
-		}};
+//		}};
 		
 		//样品大类列表
 		List<BaseSampleDO> baseSampleList = baseSampleMapper.selectList();
@@ -250,11 +254,11 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 		List<BusinessAssayReportDataDO> businessAssayReportDataDOList = new ArrayList<>();
 		
 		//是否为商检委托
-		Boolean isSjEntrust = sjEntrustSourceIdList.contains(sampleEntrustRegistration.getConfigEntrustSourceId());
+//		Boolean isSjEntrust = sjEntrustSourceIdList.contains(sampleEntrustRegistration.getConfigEntrustSourceId());
 		//是否分析金银
-		Boolean isAssayAuAg = sampleEntrustProjectList.stream().anyMatch(f -> auAgDictionaryProjectIdList.contains(f.getDictionaryProjectId()));
+//		Boolean isAssayAuAg = sampleEntrustProjectList.stream().anyMatch(f -> auAgDictionaryProjectIdList.contains(f.getDictionaryProjectId()));
 		//是否分析硫
-		Boolean isAssayS = sampleEntrustProjectList.stream().anyMatch(f -> f.getDictionaryProjectId().equals(sDictionaryProjectId));
+//		Boolean isAssayS = sampleEntrustProjectList.stream().anyMatch(f -> f.getDictionaryProjectId().equals(sDictionaryProjectId));
 		
 		//子样流转信息列表
 		List<SampleFlowInfo> sampleFlowInfoList = new ArrayList<>();
@@ -295,26 +299,26 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 			
 
 			//是否创建综合样S分析
-			Boolean isCreateZhy = false;
+//			Boolean isCreateZhy = false;
 			//综合样分析方法
-			ConfigAssayMethodDO configAssayMethodZhy = null;
+//			ConfigAssayMethodDO configAssayMethodZhy = null;
 			
 			//是商检样品，分析金银，第一个样品
-			if (isSjEntrust && isAssayAuAg && sort == 0) {
+//			if (isSjEntrust && isAssayAuAg && sort == 0) {
 				//是否分析硫
-				isAssayS = dictionaryProjectIdList.contains(sDictionaryProjectId);
+//				isAssayS = dictionaryProjectIdList.contains(sDictionaryProjectId);
-				if (isAssayS) {
+//				if (isAssayS) {
-					isCreateZhy = false;
+//					isCreateZhy = false;
-				} else {
+//				} else {
-					isCreateZhy = true;
+//					isCreateZhy = true;
-					MaterialAssayStandardMethodDO materialAssayStandardMethodDO = materialAssayStandardMethodMapper.selectByBaseSampleIdAndDictionaryProjectId(businessSampleEntrustDetailDO.getBaseSampleId(), sDictionaryProjectId);
+//					MaterialAssayStandardMethodDO materialAssayStandardMethodDO = materialAssayStandardMethodMapper.selectByBaseSampleIdAndDictionaryProjectId(businessSampleEntrustDetailDO.getBaseSampleId(), sDictionaryProjectId);
-					if (materialAssayStandardMethodDO == null) {
+//					if (materialAssayStandardMethodDO == null) {
-						throw new ServiceException(1_032_100_000, "商检样品，检测项目存在金银，但未找到S配置");
+//						throw new ServiceException(1_032_100_000, "商检样品，检测项目存在金银，但未找到S配置");
-					}
+//					}
-					configAssayMethodZhy = configAssayMethodMapper.selectById(materialAssayStandardMethodDO.getConfigAssayMethodId());
+//					configAssayMethodZhy = configAssayMethodMapper.selectById(materialAssayStandardMethodDO.getConfigAssayMethodId());
-				}
+//				}
-				
+//				
-			}
+//			}
 			
 			
 			
@@ -440,6 +444,140 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 				//查询子样对应的分析方法
 				ConfigSubSampleMethodDO configSubSampleMethodDO = configSubSampleMethodList.stream().filter(f -> f.getIsDefaultUse().equals(QmsCommonConstant.YES) && f.getConfigAssayMethodId().equals(configAssayMethodId) && f.getConfigSubSampleId().equals(configSubSample.getId())).findFirst().orElse(null);
 				
+				//扩展配置信息
+				String configInfomation = configSubSampleMethodDO.getConfigInfomation();
+				if (StringUtils.isNotBlank(configInfomation)) {
+					ConfigSubSampleMethodConfInfo configSubSampleMethodConfInfo = JSON.parseObject(configInfomation, ConfigSubSampleMethodConfInfo.class);
+					ConfigSubSampleMethodConfAdd addAssayTask = configSubSampleMethodConfInfo.getAddAssayTask();
+					if (addAssayTask != null) {//需要添加任务
+						
+						List<Long> conditionProjectIdList = addAssayTask.getConditionProjectIdList();
+						Long methodId = addAssayTask.getMethodId();
+						List<Long> projectIdList = addAssayTask.getProjectIdList();
+						//判定检测项目包含条件中的检测项目
+						Boolean isAssayConditionProjectList = sampleEntrustProjectList.stream().anyMatch(f -> conditionProjectIdList.contains(f.getDictionaryProjectId()));
+						if (isAssayConditionProjectList && sort == 0) {
+							ConfigAssayMethodDO addAssayTaskConfigAssayMethod = configAssayMethodMapper.selectById(methodId);
+							Long addAssayTaskAssayDepartmentId = addAssayTaskConfigAssayMethod.getAssayDepartmentId();
+
+							//查询子样对应的分析方法
+							ConfigSubSampleMethodDO addAssayTaskConfigSubSampleMethodDO = configSubSampleMethodList.stream().filter(f -> f.getIsDefaultUse().equals(QmsCommonConstant.YES) && f.getConfigAssayMethodId().equals(methodId) && f.getConfigSubSampleId().equals(configSubSample.getId())).findFirst().orElse(null);
+							
+							businessSubSampleAnalysisGroupDO = businessSubSampleAnalysisGroupDOList.stream().filter(f -> f.getBusinessSubSampleId().equals(businessSubSampleDO.getId()) && f.getAssayDepartmentId().equals(addAssayTaskAssayDepartmentId)).findFirst().orElse(null);
+							if (businessSubSampleAnalysisGroupDO == null) {
+								businessSubSampleAnalysisGroupDO = new BusinessSubSampleAnalysisGroupDO();
+								businessSubSampleAnalysisGroupDO.setId(IdWorker.getId());
+								businessSubSampleAnalysisGroupDO.setBusinessBaseSampleId(businessSubSampleDO.getBusinessBaseSampleId());
+								businessSubSampleAnalysisGroupDO.setBusinessSubParentSampleId(businessSubSampleDO.getBusinessSubParentSampleId());
+								businessSubSampleAnalysisGroupDO.setBusinessSubSampleId(businessSubSampleDO.getId());
+								businessSubSampleAnalysisGroupDO.setAssayDepartmentId(addAssayTaskConfigAssayMethod.getAssayDepartmentId());
+								businessSubSampleAnalysisGroupDO.setAssayDepartmentName(addAssayTaskConfigAssayMethod.getAssayDepartmentName());
+								businessSubSampleAnalysisGroupDO.setSampleStatus("待收样");
+								
+								businessSubSampleAnalysisGroupDOList.add(businessSubSampleAnalysisGroupDO);
+							}
+							
+							//根据任务数判断是平行还是
+							String assayType = addAssayTaskConfigSubSampleMethodDO.getTaskCount() > 1 ? QmsCommonConstant.ASSAY_TYPE_SINGLE_PARALLEL : QmsCommonConstant.ASSAY_TYPE_SINGLE_CUP;
+							
+							//分样判定数据
+							BusinessSubParentSampleAssessmentDO businessSubParentSampleAssessmentDO = new BusinessSubParentSampleAssessmentDO();
+							businessSubParentSampleAssessmentDO.setId(IdWorker.getId());
+							businessSubParentSampleAssessmentDO.setBusinessSubParentSampleId(businessSubSampleDO.getBusinessSubParentSampleId());
+							businessSubParentSampleAssessmentDO.setConfigAssayMethodId(addAssayTaskConfigAssayMethod.getId());
+							businessSubParentSampleAssessmentDO.setAssayType(assayType);
+							businessSubParentSampleAssessmentDO.setTaskType("常规");
+							businessSubParentSampleAssessmentDOList.add(businessSubParentSampleAssessmentDO);
+
+							//子样判定数据
+							BusinessSubSampleAssessmentDO businessSubSampleAssessmentDO = new BusinessSubSampleAssessmentDO();
+							businessSubSampleAssessmentDO.setId(IdWorker.getId());	
+							businessSubSampleAssessmentDO.setBusinessBaseSampleId(businessSubSampleDO.getBusinessBaseSampleId());
+							businessSubSampleAssessmentDO.setBusinessSubParentSampleId(businessSubSampleDO.getBusinessSubParentSampleId());
+							businessSubSampleAssessmentDO.setBusinessSubParentSampleAssessmentId(businessSubParentSampleAssessmentDO.getId());
+							businessSubSampleAssessmentDO.setBusinessSubSampleId(businessSubSampleDO.getId());
+							businessSubSampleAssessmentDO.setConfigAssayMethodId(addAssayTaskConfigAssayMethod.getId());
+							businessSubSampleAssessmentDO.setAssayType(assayType);
+							businessSubSampleAssessmentDO.setTaskType("常规");
+							
+							businessSubSampleAssessmentDOList.add(businessSubSampleAssessmentDO);
+
+							//根据检测方法循环
+							BusinessAssayTaskDataDO businessAssayTaskDataDO = null;
+							//根据任务数循环
+							for (int i = 0; i < addAssayTaskConfigSubSampleMethodDO.getTaskCount(); i++) {
+								//子样检测任务
+								businessAssayTaskDataDO = new BusinessAssayTaskDataDO();
+								businessAssayTaskDataDO.setId(IdWorker.getId());
+								businessAssayTaskDataDO.setBusinessBaseSampleId(businessSubSampleDO.getBusinessBaseSampleId());
+								businessAssayTaskDataDO.setBusinessSubParentSampleId(businessSubSampleDO.getBusinessSubParentSampleId());
+								businessAssayTaskDataDO.setBusinessSubSampleId(businessSubSampleDO.getId());
+								businessAssayTaskDataDO.setBusinessSubSampleAssessmentId(businessSubSampleAssessmentDO.getId());//子样判定id
+								businessAssayTaskDataDO.setConfigAssayMethodId(addAssayTaskConfigAssayMethod.getId());
+								businessAssayTaskDataDO.setAssayType(assayType);
+								businessAssayTaskDataDO.setTaskType("常规");
+								businessAssayTaskDataDO.setConfigSampleFlowId(configSampleFlowSub.getId());
+								businessAssayTaskDataDO.setSampleFlowNodeKey(sampleFlowNodeSub.getNodeKey());
+								businessAssayTaskDataDO.setSampleFlowNodeTime(currentDateTime);
+								businessAssayTaskDataDO.setAssayDepartmentId(addAssayTaskConfigAssayMethod.getAssayDepartmentId());
+								businessAssayTaskDataDO.setAssayDepartmentName(addAssayTaskConfigAssayMethod.getAssayDepartmentName());
+								
+								List<ConfigAssayMethodProjectDO> configAssayMethodProjectDOList = configAssayMethodProjectList.stream().filter(f -> f.getConfigAssayMethodId().equals(methodId)).collect(Collectors.toList());
+								
+								StringBuilder assayProjectBuilder = new StringBuilder();
+								
+								for (ConfigAssayMethodProjectDO configAssayMethodProjectDO : configAssayMethodProjectDOList) {
+									
+									//如果当前分析方法的项目不在当前检测项目中，则跳出循环继续
+									if (!projectIdList.contains(configAssayMethodProjectDO.getDictionaryProjectId())) {
+										continue;
+									}
+									
+									DictionaryProjectDO dictionaryProject = dictionaryProjectList.stream().filter(f -> f.getId().equals(configAssayMethodProjectDO.getDictionaryProjectId())).findFirst().orElse(null);
+									assayProjectBuilder.append(dictionaryProject.getShowName()).append(",");
+									
+
+									//检测项目
+									BusinessAssayProjectDataDO businessAssayProjectDataDO = new BusinessAssayProjectDataDO();
+									businessAssayProjectDataDO.setId(IdWorker.getId());
+									businessAssayProjectDataDO.setBusinessAssayTaskDataId(businessAssayTaskDataDO.getId());
+									businessAssayProjectDataDO.setConfigAssayMethodProjectId(configAssayMethodProjectDO.getId());
+									businessAssayProjectDataDO.setDictionaryProjectId(configAssayMethodProjectDO.getDictionaryProjectId());
+									businessAssayProjectDataDO.setDataType(configAssayMethodProjectDO.getDataType());
+									businessAssayProjectDataDO.setDecimalPosition(configAssayMethodProjectDO.getDecimalPosition());
+									businessAssayProjectDataDO.setUsage(QmsCommonConstant.ASSAY_PROJECT_USAGE_INGREDIENT);
+									businessAssayProjectDataDO.setMinimumLimitValue(configAssayMethodProjectDO.getMinimumLimitValue());
+									businessAssayProjectDataDO.setIsEnabled(1);
+									businessAssayProjectDataDO.setIsNotAssessment(0);
+									
+									businessAssayProjectDataDOList.add(businessAssayProjectDataDO);
+									
+									List<ConfigAssayMethodProjectParameterDO> configAssayMethodProjectParameterDOList = configAssayMethodProjectParameterList.stream().filter(f -> f.getConfigAssayMethodProjectId().equals(configAssayMethodProjectDO.getId())).collect(Collectors.toList());
+									for (ConfigAssayMethodProjectParameterDO configAssayMethodProjectParameterDO : configAssayMethodProjectParameterDOList) {
+										BusinessAssayParameterDataDO businessAssayParameterDataDO = new BusinessAssayParameterDataDO();
+										businessAssayParameterDataDO.setId(IdWorker.getId());
+										businessAssayParameterDataDO.setConfigAssayMethodProjectParameterId(configAssayMethodProjectParameterDO.getId());
+										businessAssayParameterDataDO.setBusinessAssayProjectDataId(businessAssayProjectDataDO.getId());
+										businessAssayParameterDataDO.setDictionaryParameterId(configAssayMethodProjectParameterDO.getDictionaryParameterId());
+										businessAssayParameterDataDO.setDataType(configAssayMethodProjectParameterDO.getDataType());
+										businessAssayParameterDataDO.setDecimalPosition(configAssayMethodProjectParameterDO.getDecimalPosition());
+										
+										
+										businessAssayParameterDataDOList.add(businessAssayParameterDataDO);
+									}
+								}
+
+								assayProjectBuilder.delete(assayProjectBuilder.length() - 1 , assayProjectBuilder.length());
+								businessAssayTaskDataDO.setAssayProject(assayProjectBuilder.toString());
+								businessAssayTaskDataDOList.add(businessAssayTaskDataDO);
+							}
+														
+						}
+						
+					}
+					
+				}
+
 				businessSubSampleAnalysisGroupDO = businessSubSampleAnalysisGroupDOList.stream().filter(f -> f.getBusinessSubSampleId().equals(businessSubSampleDO.getId()) && f.getAssayDepartmentId().equals(configAssayMethodDO.getAssayDepartmentId())).findFirst().orElse(null);
 				if (businessSubSampleAnalysisGroupDO == null) {
 					businessSubSampleAnalysisGroupDO = new BusinessSubSampleAnalysisGroupDO();
@@ -523,9 +661,9 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 						businessAssayProjectDataDO.setDataType(configAssayMethodProjectDO.getDataType());
 						businessAssayProjectDataDO.setDecimalPosition(configAssayMethodProjectDO.getDecimalPosition());
 						businessAssayProjectDataDO.setUsage(QmsCommonConstant.ASSAY_PROJECT_USAGE_REPORT);
-						if (isSjEntrust && isAssayAuAg && sort == 0 && !isCreateZhy && sDictionaryProjectId.equals(configAssayMethodProjectDO.getDictionaryProjectId())) {//是商检样品，分析金银，第一个样品，不创建综合样，并且是S值
+//						if (isSjEntrust && isAssayAuAg && sort == 0 && !isCreateZhy && sDictionaryProjectId.equals(configAssayMethodProjectDO.getDictionaryProjectId())) {//是商检样品，分析金银，第一个样品，不创建综合样，并且是S值
-							businessAssayProjectDataDO.setUsage(QmsCommonConstant.ASSAY_PROJECT_USAGE_INGREDIENT_REPORT);
+//							businessAssayProjectDataDO.setUsage(QmsCommonConstant.ASSAY_PROJECT_USAGE_INGREDIENT_REPORT);
-						}
+//						}
 
 						businessAssayProjectDataDO.setMinimumLimitValue(configAssayMethodProjectDO.getMinimumLimitValue());
 						businessAssayProjectDataDO.setIsEnabled(1);
@@ -556,6 +694,7 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 
 			}
 			
+			/**
 			//判定是商检 分析金银 需要创建综合样，样品为第1个
 			if (isSjEntrust && isAssayAuAg && sort == 0 && isCreateZhy && configAssayMethodZhy != null) {
 				Long configAssayMethodIdZhy = configAssayMethodZhy.getId();
@@ -662,6 +801,7 @@ public class SampleEntrustGenSampleDataCmp extends NodeComponent {
 					businessAssayTaskDataDOList.add(businessAssayTaskDataDO);
 				}
 			}
+			**/
 			sort++;
 		}
 		

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

@@ -89,7 +89,7 @@ public class BusinessAssayTaskDataServiceImpl implements BusinessAssayTaskDataSe
 
 	@Override
 	public List<BusinessAssayTaskDataGroupRespVO> getUnAssayTaskGroupList(BusinessAssayTaskDataReqVO reqVO) {
-		System.out.println("查询时租户id：" + TenantContextHolder.getTenantId());
+//		System.out.println("查询时租户id：" + TenantContextHolder.getTenantId());
 		return businessAssayTaskDataMapper.selectUnAssayTaskGroupList(reqVO);
 	}
 

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

@@ -6,15 +6,6 @@ import com.alibaba.fastjson2.JSONObject;
 
 /**
  * <b>SampleAnalysisAuditService</b>
- * <p>
- * 更新历史：
- * <pre> 版本         更新时间            更新者        更新内容<hr/>
- * V1.0      2025年9月29日          wxr         Add</pre>
- * <b>Copyright (C)  云南志者竟成科技有限公司</b> 
- * </p>
- * @author 王兴荣<wxr@wangxingrong.com>
- * @version V1.0 
- * @since 2025年9月29日
  */
 public interface SampleAnalysisAuditService {
 

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

@@ -5,14 +5,6 @@ import com.zt.plat.module.qms.business.bus.controller.vo.*;
 
 /**
  * <b>SampleAnalysisService</b>
- * <p>
- * 更新历史：
- * <pre> 版本         更新时间            更新者        更新内容<hr/>
- * V1.0      2025年9月22日          wxr         Add</pre>
- * <b>Copyright (C)  云南志者竟成科技有限公司</b> 
- * </p>
- * @author 王兴荣<wxr@wangxingrong.com>
- * @version V1.0 
  * @since 2025年9月22日
  */
 public interface SampleAnalysisService {

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

@@ -561,24 +561,24 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
 						BusinessSampleEntrustDetailDO businessSampleEntrustDetailDO = businessSampleEntrustDetailMapper.selectByBusinessBaseSampleId(businessAssayTaskDataDO.getBusinessBaseSampleId());
 						String forecastResult = businessSampleEntrustDetailDO.getForecastResult();//预报品位
 						if (StringUtils.isBlank(forecastResult)) {
-							//2 查询当前样品其他分析方法的结果
+							//2 查询当前样品其他分析方法的结果 (废弃-20251202)
-							List<Long> businessSubParentSampleIdList = Arrays.asList(businessAssayTaskDataDO.getBusinessSubParentSampleId());
+//							List<Long> businessSubParentSampleIdList = Arrays.asList(businessAssayTaskDataDO.getBusinessSubParentSampleId());
-							List<BusinessSubParentSampleAssessmentProjectExtendRespVO> businessSubParentSampleAssessmentProjectList = businessSubParentSampleAssessmentProjectMapper.selectByBusinessSubParentSampleIdsAndConfigAssayMethodId(businessSubParentSampleIdList, configMethodId);
+//							List<BusinessSubParentSampleAssessmentProjectExtendRespVO> businessSubParentSampleAssessmentProjectList = businessSubParentSampleAssessmentProjectMapper.selectByBusinessSubParentSampleIdsAndConfigAssayMethodId(businessSubParentSampleIdList, configMethodId);
-							BusinessSubParentSampleAssessmentProjectExtendRespVO businessSubParentSampleAssessmentProject = businessSubParentSampleAssessmentProjectList.stream().filter(f -> f.getSimpleName().equals(sourceProject)).findFirst().orElse(null);
+//							BusinessSubParentSampleAssessmentProjectExtendRespVO businessSubParentSampleAssessmentProject = businessSubParentSampleAssessmentProjectList.stream().filter(f -> f.getSimpleName().equals(sourceProject)).findFirst().orElse(null);
-							if (businessSubParentSampleAssessmentProject == null || StringUtils.isBlank(businessSubParentSampleAssessmentProject.getAssessmentValue())) {
+//							if (businessSubParentSampleAssessmentProject == null || StringUtils.isBlank(businessSubParentSampleAssessmentProject.getAssessmentValue())) {
 
 								//3 查询当前批次委托的第一个样品对应的分析方法的结果
 								BusinessSampleEntrustDetailDO currBatchFirstBusinessSampleEntrustDetailDO = businessSampleEntrustDetailMapper.selectCurrBatchFirstByBusinessBaseSampleId(businessAssayTaskDataDO.getBusinessBaseSampleId());
 								List<BusinessSubParentSampleDO> currBusinessSubParentSampleDOList = businessSubParentSampleMapper.selectByBusinessBaseSampleId(currBatchFirstBusinessSampleEntrustDetailDO.getBusinessBaseSampleId());
 								List<Long> currBusinessSubParentSampleIdList = currBusinessSubParentSampleDOList.stream().map(m -> m.getId()).collect(Collectors.toList());
-								businessSubParentSampleAssessmentProjectList = businessSubParentSampleAssessmentProjectMapper.selectByBusinessSubParentSampleIdsAndConfigAssayMethodId(currBusinessSubParentSampleIdList, configMethodId);
+								List<BusinessSubParentSampleAssessmentProjectExtendRespVO> businessSubParentSampleAssessmentProjectList = businessSubParentSampleAssessmentProjectMapper.selectByBusinessSubParentSampleIdsAndConfigAssayMethodId(currBusinessSubParentSampleIdList, configMethodId);
-								businessSubParentSampleAssessmentProject = businessSubParentSampleAssessmentProjectList.stream().filter(f -> f.getSimpleName().equals(sourceProject)).findFirst().orElse(null);
+								BusinessSubParentSampleAssessmentProjectExtendRespVO businessSubParentSampleAssessmentProject = businessSubParentSampleAssessmentProjectList.stream().filter(f -> f.getSimpleName().equals(sourceProject)).findFirst().orElse(null);
 								if (businessSubParentSampleAssessmentProject != null && StringUtils.isNotBlank(businessSubParentSampleAssessmentProject.getAssessmentValue())) {
 									businessAssayParameterDataDO.setValue(businessSubParentSampleAssessmentProject.getAssessmentValue());
 								}
-							} else {
+//							} else {
-								businessAssayParameterDataDO.setValue(businessSubParentSampleAssessmentProject.getAssessmentValue());
+//								businessAssayParameterDataDO.setValue(businessSubParentSampleAssessmentProject.getAssessmentValue());
-							}
+//							}
 							
 							
 						} else {

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigSubSampleMethodConfAdd.java

@@ -0,0 +1,19 @@
+package com.zt.plat.module.qms.business.config.controller.vo;
+
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class ConfigSubSampleMethodConfAdd {
+
+	/** 分析方法id **/
+	private Long methodId;
+	
+	/** 检测项目 **/
+	private List<Long> projectIdList;
+	
+	/** 条件 需要存在分析的检测项目，才添加分析方法 **/
+	private List<Long> conditionProjectIdList;
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/vo/ConfigSubSampleMethodConfInfo.java

@@ -7,6 +7,9 @@ import lombok.Data;
 @Data
 public class ConfigSubSampleMethodConfInfo {
 	
+	/** 添加分析任务 **/
+	private ConfigSubSampleMethodConfAdd addAssayTask;
+
 	/** 分析方法参数取值配置 **/
 	private List<ConfigSubSampleMethodConfItem> getParam;
 	

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

@@ -10,7 +10,7 @@
      -->
      
      <select id="selectUnAssayTaskGroupList" resultType="com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDataGroupRespVO">
-         SELECT
+        SELECT
             tbatd.CFG_ASY_MTHD_ID AS configAssayMethodId,
             tcam.NAME AS configAssayMethodName,
             COUNT(tbatd.ID) AS sampleTaskCount
@@ -18,11 +18,15 @@
             T_BSN_ASY_TSK_DAT tbatd
         LEFT JOIN T_CFG_ASY_MTHD tcam ON
             tbatd.CFG_ASY_MTHD_ID = tcam.ID
+        LEFT JOIN T_BSN_SB_SMP_ANL_GRP tbssag ON
+            tbatd.BSN_SB_SMP_ID = tbssag.BSN_SB_SMP_ID
+            AND tbatd.ASY_DEPT_ID = tbssag.ASY_DEPT_ID
         WHERE
             tbatd.DELETED = 0
             AND tcam.DELETED = 0
             AND tbatd.IS_ASN_TSKD = 0
             AND tbatd.IS_RPOD = 0
+            AND tbssag.SMP_STS = '已收样'
       <if test="reqVO.assayDepartmentId != null and reqVO.assayDepartmentId != ''">
             AND tbatd.ASY_DEPT_ID = #{reqVO.assayDepartmentId}
       </if>