更新数据库字段

examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/entity/ProjectBackupSetting.java

@@ -24,21 +24,32 @@ public class ProjectBackupSetting extends IdEntity {
      */
     private Long projectId;
 
-    /* 每袋冗余设置 */
+    /* 1、每袋冗余设置 */
+
+    /**
+     * 是否需要每袋备份
+     */
+    private Boolean needEachPkg;
     /**
      * 每袋备份比例
      */
-    private Double pkgPercent;
+    private Double eachPkgPercent;
     /**
      * 每袋备份最大值
      */
-    private Double pkgMax;
+    private Double eachPkgMax;
     /**
      * 每袋备份最小值
      */
-    private Double pkgMin;
+    private Double eachPkgMin;
+
 
-    /* 单独备份袋 */
+    /* 2、单独备份袋 */
+
+    /**
+     * 是否需要单独备份袋
+     */
+    private Boolean needAlonePkg;
     /**
      * 归集类型
      */
@@ -47,15 +58,15 @@ public class ProjectBackupSetting extends IdEntity {
     /**
      * 单独备份比例
      */
-    private Double pkgSinglePercent;
+    private Double alonePkgPercent;
     /**
      * 单独备份最大值
      */
-    private Double pkgSingleMax;
+    private Double alonePkgMax;
     /**
      * 单独备份最小值
      */
-    private Double pkgSingleMin;
+    private Double alonePkgMin;
 
     public Long getProjectId() {
         return projectId;
@@ -65,28 +76,46 @@ public class ProjectBackupSetting extends IdEntity {
         this.projectId = projectId;
     }
 
-    public Double getPkgPercent() {
-        return pkgPercent;
+    public Boolean getNeedEachPkg() {
+        //为空时，默认值
+        return needEachPkg != null ? needEachPkg : false;
+    }
+
+    public void setNeedEachPkg(Boolean needEachPkg) {
+        this.needEachPkg = needEachPkg;
+    }
+
+    public Boolean getNeedAlonePkg() {
+        //为空时，默认值
+        return needAlonePkg != null ? needAlonePkg : false;
+    }
+
+    public void setNeedAlonePkg(Boolean needAlonePkg) {
+        this.needAlonePkg = needAlonePkg;
+    }
+
+    public Double getEachPkgPercent() {
+        return eachPkgPercent;
     }
 
-    public void setPkgPercent(Double pkgPercent) {
-        this.pkgPercent = pkgPercent;
+    public void setEachPkgPercent(Double eachPkgPercent) {
+        this.eachPkgPercent = eachPkgPercent;
     }
 
-    public Double getPkgMax() {
-        return pkgMax;
+    public Double getEachPkgMax() {
+        return eachPkgMax;
     }
 
-    public void setPkgMax(Double pkgMax) {
-        this.pkgMax = pkgMax;
+    public void setEachPkgMax(Double eachPkgMax) {
+        this.eachPkgMax = eachPkgMax;
     }
 
-    public Double getPkgMin() {
-        return pkgMin;
+    public Double getEachPkgMin() {
+        return eachPkgMin;
     }
 
-    public void setPkgMin(Double pkgMin) {
-        this.pkgMin = pkgMin;
+    public void setEachPkgMin(Double eachPkgMin) {
+        this.eachPkgMin = eachPkgMin;
     }
 
     public BackupGroupType getGroupType() {
@@ -97,28 +126,28 @@ public class ProjectBackupSetting extends IdEntity {
         this.groupType = groupType;
     }
 
-    public Double getPkgSinglePercent() {
-        return pkgSinglePercent;
+    public Double getAlonePkgPercent() {
+        return alonePkgPercent;
     }
 
-    public void setPkgSinglePercent(Double pkgSinglePercent) {
-        this.pkgSinglePercent = pkgSinglePercent;
+    public void setAlonePkgPercent(Double alonePkgPercent) {
+        this.alonePkgPercent = alonePkgPercent;
     }
 
-    public Double getPkgSingleMax() {
-        return pkgSingleMax;
+    public Double getAlonePkgMax() {
+        return alonePkgMax;
     }
 
-    public void setPkgSingleMax(Double pkgSingleMax) {
-        this.pkgSingleMax = pkgSingleMax;
+    public void setAlonePkgMax(Double alonePkgMax) {
+        this.alonePkgMax = alonePkgMax;
     }
 
-    public Double getPkgSingleMin() {
-        return pkgSingleMin;
+    public Double getAlonePkgMin() {
+        return alonePkgMin;
     }
 
-    public void setPkgSingleMin(Double pkgSingleMin) {
-        this.pkgSingleMin = pkgSingleMin;
+    public void setAlonePkgMin(Double alonePkgMin) {
+        this.alonePkgMin = alonePkgMin;
     }
 
 }

examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/entity/ProjectStatistic.java

@@ -49,7 +49,7 @@ public class ProjectStatistic extends IdEntity {
      */
     private Integer normalA4;
     /**
-     * 备份 印刷数量A4
+     * 备份 印刷数量A3
      */
     private Integer backupA3;
     /**

examcloud-core-print-dao/src/main/resources/db-schema.sql

@@ -181,18 +181,20 @@ CREATE TABLE ec_prt_project (
 -- ----------------------------
 DROP TABLE IF EXISTS ec_prt_project_backup_setting;
 CREATE TABLE ec_prt_project_backup_setting (
-  id                 bigint(20)  NOT NULL AUTO_INCREMENT,
-  creation_time      datetime(0) NULL     DEFAULT NULL,
-  update_time        datetime(0) NULL     DEFAULT NULL,
-  group_type         varchar(255) CHARACTER SET utf8
-  COLLATE utf8_general_ci        NULL     DEFAULT NULL,
-  pkg_max            double      NULL     DEFAULT NULL,
-  pkg_min            double      NULL     DEFAULT NULL,
-  pkg_percent        double      NULL     DEFAULT NULL,
-  pkg_single_max     double      NULL     DEFAULT NULL,
-  pkg_single_min     double      NULL     DEFAULT NULL,
-  pkg_single_percent double      NULL     DEFAULT NULL,
-  project_id         bigint(20)  NULL     DEFAULT NULL,
+  id                bigint(20)  NOT NULL AUTO_INCREMENT,
+  creation_time     datetime(0) NULL     DEFAULT NULL,
+  update_time       datetime(0) NULL     DEFAULT NULL,
+  group_type        varchar(255) CHARACTER SET utf8
+  COLLATE utf8_general_ci       NULL     DEFAULT NULL,
+  need_each_pkg     bit(1)      NULL     DEFAULT NULL,
+  each_pkg_max      double      NULL     DEFAULT NULL,
+  each_pkg_min      double      NULL     DEFAULT NULL,
+  each_pkg_percent  double      NULL     DEFAULT NULL,
+  need_alone_pkg    bit(1)      NULL     DEFAULT NULL,
+  alone_pkg_max     double      NULL     DEFAULT NULL,
+  alone_pkg_min     double      NULL     DEFAULT NULL,
+  alone_pkg_percent double      NULL     DEFAULT NULL,
+  project_id        bigint(20)  NULL     DEFAULT NULL,
   PRIMARY KEY (id) USING BTREE,
   UNIQUE INDEX INDEX_PRT_PROJECT_BACKUP_01(project_id) USING BTREE
 )