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/controller/vo/BusinessAssayTaskDataExtendRespVO.java

@@ -18,6 +18,9 @@ public class BusinessAssayTaskDataExtendRespVO extends BusinessAssayTaskDataResp
     @Schema(description = "分析方法名称")
 	private String configAssayMethodName;
     
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
+    
     @Schema(description = "子样配置id")
     private Long configSubSampleId;
 

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

@@ -5,10 +5,15 @@ import lombok.Data;
 @Data
 public class BusinessAssayTaskDataGroupRespVO {
 	
+	/** 方法id **/
 	private Long configAssayMethodId;
 	
+	/** 方法名称 **/
 	private String configAssayMethodName;
 	
+	/** 方法名称及类别 **/
+	private String configAssayMethodNameAndCategory;
+
     private String assayType;
 	
 	private Integer sampleTaskCount;

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

@@ -108,6 +108,9 @@ public class BusinessAssayTaskDataReqVO {
     @Schema(description = "检测方法配置名称")
     private String configAssayMethodName;
     
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
+
     @Schema(description = "收样时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] sampleReceiveTime;

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.zt.plat.module.qms.business.config.controller.vo.ConfigQCSampleMethodExtendRespVO;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
@@ -24,6 +25,9 @@ public class BusinessAssayTaskExtendRespVO extends BusinessAssayTaskRespVO {
 	/** 分析方法名称 **/
     private String configAssayMethodName;
     
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
+    
     /** 分析方法对应的分析项目 **/
     private String configAssayMethodProjectShowNames;
     

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

@@ -18,6 +18,9 @@ public class BusinessSubParentSampleAssessmentGroupReqVO {
 	@Schema(description = "分析方法名称")
 	private String configAssayMethodName;
     
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
+
     @Schema(description = "分析部门ID")
     private Long assayDepartmentId;
 

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

@@ -12,6 +12,9 @@ public class BusinessSubParentSampleAssessmentGroupRespVO {
 	@Schema(description = "分析方法名称")
 	private String configAssayMethodName;
     
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
+
     @Schema(description = "分析部门ID")
     private Long assayDepartmentId;
 

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.zt.plat.module.qms.business.config.controller.vo.*;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Data
@@ -21,6 +22,9 @@ public class RecheckSubSampleParentMethodRespVO {
 	
 	private String configAssayMethodName;
     
+    @Schema(description = "检测方法配置名称及类别")
+	private String configAssayMethodNameAndCategory;
+	
 	private Long baseSampleId;
 	
 	private String baseSampleName;

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

@@ -2,7 +2,6 @@ package com.zt.plat.module.qms.business.bus.dal.mapper;
 
 import java.util.*;
 
-import com.alibaba.druid.sql.ast.statement.SQLForeignKeyImpl.On;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.zt.plat.framework.common.pojo.PageResult;
@@ -16,7 +15,6 @@ import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDataRe
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAnalysisGroupDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAssessmentDO;
-import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleAssessmentProjectDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO;
 import com.zt.plat.module.qms.enums.QmsCommonConstant;
@@ -26,7 +24,6 @@ import cn.hutool.core.util.ObjectUtil;
 
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -47,6 +44,7 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
 				.eq(BusinessSubSampleAnalysisGroupDO::getAssayDepartmentId, BusinessAssayTaskDataDO::getAssayDepartmentId))
 		.selectAll(BusinessAssayTaskDataDO.class)
 		.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodName)
+		.selectAs(ConfigAssayMethodDO::getMethodNameCategory, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodNameAndCategory)
 		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
 		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
 		.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayTaskDataExtendRespVO::getSampleAssayCode)
@@ -149,6 +147,7 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
 				.eq(BusinessSubSampleAnalysisGroupDO::getAssayDepartmentId, BusinessAssayTaskDataDO::getAssayDepartmentId))
 		.selectAll(BusinessAssayTaskDataDO.class)
 		.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodName)
+		.selectAs(ConfigAssayMethodDO::getMethodNameCategory, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodNameAndCategory)
 		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
 		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)
 		.selectAs(BusinessSubSampleDO::getSampleAssayCode, BusinessAssayTaskDataExtendRespVO::getSampleAssayCode)
@@ -274,6 +273,7 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
         				.eq(BusinessSubSampleAnalysisGroupDO::getAssayDepartmentId, BusinessAssayTaskDataDO::getAssayDepartmentId))
         		.selectAll(BusinessAssayTaskDataDO.class)
         		.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodName)
+        		.selectAs(ConfigAssayMethodDO::getMethodNameCategory, BusinessAssayTaskDataExtendRespVO::getConfigAssayMethodNameAndCategory)
         		.selectAs(ConfigAssayMethodDO::getConfigReportTemplateKey, BusinessAssayTaskDataExtendRespVO::getConfigReportTemplateKey)
         		.selectAs(BusinessSubSampleDO::getSampleName, BusinessAssayTaskDataExtendRespVO::getSampleName)
         		.selectAs(BusinessSubSampleDO::getSampleCode, BusinessAssayTaskDataExtendRespVO::getSampleCode)

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

@@ -29,6 +29,7 @@ public interface BusinessAssayTaskMapper extends BaseMapperX<BusinessAssayTaskDO
         		.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessAssayTaskDO::getConfigAssayMethodId)
         		.selectAll(BusinessAssayTaskDO.class)
         		.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskExtendRespVO::getConfigAssayMethodName)
+        		.selectAs(ConfigAssayMethodDO::getMethodNameCategory, BusinessAssayTaskExtendRespVO::getConfigAssayMethodNameAndCategory)
                 .eqIfPresent(BusinessAssayTaskDO::getTaskNo, reqVO.getTaskNo())
                 .likeIfPresent(BusinessAssayTaskDO::getTaskName, reqVO.getTaskName())
                 .eqIfPresent(BusinessAssayTaskDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
@@ -73,6 +74,7 @@ public interface BusinessAssayTaskMapper extends BaseMapperX<BusinessAssayTaskDO
         		.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessAssayTaskDO::getConfigAssayMethodId)
         		.selectAll(BusinessAssayTaskDO.class)
         		.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskExtendRespVO::getConfigAssayMethodName)
+        		.selectAs(ConfigAssayMethodDO::getMethodNameCategory, BusinessAssayTaskExtendRespVO::getConfigAssayMethodNameAndCategory)
                 .eqIfPresent(BusinessAssayTaskDO::getTaskNo, reqVO.getTaskNo())
                 .likeIfPresent(BusinessAssayTaskDO::getTaskName, reqVO.getTaskName())
                 .eqIfPresent(BusinessAssayTaskDO::getConfigAssayMethodId, reqVO.getConfigAssayMethodId())
@@ -136,6 +138,7 @@ public interface BusinessAssayTaskMapper extends BaseMapperX<BusinessAssayTaskDO
 				.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessAssayTaskDO::getConfigAssayMethodId)
 				.selectAll(BusinessAssayTaskDO.class)
 				.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskExtendRespVO::getConfigAssayMethodName)
+        		.selectAs(ConfigAssayMethodDO::getMethodNameCategory, BusinessAssayTaskExtendRespVO::getConfigAssayMethodNameAndCategory)
 				.eq(BusinessAssayTaskDO::getId, id));
 	}