Pārlūkot izejas kodu

QualityControlRule with qcTypeList

WangKang 6 mēneši atpakaļ
vecāks
revīzija
596c11ba57

+ 5 - 1
ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/QualityControlRule.java

@@ -1,11 +1,13 @@
 package org.ruoyi.domain;
 package org.ruoyi.domain;
 
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import org.ruoyi.common.tenant.core.TenantEntity;
 import org.ruoyi.common.tenant.core.TenantEntity;
 
 
 import java.io.Serial;
 import java.io.Serial;
+import java.util.List;
 
 
 /**
 /**
  * 质控规则对象 quality_control_rule
  * 质控规则对象 quality_control_rule
@@ -15,7 +17,7 @@ import java.io.Serial;
  */
  */
 @Data
 @Data
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-@TableName("quality_control_rule")
+@TableName(value = "quality_control_rule", autoResultMap = true)
 public class QualityControlRule extends TenantEntity {
 public class QualityControlRule extends TenantEntity {
 
 
     @Serial
     @Serial
@@ -47,5 +49,7 @@ public class QualityControlRule extends TenantEntity {
      */
      */
     private String remark;
     private String remark;
 
 
+    @TableField(value = "qc_type_list", typeHandler = JacksonTypeHandler.class)
+    private List<Integer> qcTypeList;
 
 
 }
 }

+ 3 - 1
ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/bo/QualityControlRuleBo.java

@@ -10,6 +10,8 @@ import org.ruoyi.common.core.validate.EditGroup;
 import org.ruoyi.core.domain.BaseEntity;
 import org.ruoyi.core.domain.BaseEntity;
 import org.ruoyi.domain.QualityControlRule;
 import org.ruoyi.domain.QualityControlRule;
 
 
+import java.util.List;
+
 /**
 /**
  * 质控规则业务对象 quality_control_rule
  * 质控规则业务对象 quality_control_rule
  *
  *
@@ -49,5 +51,5 @@ public class QualityControlRuleBo extends BaseEntity {
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
     private String remark;
 
 
-
+    private List<Integer> qcTypeList;
 }
 }

+ 4 - 3
ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/vo/QualityControlRuleVo.java

@@ -9,7 +9,7 @@ import org.ruoyi.domain.QualityControlRule;
 import java.io.Serial;
 import java.io.Serial;
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Date;
-
+import java.util.List;
 
 
 
 
 /**
 /**
@@ -53,8 +53,9 @@ public class QualityControlRuleVo implements Serializable {
     /**
     /**
      * 
      * 
      */
      */
-    @ExcelProperty(value = "")
+    @ExcelProperty(value = "备注")
     private String remark;
     private String remark;
 
 
-
+    @ExcelProperty(value = "质控类型")
+    private List<Integer> qcTypeList;
 }
 }