Browse Source

primary and secondary DepartmentList

wangkangyjy 6 months ago
parent
commit
a82cf36ceb

+ 0 - 3
ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/controller/QualityControlRuleController.java

@@ -162,9 +162,6 @@ public class QualityControlRuleController {
         vectorStoreService.deleteAllFromClass("Quality_control");
          vectorStoreService.saveQualityRulesWithVector(rules,"Quality_control");
          return  R.ok(true);
-
-
-
     }
 
 }

+ 11 - 0
ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/QualityControlRule.java

@@ -87,4 +87,15 @@ public class QualityControlRule extends TenantEntity {
      */
     private int delFlag;
 
+    /**
+     * 主要部门
+     */
+    private String primaryDepartment;
+
+    /**
+     * 次要部门列表
+     */
+    @TableField(value = "secondary_department_list", typeHandler = JacksonTypeHandler.class)
+    private List<String> secondaryDepartmentList;
+
 }

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

@@ -76,5 +76,15 @@ public class QualityControlRuleBo extends BaseEntity {
      */
     private Boolean isEnabled;
 
+    /**
+     * 主要部门
+     */
+    private String primaryDepartment;
+
+    /**
+     * 次要部门列表
+     */
+    private List<String> secondaryDepartmentList;
+
     private int delFlag;
-}
+}

+ 14 - 2
ruoyi-modules-api/ruoyi-knowledge-api/src/main/java/org/ruoyi/domain/vo/QualityControlRuleVo.java

@@ -27,7 +27,7 @@ public class QualityControlRuleVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private Long id;
@@ -57,7 +57,7 @@ public class QualityControlRuleVo implements Serializable {
     private String ruleDesc;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "备注")
     private String remark;
@@ -77,6 +77,18 @@ public class QualityControlRuleVo implements Serializable {
     @ExcelProperty(value = "质控类型")
     private List<Integer> qcTypeList;
 
+    /**
+     * 主要部门
+     */
+    @ExcelProperty(value = "主要部门")
+    private String primaryDepartment;
+
+    /**
+     * 次要部门列表
+     */
+    @ExcelProperty(value = "次要部门列表")
+    private List<String> secondaryDepartmentList;
+
     /**
      * 是否启用:0-禁用,1-启用
      */