结果判定等处理

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

@@ -42,8 +42,8 @@ public class SampleAnalysisAuditController implements BusinessControllerMarker {
 	}
 	
 	@GetMapping("/getSampleResultAssessmentList")
-	public CommonResult<JSONObject> getSampleResultAssessmentList(Long configAssayMethodId, String asmtReportedStatus) {
+	public CommonResult<JSONObject> getSampleResultAssessmentList(BusinessAssayTaskDataReqVO reqVO) {
-		JSONObject result = sampleAnalysisAuditService.getSampleResultAssessmentList(configAssayMethodId, asmtReportedStatus);
+		JSONObject result = sampleAnalysisAuditService.getSampleResultAssessmentList(reqVO);
 		return success(result);
 	}
 	

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

@@ -108,6 +108,10 @@ public class BusinessAssayTaskDataReqVO {
     @Schema(description = "检测方法配置名称")
     private String configAssayMethodName;
 
+    @Schema(description = "收样时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] sampleReceiveTime;
+
     @Schema(description = "样品编号")
     private String sampleCode;
 

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

@@ -136,7 +136,7 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
         if (ObjectUtil.isNotEmpty(reqVO.getSampleStatus())) {
     		mpjLambdaWrapper.eq(BusinessSubSampleAnalysisGroupDO::getSampleStatus, reqVO.getSampleStatus());
 		}
-        mpjLambdaWrapper.orderByDesc(BusinessAssayTaskDataDO::getId);
+        mpjLambdaWrapper.orderByAsc(BusinessAssayTaskDataDO::getSampleFlowNodeTime);
 		return selectJoinList(BusinessAssayTaskDataExtendRespVO.class, mpjLambdaWrapper);
     }
 
@@ -238,7 +238,7 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
         if (ObjectUtil.isNotEmpty(reqVO.getSampleStatus())) {
     		mpjLambdaWrapper.eq(BusinessSubSampleAnalysisGroupDO::getSampleStatus, reqVO.getSampleStatus());
 		}
-        mpjLambdaWrapper.orderByDesc(BusinessAssayTaskDataDO::getId);
+        mpjLambdaWrapper.orderByAsc(BusinessAssayTaskDataDO::getSampleFlowNodeTime);
         return selectJoinPage(reqVO, BusinessAssayTaskDataExtendRespVO.class, mpjLambdaWrapper);
     }
     
@@ -302,6 +302,9 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
 					break;
 			}
 		}
+		if (ObjectUtil.isNotEmpty(reqVO.getSampleReceiveTime()) && reqVO.getSampleReceiveTime().length == 2) {
+			mpjLambdaWrapper.between(BusinessSubSampleAnalysisGroupDO::getSampleReceiveTime, reqVO.getSampleReceiveTime()[0], reqVO.getSampleReceiveTime()[1]);
+		}
 		mpjLambdaWrapper.eq(BusinessSubSampleAnalysisGroupDO::getSampleStatus, "已收样");//已收样
 		mpjLambdaWrapper.orderByAsc(BusinessAssayTaskDataDO::getBusinessSubSampleId).orderByAsc(BusinessAssayTaskDataDO::getReportTime);
 		

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

@@ -49,7 +49,7 @@ public interface BusinessAssayTaskDetailMapper extends BaseMapperX<BusinessAssay
                 .eqIfPresent(BusinessAssayTaskDetailDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .betweenIfPresent(BusinessAssayTaskDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(BusinessAssayTaskDetailDO::getRemark, reqVO.getRemark())
-                .orderByDesc(BusinessAssayTaskDetailDO::getId));
+    			.orderByAsc(BusinessAssayTaskDetailDO::getSampleCode));
     }
     
     default List<BusinessAssayTaskDetailExtendRespVO> selectList(BusinessAssayTaskDetailReqVO reqVO) {
@@ -80,7 +80,7 @@ public interface BusinessAssayTaskDetailMapper extends BaseMapperX<BusinessAssay
                 .eqIfPresent(BusinessAssayTaskDetailDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode())
                 .betweenIfPresent(BusinessAssayTaskDetailDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(BusinessAssayTaskDetailDO::getRemark, reqVO.getRemark())
-    			.orderByDesc(BusinessAssayTaskDetailDO::getId));
+    			.orderByAsc(BusinessAssayTaskDetailDO::getSampleCode));
     }
 
 	default List<BusinessAssayTaskDetailDO> selectByBusinessAssayTaskId(Long businessAssayTaskId) {

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

@@ -3,6 +3,7 @@ package com.zt.plat.module.qms.business.bus.service;
 import java.util.List;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDataReqVO;
 
 /**
  * <b>SampleAnalysisAuditService</b>
@@ -13,7 +14,7 @@ public interface SampleAnalysisAuditService {
 	
 	void crossAuditByByTaskId(Long businessAssayTaskId, String auditStatus);
 
-	JSONObject getSampleResultAssessmentList(Long configAssayMethodId, String asmtReportedStatus);
+	JSONObject getSampleResultAssessmentList(BusinessAssayTaskDataReqVO reqVO);
 
 	JSONObject getParallelResultAssessment(Long businessSubSampleId, Long configAssayMethodId);
 

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

@@ -152,7 +152,9 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 	private ConfigSubSampleMethodMapper configSubSampleMethodMapper;
 
 	@Override
-	public JSONObject getSampleResultAssessmentList(Long configAssayMethodId, String asmtReportedStatus) {
+	public JSONObject getSampleResultAssessmentList(BusinessAssayTaskDataReqVO reqVO) {
+		Long configAssayMethodId = reqVO.getConfigAssayMethodId();
+		String asmtReportedStatus = reqVO.getAsmtReportedStatus();
 		List<ConfigAssayMethodProjectExtendRespVO> configAssayMethodProjectDOList = configAssayMethodProjectMapper.selectByConfigAssayMethodId(configAssayMethodId);
 		List<Map<String, Object>> columnList = new ArrayList<>();
 
@@ -173,6 +175,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
 		BusinessAssayTaskDataReqVO search = new BusinessAssayTaskDataReqVO();
 		search.setConfigAssayMethodId(configAssayMethodId);
 		search.setAsmtReportedStatus(asmtReportedStatus);
+		search.setSampleReceiveTime(reqVO.getSampleReceiveTime());
 		List<BusinessAssayTaskDataExtendRespVO> resultAssessmentList = businessAssayTaskDataMapper.selectResultAssessmentList(search);
 		
 		for (BusinessAssayTaskDataExtendRespVO businessAssayTaskDataExtendRespVO : resultAssessmentList) {

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

@@ -81,6 +81,9 @@
                 AND tbssag.SMP_STS = '已收样'
           <if test="reqVO.assayDepartmentId != null and reqVO.assayDepartmentId != ''">
                 AND tbssag.ASY_DEPT_ID = #{reqVO.assayDepartmentId}
+          </if>
+          <if test="reqVO.sampleReceiveTime != null and reqVO.sampleReceiveTime.length == 2">
+                AND tbssag.SMP_RCV_TM BETWEEN #{reqVO.sampleReceiveTime[0]} AND #{reqVO.sampleReceiveTime[1]}
           </if>
             GROUP BY
                 tbatd.TENANT_ID ,
@@ -96,6 +99,9 @@
             t.CFG_ASY_MTHD_ID = tcam.ID
             AND t.TENANT_ID = tcam.TENANT_ID
         WHERE t.RPOD_STS in ('pending_report', 'pending_assessment', 're_inspected')
+          <if test="reqVO.configAssayMethodName != null and reqVO.configAssayMethodName != ''">
+                AND tcam.NAME like  '%' || #{reqVO.configAssayMethodName} || '%'
+          </if>
         GROUP BY
             t.CFG_ASY_MTHD_ID,
             t.ASY_TP,

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

@@ -39,7 +39,7 @@
                 AND tbssa.RPOD_STS = 'reported'
                 AND tbspsa.IS_RPOD = 0
           <if test="reqVO.configAssayMethodName != null and reqVO.configAssayMethodName != ''">
-                AND tcam.NAME like  '%' || #{reqVO.assayDepartmentId} || '%'
+                AND tcam.NAME like  '%' || #{reqVO.configAssayMethodName} || '%'
           </if>
           <if test="reqVO.assayDepartmentId != null and reqVO.assayDepartmentId != ''">
                 AND tcam.ASY_DEPT_ID = #{reqVO.assayDepartmentId}