发起复检委托

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

@@ -68,5 +68,15 @@ public interface BusinessAssayParameterDataMapper extends BaseMapperX<BusinessAs
                 .eqIfPresent(BusinessAssayParameterDataDO::getRemark, reqVO.getRemark())
                 .orderByDesc(BusinessAssayParameterDataDO::getId));
     }
+    
+    default List<BusinessAssayParameterDataDO> selectByBusinessAssayProjectDataId(Long businessAssayProjectDataId) {
+    	return selectList(new LambdaQueryWrapperX<BusinessAssayParameterDataDO>()
+    			.eq(BusinessAssayParameterDataDO::getBusinessAssayProjectDataId, businessAssayProjectDataId));
+    }
+    
+    default List<BusinessAssayParameterDataDO> selectByBusinessAssayProjectDataIds(List<Long> businessAssayProjectDataIds) {
+    	return selectList(new LambdaQueryWrapperX<BusinessAssayParameterDataDO>()
+    			.in(BusinessAssayParameterDataDO::getBusinessAssayProjectDataId, businessAssayProjectDataIds));
+    }
 
 }

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

@@ -85,6 +85,16 @@ public interface BusinessAssayProjectDataMapper extends BaseMapperX<BusinessAssa
     			.eq(BusinessAssayProjectDataDO::getBusinessAssayTaskDataId, businessAssayTaskDataId));
     }
     
+    default List<BusinessAssayProjectDataExtendRespVO> selectByBusinessAssayTaskDataIds(List<Long> businessAssayTaskDataIds) {
+    	return selectJoinList(BusinessAssayProjectDataExtendRespVO.class, new MPJLambdaWrapperX<BusinessAssayProjectDataDO>()
+				.leftJoin(DictionaryProjectDO.class, DictionaryProjectDO::getId, BusinessAssayProjectDataDO::getDictionaryProjectId)
+				.selectAll(BusinessAssayProjectDataDO.class)
+				.selectAs(DictionaryProjectDO::getKey, BusinessAssayProjectDataExtendRespVO::getDictionaryProjectKey)
+				.selectAs(DictionaryProjectDO::getSimpleName, BusinessAssayProjectDataExtendRespVO::getSimpleName)
+				.selectAs(DictionaryProjectDO::getShowName, BusinessAssayProjectDataExtendRespVO::getShowName)
+    			.in(BusinessAssayProjectDataDO::getBusinessAssayTaskDataId, businessAssayTaskDataIds));
+    }
+    
     default List<BusinessAssayProjectDataExtendRespVO> selectAnalysisBy(BusinessAssayProjectDataReqVO reqVO) {
     	return selectJoinList(BusinessAssayProjectDataExtendRespVO.class, new MPJLambdaWrapperX<BusinessAssayProjectDataDO>()
     			.leftJoin(BusinessAssayTaskDataDO.class, BusinessAssayTaskDataDO::getId, BusinessAssayProjectDataDO::getBusinessAssayTaskDataId)

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

@@ -189,4 +189,25 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
 		return selectList(queryWrapper);
 	}
 
+	/**
+	 * 查询最大分析次数的检测任务数据
+	 * @param businessSubSampleId 子样id
+	 * @param configAssayMethodId 分析方法
+	 * @return
+	 */
+	default List<BusinessAssayTaskDataDO> selectMaxAnalysisCountByBusinessSubSampleIdAndConfigAssayMethodId(Long businessSubSampleId, Long configAssayMethodId) {
+		BusinessAssayTaskDataDO maxAnalysisCount = selectOne(new LambdaQueryWrapperX<BusinessAssayTaskDataDO>()
+				.eq(BusinessAssayTaskDataDO::getBusinessSubSampleId, businessSubSampleId)
+				.eq(BusinessAssayTaskDataDO::getConfigAssayMethodId, configAssayMethodId)
+				.orderByDesc(BusinessAssayTaskDataDO::getAnalysisCount)
+				.last("LIMIT 1"));
+		
+		return selectList(new LambdaQueryWrapperX<BusinessAssayTaskDataDO>()
+				.eq(BusinessAssayTaskDataDO::getBusinessSubSampleId, businessSubSampleId)
+				.eq(BusinessAssayTaskDataDO::getConfigAssayMethodId, configAssayMethodId)
+				.eq(BusinessAssayTaskDataDO::getAnalysisCount, maxAnalysisCount.getAnalysisCount()));
+		
+		
+	}
+
 }