原始记录横向纵向查询

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

@@ -21,6 +21,9 @@ import lombok.Data;
  */
 @Data
 public class BusinessAssayTaskExtendRespVO extends BusinessAssayTaskRespVO {
+	
+	/** 任务单数据类型,横向：horizontal，纵向：‌vertical **/
+    private String reportDataType;
 
 	/** 分析方法名称 **/
     private String configAssayMethodName;

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

@@ -139,6 +139,7 @@ public interface BusinessAssayTaskMapper extends BaseMapperX<BusinessAssayTaskDO
 				.selectAll(BusinessAssayTaskDO.class)
 				.selectAs(ConfigAssayMethodDO::getName, BusinessAssayTaskExtendRespVO::getConfigAssayMethodName)
         		.selectAs(ConfigAssayMethodDO::getMethodNameCategory, BusinessAssayTaskExtendRespVO::getConfigAssayMethodNameAndCategory)
+        		.selectAs(ConfigAssayMethodDO::getReportDataType, BusinessAssayTaskExtendRespVO::getReportDataType)
 				.eq(BusinessAssayTaskDO::getId, id));
 	}
 

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

@@ -46,6 +46,9 @@ public class ConfigAssayMethodPageReqVO extends PageParam {
     @Schema(description = "任务单模板key")
     private String configReportTemplateKey;
 
+    @Schema(description = "任务单数据类型,横向：horizontal，纵向：‌vertical‌", example = "2")
+    private String reportDataType;
+
     @Schema(description = "任务单编号规则")
     private String codeRule;
 

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

@@ -46,6 +46,9 @@ public class ConfigAssayMethodReqVO {
     @Schema(description = "任务单模板key")
     private String configReportTemplateKey;
 
+    @Schema(description = "任务单数据类型,横向：horizontal，纵向：‌vertical‌", example = "2")
+    private String reportDataType;
+
     @Schema(description = "任务单编号规则")
     private String codeRule;
 

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

@@ -56,6 +56,10 @@ public class ConfigAssayMethodRespVO {
     @ExcelProperty("任务单模板key")
     private String configReportTemplateKey;
 
+    @Schema(description = "任务单数据类型,横向：horizontal，纵向：‌vertical‌", example = "2")
+    @ExcelProperty("任务单数据类型,横向：horizontal，纵向：‌vertical‌")
+    private String reportDataType;
+
     @Schema(description = "任务单编号规则", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("任务单编号规则")
     private String codeRule;

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

@@ -47,6 +47,9 @@ public class ConfigAssayMethodSaveReqVO {
     @Schema(description = "任务单模板key")
     private String configReportTemplateKey;
 
+    @Schema(description = "任务单数据类型,横向：horizontal，纵向：‌vertical‌")
+    private String reportDataType;
+
     @Schema(description = "任务单编号规则", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "任务单编号规则不能为空")
     private String codeRule;

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

@@ -87,6 +87,11 @@ public class ConfigAssayMethodDO extends BusinessBaseDO {
     @TableField("CFG_RPT_TMPL_KY")
     private String configReportTemplateKey;
     /**
+    * 任务单数据类型,横向：horizontal，纵向：‌vertical‌
+    */
+    @TableField("RPT_DAT_TP")
+    private String reportDataType;
+    /**
     * 任务单编号规则
     */
     @TableField("CD_RUL")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/config/dal/mapper/ConfigAssayMethodMapper.java

@@ -4,14 +4,12 @@ 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.framework.mybatis.core.mapper.BaseMapperX;
 import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodPageReqVO;
 import com.zt.plat.module.qms.business.config.controller.vo.ConfigAssayMethodReqVO;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO;
 
 import org.apache.ibatis.annotations.Mapper;
-import com.zt.plat.module.qms.business.config.controller.vo.*;
 
 /**
  * 检测方法配置 Mapper
@@ -33,6 +31,7 @@ public interface ConfigAssayMethodMapper extends BaseMapperX<ConfigAssayMethodDO
                 .eqIfPresent(ConfigAssayMethodDO::getIsEnabled, reqVO.getIsEnabled())
                 .eqIfPresent(ConfigAssayMethodDO::getIsIngredients, reqVO.getIsIngredients())
                 .eqIfPresent(ConfigAssayMethodDO::getConfigReportTemplateKey, reqVO.getConfigReportTemplateKey())
+                .eqIfPresent(ConfigAssayMethodDO::getReportDataType, reqVO.getReportDataType())
                 .eqIfPresent(ConfigAssayMethodDO::getCodeRule, reqVO.getCodeRule())
                 .eqIfPresent(ConfigAssayMethodDO::getAssignWay, reqVO.getAssignWay())
                 .eqIfPresent(ConfigAssayMethodDO::getAssignPlatform, reqVO.getAssignPlatform())
@@ -59,6 +58,7 @@ public interface ConfigAssayMethodMapper extends BaseMapperX<ConfigAssayMethodDO
                 .eqIfPresent(ConfigAssayMethodDO::getIsEnabled, reqVO.getIsEnabled())
                 .eqIfPresent(ConfigAssayMethodDO::getIsIngredients, reqVO.getIsIngredients())
                 .eqIfPresent(ConfigAssayMethodDO::getConfigReportTemplateKey, reqVO.getConfigReportTemplateKey())
+                .eqIfPresent(ConfigAssayMethodDO::getReportDataType, reqVO.getReportDataType())
                 .eqIfPresent(ConfigAssayMethodDO::getCodeRule, reqVO.getCodeRule())
                 .eqIfPresent(ConfigAssayMethodDO::getAssignWay, reqVO.getAssignWay())
                 .eqIfPresent(ConfigAssayMethodDO::getAssignPlatform, reqVO.getAssignPlatform())