简码生成标签打印

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

@@ -82,9 +82,11 @@ public class BusinessSubSampleController implements BusinessControllerMarker {
     @Operation(summary = "获得子样业务")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     //@PreAuthorize("@ss.hasPermission('qms:business-sub-sample:query')")
-    public CommonResult<BusinessSubSampleRespVO> getBusinessSubSample(@RequestParam("id") Long id) {
+    public CommonResult<BusinessSubSampleExtendRespVO> getBusinessSubSample(@RequestParam("id") Long id) {
-        BusinessSubSampleDO businessSubSample = businessSubSampleService.getBusinessSubSample(id);
+//        BusinessSubSampleDO businessSubSample = businessSubSampleService.getBusinessSubSample(id);
-        return success(BeanUtils.toBean(businessSubSample, BusinessSubSampleRespVO.class));
+//        return success(BeanUtils.toBean(businessSubSample, BusinessSubSampleRespVO.class));
+    	BusinessSubSampleExtendRespVO result = businessSubSampleService.getBusinessSubSample(id);
+    	return success(result);
     }
 
     @GetMapping("/list")

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

@@ -18,4 +18,9 @@ public class BusinessSubSampleExtendRespVO extends BusinessSubSampleRespVO {
 	@Schema(description = "子样检测方法")
 	private List<BusinessAssayTaskDataExtendRespVO> businessAssayTaskDataList;
 
+    @Schema(description = "是否打印")
+    private Integer isPrint;
+
+    @Schema(description = "样品标签打印模版")
+    private String printTemplate;
 }

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

@@ -3,14 +3,13 @@ package com.zt.plat.module.qms.business.bus.dal.mapper;
 import java.util.*;
 
 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.BusinessSubSampleExtendRespVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubSamplePageReqVO;
 import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSubSampleReqVO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigSubSampleDO;
 import com.zt.plat.module.qms.common.dic.dal.dataobject.DictionaryBusinessDO;
 import com.zt.plat.module.qms.enums.QmsCommonConstant;
 import jakarta.validation.Valid;
@@ -28,9 +27,12 @@ public interface BusinessSubSampleMapper extends BaseMapperX<BusinessSubSampleDO
     default PageResult<BusinessSubSampleExtendRespVO> selectPage(BusinessSubSamplePageReqVO reqVO) {
         return selectJoinPage(reqVO, BusinessSubSampleExtendRespVO.class, new MPJLambdaWrapperX<BusinessSubSampleDO>()
         		.selectSub(BusinessAssayTaskDataDO.class, s -> s.selectCount(BusinessAssayTaskDataDO::getId).eq(BusinessAssayTaskDataDO::getBusinessSubSampleId, BusinessSubSampleDO::getId), BusinessSubSampleExtendRespVO::getAssayTaskCount)
+        		.leftJoin(ConfigSubSampleDO.class, ConfigSubSampleDO::getId, BusinessSubSampleDO::getConfigSubSampleId)
         		.leftJoin(DictionaryBusinessDO.class, DictionaryBusinessDO::getId, BusinessSubSampleDO::getDictionaryBusinessId)
         		.selectAll(BusinessSubSampleDO.class)
         		.selectAs(DictionaryBusinessDO::getName, BusinessSubSampleExtendRespVO::getDictionaryBusinessName)
+        		.selectAs(ConfigSubSampleDO::getIsPrint, BusinessSubSampleExtendRespVO::getIsPrint)
+        		.selectAs(ConfigSubSampleDO::getPrintTemplate, BusinessSubSampleExtendRespVO::getPrintTemplate)
                 .eqIfPresent(BusinessSubSampleDO::getBusinessBaseSampleId, reqVO.getBusinessBaseSampleId())
                 .eqIfPresent(BusinessSubSampleDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId())
                 .eqIfPresent(BusinessSubSampleDO::getConfigSubSampleId, reqVO.getConfigSubSampleId())
@@ -72,9 +74,13 @@ public interface BusinessSubSampleMapper extends BaseMapperX<BusinessSubSampleDO
 
 	default List<BusinessSubSampleExtendRespVO> selectList(@Valid BusinessSubSampleReqVO reqVO) {
 		return selectJoinList(BusinessSubSampleExtendRespVO.class, new MPJLambdaWrapperX<BusinessSubSampleDO>()
+        		.selectSub(BusinessAssayTaskDataDO.class, s -> s.selectCount(BusinessAssayTaskDataDO::getId).eq(BusinessAssayTaskDataDO::getBusinessSubSampleId, BusinessSubSampleDO::getId), BusinessSubSampleExtendRespVO::getAssayTaskCount)
         		.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::getBusinessBaseSampleId, reqVO.getBusinessBaseSampleId())
                 .eqIfPresent(BusinessSubSampleDO::getBusinessSubParentSampleId, reqVO.getBusinessSubParentSampleId())
                 .eqIfPresent(BusinessSubSampleDO::getConfigSubSampleId, reqVO.getConfigSubSampleId())
@@ -114,11 +120,28 @@ public interface BusinessSubSampleMapper extends BaseMapperX<BusinessSubSampleDO
                 .orderByDesc(BusinessSubSampleDO::getId));
 	}
 
-	default BusinessSubSampleExtendRespVO getBySampleCodeAndFlowKey(@Valid BusinessSubSampleReqVO reqVO) {
+	default BusinessSubSampleExtendRespVO selectExtendById(Long id) {
 		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)
+                .eq(BusinessSubSampleDO::getId, id)
+                .eq(BusinessSubSampleDO::getSampleStatus, QmsCommonConstant.NORMAL)
+                .eq(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)
+        		.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::getSampleFlowNodeKey, reqVO.getSampleFlowNodeKey())
                 .eqIfPresent(BusinessSubSampleDO::getSampleStatus, QmsCommonConstant.NORMAL)

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

@@ -51,7 +51,7 @@ public interface BusinessSubSampleService {
      * @param id 编号
      * @return 子样业务
      */
-    BusinessSubSampleDO getBusinessSubSample(Long id);
+    BusinessSubSampleExtendRespVO getBusinessSubSample(Long id);
 
     /**
      * 获得子样业务分页

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

@@ -86,8 +86,8 @@ public class BusinessSubSampleServiceImpl implements BusinessSubSampleService {
     }
 
     @Override
-    public BusinessSubSampleDO getBusinessSubSample(Long id) {
+    public BusinessSubSampleExtendRespVO getBusinessSubSample(Long id) {
-        return businessSubSampleMapper.selectById(id);
+        return businessSubSampleMapper.selectExtendById(id);
     }
 
     @Override
@@ -95,7 +95,7 @@ public class BusinessSubSampleServiceImpl implements BusinessSubSampleService {
     	PageResult<BusinessSubSampleExtendRespVO> page = businessSubSampleMapper.selectPage(pageReqVO);
     	if (QmsCommonConstant.FLOW_NODE_TEAM_RECEIVE.equals(pageReqVO.getSampleFlowNodeKey())) {//如果是班组收样
 			
-		}    	
+		}
         return page;
     }
 

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

@@ -37,6 +37,9 @@ public class ConfigSubSamplePageReqVO extends PageParam {
     @Schema(description = "是否打印")
     private Integer isPrint;
 
+    @Schema(description = "样品标签打印模版")
+    private String printTemplate;
+
     @Schema(description = "复检节点")
     private String recheckFlowNodeKey;
 

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

@@ -48,6 +48,9 @@ public class ConfigSubSampleRespVO {
     @ExcelProperty("是否打印")
     private Integer isPrint;
 
+    @Schema(description = "样品标签打印模版")
+    private String printTemplate;
+
     @Schema(description = "复检节点")
     @ExcelProperty("复检节点")
     private String recheckFlowNodeKey;

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

@@ -43,6 +43,9 @@ public class ConfigSubSampleSaveReqVO {
     @Schema(description = "是否打印")
     private Integer isPrint;
 
+    @Schema(description = "样品标签打印模版")
+    private String printTemplate;
+
     @Schema(description = "复检节点")
     private String recheckFlowNodeKey;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/dataobject/ConfigSubSampleDO.java

@@ -72,6 +72,11 @@ public class ConfigSubSampleDO extends BusinessBaseDO {
     @TableField("IS_PRNT")
     private Integer isPrint;
     /**
+    * 样品标签打印模版
+    */
+    @TableField("PRNT_TMPL")
+    private String printTemplate;
+    /**
     * 复检节点
     */
     @TableField("RCHK_FLW_NDE_KY")