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

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSubParentSampleAssessmentProjectDO.java

@@ -38,6 +38,11 @@ public class BusinessSubParentSampleAssessmentProjectDO extends BusinessBaseDO {
     @TableField("BSN_SB_PRN_SMP_ID")
     private Long businessSubParentSampleId;
     /**
+    * 班组判定数据业务ID
+    */
+    @TableField("BSN_SB_PRN_SMP_ASMT_ID")
+    private Long businessSubParentSampleAssessmentId;
+    /**
     * 检测项目ID,字典表【T_DIC_PRJ】
     */
     @TableField("DIC_PRJ_ID")

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

@@ -35,4 +35,17 @@ public interface BusinessSubParentSampleAssessmentMapper extends BaseMapperX<Bus
                 .orderByDesc(BusinessSubParentSampleAssessmentDO::getId));
     }
     
+    default BusinessSubParentSampleAssessmentDO selectByBusinessSubParentSampleIdAndConfigAssayMethodId(Long businessSubParentSampleId, Long configAssayMethodId) {
+    	return selectOne(new LambdaQueryWrapperX<BusinessSubParentSampleAssessmentDO>()
+    			.eq(BusinessSubParentSampleAssessmentDO::getBusinessSubParentSampleId, businessSubParentSampleId)
+    			.eq(BusinessSubParentSampleAssessmentDO::getConfigAssayMethodId, configAssayMethodId));
+    }
+
+    default List<BusinessSubParentSampleAssessmentDO> selectByBusinessSubParentSampleIdsAndConfigAssayMethodId(List<Long> businessSubParentSampleIds,
+			Long configAssayMethodId) {
+    	return selectList(new LambdaQueryWrapperX<BusinessSubParentSampleAssessmentDO>()
+    			.in(BusinessSubParentSampleAssessmentDO::getBusinessSubParentSampleId, businessSubParentSampleIds)
+    			.eq(BusinessSubParentSampleAssessmentDO::getConfigAssayMethodId, configAssayMethodId));
+    }
+
 }

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

@@ -37,7 +37,7 @@ public interface BusinessSubSampleAssessmentMapper extends BaseMapperX<BusinessS
                 .orderByDesc(BusinessSubSampleAssessmentDO::getId));
     }
     
-    default BusinessSubSampleAssessmentDO selectByBusinessSubSampleIdsAndConfigAssayMethodId(Long businessSubSampleId, Long configAssayMethodId) {
+    default BusinessSubSampleAssessmentDO selectByBusinessSubSampleIdAndConfigAssayMethodId(Long businessSubSampleId, Long configAssayMethodId) {
     	return selectOne(new LambdaQueryWrapperX<BusinessSubSampleAssessmentDO>()
     			.eq(BusinessSubSampleAssessmentDO::getBusinessSubSampleId, businessSubSampleId)
     			.eq(BusinessSubSampleAssessmentDO::getConfigAssayMethodId, configAssayMethodId));

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

@@ -209,6 +209,20 @@ public interface BusinessSubSampleMapper extends BaseMapperX<BusinessSubSampleDO
                 .orderByDesc(BusinessSubSampleDO::getId));
 	}
 
+	default BusinessSubSampleExtendRespVO getBySampleCode(BusinessSubSampleReqVO reqVO) {
+		return selectJoinOne(BusinessSubSampleExtendRespVO.class, new MPJLambdaWrapperX<BusinessSubSampleDO>()
+        		.leftJoin(DictionaryBusinessDO.class, DictionaryBusinessDO::getId, BusinessSubSampleDO::getDictionaryBusinessId)
+        		.leftJoin(ConfigSubSampleDO.class, ConfigSubSampleDO::getId, BusinessSubSampleDO::getConfigSubSampleId)
+        		.selectAll(BusinessSubSampleDO.class)
+        		.selectAs(DictionaryBusinessDO::getName, BusinessSubSampleExtendRespVO::getDictionaryBusinessName)
+        		.selectAs(ConfigSubSampleDO::getIsPrint, BusinessSubSampleExtendRespVO::getIsPrint)
+        		.selectAs(ConfigSubSampleDO::getPrintTemplate, BusinessSubSampleExtendRespVO::getPrintTemplate)
+                .eqIfPresent(BusinessSubSampleDO::getSampleCode, reqVO.getSampleCode())
+                .eqIfPresent(BusinessSubSampleDO::getSampleStatus, QmsCommonConstant.NORMAL)
+                .eqIfPresent(BusinessSubSampleDO::getIsEnabled, QmsCommonConstant.YES)
+                .orderByDesc(BusinessSubSampleDO::getId));
+	}
+
 	default BusinessSubSampleExtendRespVO getBySampleCodeAndFlowKey(BusinessSubSampleReqVO reqVO) {
 		return selectJoinOne(BusinessSubSampleExtendRespVO.class, new MPJLambdaWrapperX<BusinessSubSampleDO>()
         		.leftJoin(DictionaryBusinessDO.class, DictionaryBusinessDO::getId, BusinessSubSampleDO::getDictionaryBusinessId)

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

@@ -202,13 +202,16 @@ public class BusinessSubSampleServiceImpl implements BusinessSubSampleService {
 	@Override
 	public BusinessSubSampleExtendRespVO getBySampleCodeAndFlowKey(@Valid BusinessSubSampleReqVO reqVO) {
         LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
-		BusinessSubSampleExtendRespVO subSample = businessSubSampleMapper.getBySampleCodeAndFlowKey(reqVO);
+        BusinessSubSampleExtendRespVO subSample = null;
 		if (QmsCommonConstant.FLOW_NODE_TEAM_RECEIVE.equals(reqVO.getSampleFlowNodeKey())) {
+			subSample = businessSubSampleMapper.getBySampleCode(reqVO);
 			List<BusinessSubSampleAnalysisGroupDO> businessSubSampleAnalysisGroupList = businessSubSampleAnalysisGroupMapper.selectByBusinessSubSampleId(subSample.getId());
 			BusinessSubSampleAnalysisGroupDO receiveSample = businessSubSampleAnalysisGroupList.stream().filter(f -> "已收样".equals(f.getSampleStatus()) && !f.getAssayDepartmentId().equals(loginUser.getVisitDeptId())).findFirst().orElse(null);
 			if (receiveSample != null) {
 				throw new ServiceException(1_032_100_000, "当前样品在" + receiveSample.getAssayDepartmentName() + "，不允许收样！");
 			}
+		} else {
+			subSample = businessSubSampleMapper.getBySampleCodeAndFlowKey(reqVO);
 		}
 		return subSample;
 	}

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

@@ -36,6 +36,7 @@ import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayProjectDa
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayReportDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessBaseSampleDO;
+import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleAssessmentProjectDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubParentSampleDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAnalysisGroupDO;
@@ -47,6 +48,7 @@ import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayProjectDataMa
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayReportDataMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessAssayTaskDataMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessBaseSampleMapper;
+import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubParentSampleAssessmentMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubParentSampleAssessmentProjectMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubParentSampleMapper;
 import com.zt.plat.module.qms.business.bus.dal.mapper.BusinessSubSampleAnalysisGroupMapper;
@@ -410,6 +412,9 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 	@Resource
 	private BusinessSubSampleAnalysisGroupMapper businessSubSampleAnalysisGroupMapper;
 	
+	@Resource
+	private BusinessSubParentSampleAssessmentMapper businessSubParentSampleAssessmentMapper;
+
 	@Resource
 	private SampleFlowService sampleFlowService;
 	
@@ -431,6 +436,8 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 		
 		List<BusinessSubParentSampleDO> businessSubParentSampleDOList = businessSubParentSampleMapper.selectByIds(reqVO.getBusinessSubParentSampleIds());
 		
+//		List<BusinessSubParentSampleAssessmentDO> businessSubParentSampleAssessmentDOList = businessSubParentSampleAssessmentMapper.selectByBusinessSubParentSampleIdsAndConfigAssayMethodId(reqVO.getBusinessSubParentSampleIds(), reqVO.getConfigAssayMethodId());
+
 		//循环分样主样数据
 		for (BusinessSubParentSampleDO businessSubParentSampleDO : businessSubParentSampleDOList) {
 			
@@ -572,6 +579,14 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
 				.set(BusinessSubParentSampleAssessmentProjectDO::getReportTime, LocalDateTime.now())
 				.in(BusinessSubParentSampleAssessmentProjectDO::getId, businessSubParentSampleAssessmentIdList));
 
+		businessSubParentSampleAssessmentMapper.update(new LambdaUpdateWrapper<BusinessSubParentSampleAssessmentDO>()
+				.set(BusinessSubParentSampleAssessmentDO::getIsReported, QmsCommonConstant.YES)
+				.set(BusinessSubParentSampleAssessmentDO::getReporter, nickName)
+				.set(BusinessSubParentSampleAssessmentDO::getReportTime, LocalDateTime.now())
+				.in(BusinessSubParentSampleAssessmentDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleIds())
+				.eq(BusinessSubParentSampleAssessmentDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId()));
+		
+		
 		if (updateBusinessSubSampleDOList.size() > 0) {
 
 			SampleFlowParam sampleFlowParam = new SampleFlowParam();