质控样移除

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

@@ -89,9 +89,15 @@ public class BusinessStandardSampleController implements BusinessControllerMarke
         return success(BeanUtils.toBean(pageResult, BusinessStandardSampleRespVO.class));
     }
     
-    @GetMapping("/getBusinessStandardSampleByConfigQCSampleMethodId")
+//    @GetMapping("/getBusinessStandardSampleByConfigQCSampleMethodId")
-    public CommonResult<?> getBusinessStandardSampleByConfigQCSampleMethodId(@RequestParam("configQCSampleMethodId") Long configQCSampleMethodId) {
+//    public CommonResult<?> getBusinessStandardSampleByConfigQCSampleMethodId(@RequestParam("configQCSampleMethodId") Long configQCSampleMethodId) {
-    	List<BusinessStandardSampleExtendRespVO> list = businessStandardSampleService.getBusinessStandardSampleByConfigQCSampleMethodId(configQCSampleMethodId);
+//    	List<BusinessStandardSampleExtendRespVO> list = businessStandardSampleService.getBusinessStandardSampleByConfigQCSampleMethodId(configQCSampleMethodId);
+//    	return success(list);
+//	}
+    
+    @GetMapping("/getBusinessStandardSampleLeafList")
+    public CommonResult<?> getBusinessStandardSampleLeafList() {
+    	List<BusinessStandardSampleExtendRespVO> list = businessStandardSampleService.getBusinessStandardSampleLeafList();
     	return success(list);
 	}
 

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

@@ -86,6 +86,12 @@ public class SampleTaskAssignController {
 		sampleTaskAssignService.createQcSample(req);
 		return success("成功");
 	}
+	
+	@PostMapping("/deleteQcSample")
+	public CommonResult<?> deleteQcSample(@RequestBody DeleteQcSampleReqVO req) {
+		sampleTaskAssignService.deleteQcSample(req);
+		return success("成功");
+	}
     
     @PostMapping("/submitAssign")
     public CommonResult<?> submitAssign(Long id) {

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

@@ -44,7 +44,7 @@ public class BusinessAssayTaskAnalysisSampleAndQcProjectRespVO {
     private String formValue;
 
     /** 质量控制分析方法 **/
-    private List<ConfigQCSampleMethodExtendRespVO> configQCSampleMethodList;
+    //private List<ConfigQCSampleMethodExtendRespVO> configQCSampleMethodList;
     
     /** 分配任务的分析数据 **/
     private List<BusinessAssayTaskAnalysisDataRespVO> assayTaskAnalysisDataList;

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

@@ -0,0 +1,19 @@
+package com.zt.plat.module.qms.business.bus.controller.vo;
+
+import java.util.List;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class DeleteQcSampleReqVO {
+
+    @Schema(description = "质控类型_ID,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样", example = "9549")
+    private Long dictionaryBusinessId;
+
+    @Schema(description = "质控类型_Key,字典表【T_DIC_BSN】质控类型：空白样、管理样、标准样、标样")
+    private String dictionaryBusinessKey;
+    
+    @Schema(description = "质控样id")
+    private List<Long> qcSampleIdList;
+}

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

@@ -73,4 +73,14 @@ public interface BusinessQCManagementProjectDataMapper extends BaseMapperX<Busin
                 .eqIfPresent(BusinessQCManagementProjectDataDO::getRemark, reqVO.getRemark())
                 .orderByAsc(ConfigAssayMethodProjectDO::getSortNo));
 	}
+	
+	default List<BusinessQCManagementProjectDataDO> selectByBusinessQCManagementDataId(Long businessQCManagementDataId) {
+		return selectList(new LambdaQueryWrapperX<BusinessQCManagementProjectDataDO>()
+				.eq(BusinessQCManagementProjectDataDO::getBusinessQCManagementDataId, businessQCManagementDataId));
+	}
+	
+	default List<BusinessQCManagementProjectDataDO> selectByBusinessQCManagementDataIds(List<Long> businessQCManagementDataIds) {
+		return selectList(new LambdaQueryWrapperX<BusinessQCManagementProjectDataDO>()
+				.in(BusinessQCManagementProjectDataDO::getBusinessQCManagementDataId, businessQCManagementDataIds));
+	}
 }

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

@@ -4,10 +4,8 @@ import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessStandardSamplePageReqVO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessStandardSampleDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessStandardSampleProjectDO;
-import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigQCStandardSampleDO;
 import com.zt.plat.module.qms.enums.QmsCommonConstant;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 
@@ -38,15 +36,26 @@ public interface BusinessStandardSampleMapper extends BaseMapperX<BusinessStanda
     }
 
     
-    default List<BusinessStandardSampleExtendRespVO> selectByConfigQCSampleMethodId(Long configQCSampleMethodId) {
+//    default List<BusinessStandardSampleExtendRespVO> selectByConfigQCSampleMethodId(Long configQCSampleMethodId) {
+//    	return selectJoinList(BusinessStandardSampleExtendRespVO.class, new MPJLambdaWrapperX<BusinessStandardSampleDO>()
+//    			.rightJoin(ConfigQCStandardSampleDO.class, ConfigQCStandardSampleDO::getBusinessStandardSampleId, BusinessStandardSampleDO::getId)
+//    			.selectAll(BusinessStandardSampleDO.class)
+//    			.selectAs(ConfigQCStandardSampleDO::getConfigQCSampleMethodId, BusinessStandardSampleExtendRespVO::getConfigQCSampleMethodId)
+//    			.selectCollection(BusinessStandardSampleProjectDO.class, BusinessStandardSampleExtendRespVO::getStandardSampleProjectList)
+//    			.leftJoin(BusinessStandardSampleProjectDO.class, BusinessStandardSampleProjectDO::getBusinessStandardSampleId, BusinessStandardSampleDO::getId)
+//                .eq(ConfigQCStandardSampleDO::getConfigQCSampleMethodId, configQCSampleMethodId)
+//                .eq(BusinessStandardSampleDO::getIsPublish, QmsCommonConstant.YES)
+//                .eq(BusinessStandardSampleDO::getIsUse, QmsCommonConstant.YES));
+//    }
+
+
+	default List<BusinessStandardSampleExtendRespVO> getBusinessStandardSampleLeafList() {
     	return selectJoinList(BusinessStandardSampleExtendRespVO.class, new MPJLambdaWrapperX<BusinessStandardSampleDO>()
-    			.rightJoin(ConfigQCStandardSampleDO.class, ConfigQCStandardSampleDO::getBusinessStandardSampleId, BusinessStandardSampleDO::getId)
     			.selectAll(BusinessStandardSampleDO.class)
-    			.selectAs(ConfigQCStandardSampleDO::getConfigQCSampleMethodId, BusinessStandardSampleExtendRespVO::getConfigQCSampleMethodId)
     			.selectCollection(BusinessStandardSampleProjectDO.class, BusinessStandardSampleExtendRespVO::getStandardSampleProjectList)
     			.leftJoin(BusinessStandardSampleProjectDO.class, BusinessStandardSampleProjectDO::getBusinessStandardSampleId, BusinessStandardSampleDO::getId)
-                .eq(ConfigQCStandardSampleDO::getConfigQCSampleMethodId, configQCSampleMethodId)
+    			.ne(BusinessStandardSampleDO::getParentId, 0)
                 .eq(BusinessStandardSampleDO::getIsPublish, QmsCommonConstant.YES)
                 .eq(BusinessStandardSampleDO::getIsUse, QmsCommonConstant.YES));
-    }
+	}
 }

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

@@ -60,6 +60,8 @@ public interface BusinessStandardSampleService {
      */
     PageResult<BusinessStandardSampleDO> getBusinessStandardSamplePage(BusinessStandardSamplePageReqVO pageReqVO);
 
-	List<BusinessStandardSampleExtendRespVO> getBusinessStandardSampleByConfigQCSampleMethodId(Long configQCSampleMethodId);
+	//List<BusinessStandardSampleExtendRespVO> getBusinessStandardSampleByConfigQCSampleMethodId(Long configQCSampleMethodId);
+
+	List<BusinessStandardSampleExtendRespVO> getBusinessStandardSampleLeafList();
 
 }

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

@@ -88,9 +88,14 @@ public class BusinessStandardSampleServiceImpl implements BusinessStandardSample
         return businessStandardSampleMapper.selectPage(pageReqVO);
     }
 
+//	@Override
+//	public List<BusinessStandardSampleExtendRespVO> getBusinessStandardSampleByConfigQCSampleMethodId(Long configQCSampleMethodId) {
+//		return businessStandardSampleMapper.selectByConfigQCSampleMethodId(configQCSampleMethodId);
+//	}
+
 	@Override
-	public List<BusinessStandardSampleExtendRespVO> getBusinessStandardSampleByConfigQCSampleMethodId(Long configQCSampleMethodId) {
+	public List<BusinessStandardSampleExtendRespVO> getBusinessStandardSampleLeafList() {
-		return businessStandardSampleMapper.selectByConfigQCSampleMethodId(configQCSampleMethodId);
+		return businessStandardSampleMapper.getBusinessStandardSampleLeafList();
 	}
 
 }

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

@@ -378,8 +378,8 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
 		
 		businessAssayTaskAnalysisSampleAndQcProjectRespVO.setAssayTaskAnalysisDataList(assayTaskAnalysisDataList);
 
-		List<ConfigQCSampleMethodExtendRespVO> configQCSampleMethodList = configQCSampleMethodMapper.selectByConfigAssayMethodId(businessAssayTaskDO.getConfigAssayMethodId());
+//		List<ConfigQCSampleMethodExtendRespVO> configQCSampleMethodList = configQCSampleMethodMapper.selectByConfigAssayMethodId(businessAssayTaskDO.getConfigAssayMethodId());
-    	businessAssayTaskAnalysisSampleAndQcProjectRespVO.setConfigQCSampleMethodList(configQCSampleMethodList);
+//    	businessAssayTaskAnalysisSampleAndQcProjectRespVO.setConfigQCSampleMethodList(configQCSampleMethodList);
 		
         //查询区间范围
         List<ConfigAssayMethodProjectRangeDO> configAssayMethodProjectRangeDOList = configAssayMethodProjectRangeMapper.selectList(new LambdaQueryWrapperX<ConfigAssayMethodProjectRangeDO>().eq(ConfigAssayMethodProjectRangeDO::getConfigAssayMethodId, businessAssayTaskDO.getConfigAssayMethodId()));
@@ -395,6 +395,7 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
 	private BusinessAssayTaskAnalysisDataRespVO getAnalysis(BusinessAssayTaskDO businessAssayTaskDO) {
 		BusinessAssayTaskAnalysisDataRespVO businessAssayTaskAnalysisDataRespVO = new BusinessAssayTaskAnalysisDataRespVO();
 		businessAssayTaskAnalysisDataRespVO.setAnalysisType("analysis");
+		businessAssayTaskAnalysisDataRespVO.setAnalysisName("分析样");
 		businessAssayTaskAnalysisDataRespVO.setSortNo(99);
 		
 
@@ -480,8 +481,9 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
 		for (ConfigQCSampleMethodExtendRespVO configQCSampleMethodExtendRespVO : configQCSampleMethodList) {
 			businessAssayTaskAnalysisDataRespVO = new BusinessAssayTaskAnalysisDataRespVO();
 			businessAssayTaskAnalysisDataRespVO.setAnalysisType(configQCSampleMethodExtendRespVO.getDictionaryBusinessKey());
+			businessAssayTaskAnalysisDataRespVO.setAnalysisName(configQCSampleMethodExtendRespVO.getDictionaryBusinessName());
 			businessAssayTaskAnalysisDataRespVO.setSortNo(configQCSampleMethodExtendRespVO.getSortNo());
-			
+			businessAssayTaskAnalysisDataRespVO.setConfigQCSampleMethod(configQCSampleMethodExtendRespVO);
 			
 			//处理列
 	        List<BatchSampleAnalysisColumnRespVO> cloumns = new ArrayList<>();

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

@@ -81,5 +81,11 @@ public interface SampleTaskAssignService {
 	 */
 	void createQcSample(CreateQcSampleReqVO req);
 
+	/**
+	 * 删除质控样
+	 * @param req
+	 */
+	void deleteQcSample(DeleteQcSampleReqVO req);
+
 
 }

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

@@ -614,4 +614,19 @@ public class SampleTaskAssignServiceImpl implements SampleTaskAssignService {
 			businessQCCoefficientParameterDataMapper.insertBatch(businessQCCoefficientParameterDataDOList);
 		}
 	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void deleteQcSample(DeleteQcSampleReqVO req) {
+		if ("kby".equals(req.getDictionaryBusinessKey()) || "by".equals(req.getDictionaryBusinessKey())) {//空白样和标样
+			businessQCCoefficientDataMapper.deleteByIds(req.getQcSampleIdList());
+			businessQCCoefficientParameterDataMapper.delete(new LambdaQueryWrapperX<BusinessQCCoefficientParameterDataDO>().in(BusinessQCCoefficientParameterDataDO::getBusinessQCCoefficientDataId, req.getQcSampleIdList()));
+		} else { //管理样和标准样
+			businessQCManagementDataMapper.deleteByIds(req.getQcSampleIdList());
+			List<BusinessQCManagementProjectDataDO> businessQCManagementProjectDataList = businessQCManagementProjectDataMapper.selectByBusinessQCManagementDataIds(req.getQcSampleIdList());
+			List<Long> businessQCManagementProjectDataIdList = businessQCManagementProjectDataList.stream().map(m -> m.getId()).collect(Collectors.toList());
+			businessQCManagementProjectDataMapper.deleteByIds(businessQCManagementProjectDataIdList);
+			businessQCManagementParameterDataMapper.delete(new LambdaQueryWrapperX<BusinessQCManagementParameterDataDO>().in(BusinessQCManagementParameterDataDO::getBusinessQCManagementProjectDataId, businessQCManagementProjectDataIdList));
+		}
+	}
 }

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

@@ -16,6 +16,9 @@ public class BusinessAssayTaskAnalysisDataRespVO {
 	/** 分析类型 **/
 	private String analysisType;
 	
+	/** 分析名称 **/
+	private String analysisName;
+	
 	/** 排序号 **/
 	private Integer sortNo;