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/admin/SampleAnalysisAuditController.java

@@ -30,6 +30,12 @@ public class SampleAnalysisAuditController {
 	@Resource
 	private SampleAnalysisAuditService sampleAnalysisAuditService;
 	
+	@GetMapping("/crossAuditByTaskId")
+	public CommonResult<?> crossAuditByTaskId(Long businessAssayTaskId) {
+		JSONObject result = sampleAnalysisAuditService.crossAuditByTaskId(businessAssayTaskId);
+		return success(result);
+	}
+
 	/**
 	 * 交叉审核
 	 * @return

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

@@ -10,6 +10,12 @@ public class BusinessSampleEntrustDetailExtendRespVO extends BusinessSampleEntru
 	/** 样品大类名称 **/
 	private String baseSampleName;
 
+	/** 主样配置id **/
+    private Long configBaseSampleId;
+    
+	/** 打印标签 **/
+    private String printTemplate;
+    
 	private List<BusinessSampleEntrustProjectExtendRespVO> sampleEntrustDetailProjectList;
 
 }

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

@@ -6,8 +6,10 @@ 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.dal.dataobject.BusinessBaseSampleDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleEntrustDetailDO;
 import com.zt.plat.module.qms.business.config.dal.dataobject.BaseSampleDO;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigBaseSampleDO;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 
 import org.apache.ibatis.annotations.Mapper;
@@ -24,8 +26,12 @@ public interface BusinessSampleEntrustDetailMapper extends BaseMapperX<BusinessS
 	default List<BusinessSampleEntrustDetailExtendRespVO> selectList(BusinessSampleEntrustDetailReqVO reqVO) {
 		return selectJoinList(BusinessSampleEntrustDetailExtendRespVO.class, new MPJLambdaWrapperX<BusinessSampleEntrustDetailDO>()
 				.leftJoin(BaseSampleDO.class, BaseSampleDO::getId, BusinessSampleEntrustDetailDO::getBaseSampleId)
+				.leftJoin(BusinessBaseSampleDO.class, BusinessBaseSampleDO::getId, BusinessSampleEntrustDetailDO::getBusinessBaseSampleId)
+				.leftJoin(ConfigBaseSampleDO.class, ConfigBaseSampleDO::getId, BusinessBaseSampleDO::getConfigBaseSampleId)
 				.selectAll(BusinessSampleEntrustDetailDO.class)
 				.selectAs(BaseSampleDO::getName, BusinessSampleEntrustDetailExtendRespVO::getBaseSampleName)
+				.selectAs(BusinessBaseSampleDO::getConfigBaseSampleId, BusinessSampleEntrustDetailExtendRespVO::getConfigBaseSampleId)
+				.selectAs(ConfigBaseSampleDO::getPrintTemplate, BusinessSampleEntrustDetailExtendRespVO::getPrintTemplate)
                 .eqIfPresent(BusinessSampleEntrustDetailDO::getBusinessSampleEntrustRegistrationId, reqVO.getBusinessSampleEntrustRegistrationId())
                 .eqIfPresent(BusinessSampleEntrustDetailDO::getBusinessBaseSampleId, reqVO.getBusinessBaseSampleId())
                 .eqIfPresent(BusinessSampleEntrustDetailDO::getBaseSampleId, reqVO.getBaseSampleId())
@@ -48,8 +54,12 @@ public interface BusinessSampleEntrustDetailMapper extends BaseMapperX<BusinessS
     default PageResult<BusinessSampleEntrustDetailExtendRespVO> selectPage(BusinessSampleEntrustDetailPageReqVO reqVO) {
         return selectJoinPage(reqVO, BusinessSampleEntrustDetailExtendRespVO.class, new MPJLambdaWrapperX<BusinessSampleEntrustDetailDO>()
 				.leftJoin(BaseSampleDO.class, BaseSampleDO::getId, BusinessSampleEntrustDetailDO::getBaseSampleId)
+				.leftJoin(BusinessBaseSampleDO.class, BusinessBaseSampleDO::getId, BusinessSampleEntrustDetailDO::getBusinessBaseSampleId)
+				.leftJoin(ConfigBaseSampleDO.class, ConfigBaseSampleDO::getId, BusinessBaseSampleDO::getConfigBaseSampleId)
 				.selectAll(BusinessSampleEntrustDetailDO.class)
 				.selectAs(BaseSampleDO::getName, BusinessSampleEntrustDetailExtendRespVO::getBaseSampleName)
+				.selectAs(BusinessBaseSampleDO::getConfigBaseSampleId, BusinessSampleEntrustDetailExtendRespVO::getConfigBaseSampleId)
+				.selectAs(ConfigBaseSampleDO::getPrintTemplate, BusinessSampleEntrustDetailExtendRespVO::getPrintTemplate)
                 .eqIfPresent(BusinessSampleEntrustDetailDO::getBusinessSampleEntrustRegistrationId, reqVO.getBusinessSampleEntrustRegistrationId())
                 .eqIfPresent(BusinessSampleEntrustDetailDO::getBusinessBaseSampleId, reqVO.getBusinessBaseSampleId())
                 .eqIfPresent(BusinessSampleEntrustDetailDO::getBaseSampleId, reqVO.getBaseSampleId())

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

@@ -18,6 +18,8 @@ import com.alibaba.fastjson2.JSONObject;
  */
 public interface SampleAnalysisAuditService {
 
+	JSONObject crossAuditByTaskId(Long businessAssayTaskId);
+	
 	void crossAuditByByTaskId(Long businessAssayTaskId, String auditStatus);
 
 	JSONObject getSampleResultAssessmentList(Long configAssayMethodId, String assessmentStatus);
@@ -32,4 +34,5 @@ public interface SampleAnalysisAuditService {
 
 	JSONObject modifyParallelResultAssessment(Long businessSubSampleId, Long configAssayMethodId, Long businessSubSampleAssessmentId, List<Long> businessAssayProjectDataIds);
 
+
 }

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

@@ -576,7 +576,7 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
 		            map.put("sampleName", businessQCManagementData.getSampleName());
 
 		            BusinessQCManagementProjectDataReqVO projectDataSearch2 = new BusinessQCManagementProjectDataReqVO();
-		            projectDataSearch2.setBusinessQCManagementDataId(businessQCManagementDataDO.getId());
+		            projectDataSearch2.setBusinessQCManagementDataId(businessQCManagementData.getId());
 		            List<BusinessAssayProjectAndParameterRespVO> projectAndParameterList2 = businessQCManagementProjectDataMapper.selectProjectAndParameterBy(projectDataSearch2);
 		            for (BusinessAssayProjectAndParameterRespVO ep : projectAndParameterList2) {
 						map.put("e" + ep.getDicId(), ep);

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/controller/admin/ConfigReportTemplateController.java

@@ -149,6 +149,15 @@ public class ConfigReportTemplateController implements BusinessControllerMarker
         return success(BeanUtils.toBean(configReportTemplate, ConfigReportTemplateRespVO.class));
     }
 
+    @GetMapping("/getByKey")
+    @Operation(summary = "获得报表模版配置")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    //@PreAuthorize("@ss.hasPermission('qms:config-report-template:query')")
+    public CommonResult<ConfigReportTemplateRespVO> getConfigReportTemplate(@RequestParam("key") String key) {
+        ConfigReportTemplateDO configReportTemplate = configReportTemplateService.getConfigReportTemplateByKey(key);
+        return success(BeanUtils.toBean(configReportTemplate, ConfigReportTemplateRespVO.class));
+    }
+
     @GetMapping("/page")
     @Operation(summary = "获得报表模版配置分页")
     //@PreAuthorize("@ss.hasPermission('qms:config-report-template:query')")