Browse Source

设置版本状态枚举

fengyanjie 4 years ago
parent
commit
e36007206a

+ 2 - 9
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/entity/ClassDefChangeRecord.java

@@ -48,14 +48,7 @@ public class ClassDefChangeRecord {
     private Date publishTime;//发布时间
     private Date finishTime;//完成时间
     private Boolean valid;//true 正常 false 失效
-    private Integer state;//状态 0.取消 1.初始化 2.确认 3.发布 4.完成
+    @Enumerated
+    private EnumVersionState state;//状态 0.取消 1.初始化 2.确认 3.发布 4.完成
     private String version;//版本
-
-    public EnumVersionState getState() {
-        return EnumVersionState.getByValue(state);
-    }
-
-    public void setState(EnumVersionState state) {
-        this.state = state.getValue();
-    }
 }

+ 2 - 9
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/entity/FuncidDefChangeRecord.java

@@ -67,14 +67,7 @@ public class FuncidDefChangeRecord {
     private Date publishTime;//发布时间
     private Date finishTime;//完成时间
     private Boolean valid;//true 正常 false 失效
-    private Integer state;//状态 0.取消 1.初始化 2.确认 3.发布 4.完成
+    @Enumerated
+    private EnumVersionState state;//状态 0.取消 1.初始化 2.确认 3.发布 4.完成
     private String version;//版本
-
-    public EnumVersionState getState() {
-        return EnumVersionState.getByValue(state);
-    }
-
-    public void setState(EnumVersionState state) {
-        this.state = state.getValue();
-    }
 }

+ 2 - 9
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/entity/RwdeditVersion.java

@@ -19,14 +19,7 @@ public class RwdeditVersion {
     @Column(name = "create_time", insertable = false, updatable = false)
     private Date createTime;
     private String createUser;
-    private Integer state;
-
-    public EnumVersionState getState() {
-        return EnumVersionState.getByValue(state);
-    }
-
-    public void setState(EnumVersionState state) {
-        this.state = state.getValue();
-    }
+    @Enumerated
+    private EnumVersionState state;
 
 }

+ 19 - 0
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/enumeration/EnumVersionState.java

@@ -2,12 +2,31 @@ package com.persagy.dmp.rwd.edit.enumeration;
 
 import lombok.Getter;
 
+/**
+ * @author sagadev
+ */
+
 public enum EnumVersionState {
 
+    /**
+     * 取消
+     */
     CANCEL(0, "取消"),
+    /**
+     * 初始化
+     */
     INIT(1, "初始化"),
+    /**
+     * 确认
+     */
     CONFIRM(2, "确认"),
+    /**
+     * 发布
+     */
     PUBLISH(3, "发布"),
+    /**
+     * 完成
+     */
     FINISH(4, "完成");
 
     @Getter

+ 2 - 2
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/ClassDefChangeRecordService.java

@@ -55,7 +55,7 @@ public class ClassDefChangeRecordService {
         list.addAll(CriteriaUtils.parse(qt.publishUser, object.get("publishUser")));
         list.addAll(CriteriaUtils.parse(qt.publishTime, object.get("publishTime")));
         list.addAll(CriteriaUtils.parse(qt.finishTime, object.get("finishTime")));
-        list.addAll(CriteriaUtils.parse(qt.state, object.get("state")));
+        list.addAll(CriteriaUtils.parse(qt.state, object.get("state"), EnumVersionState.class));
         list.addAll(CriteriaUtils.parse(qt.version, object.get("version")));
         return list;
     }
@@ -101,7 +101,7 @@ public class ClassDefChangeRecordService {
             param.setParentCode(classDef.getParentCode());
         }
         QClassDefChangeRecord qt = QClassDefChangeRecord.classDefChangeRecord;
-        BooleanExpression ex = qt.code.eq(code).and(qt.state.eq(EnumVersionState.INIT.getValue())).and(qt.version.isNull());
+        BooleanExpression ex = qt.code.eq(code).and(qt.state.eq(EnumVersionState.INIT)).and(qt.version.isNull());
         Iterable<ClassDefChangeRecord> all = repository.findAll(ex);
         List<ClassDefChangeRecord> list = new ArrayList<>();
         all.forEach(list::add);

+ 2 - 2
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/FuncidDefChangeRecordService.java

@@ -58,7 +58,7 @@ public class FuncidDefChangeRecordService {
         list.addAll(CriteriaUtils.parse(qt.publishUser, object.get("publishUser")));
         list.addAll(CriteriaUtils.parse(qt.publishTime, object.get("publishTime")));
         list.addAll(CriteriaUtils.parse(qt.finishTime, object.get("finishTime")));
-        list.addAll(CriteriaUtils.parse(qt.state, object.get("state")));
+        list.addAll(CriteriaUtils.parse(qt.state, object.get("state"), EnumVersionState.class));
         list.addAll(CriteriaUtils.parse(qt.version, object.get("version")));
         return list;
     }
@@ -127,7 +127,7 @@ public class FuncidDefChangeRecordService {
             param.setWeakPoint(funcidDef.getWeakPoint());
         }
         QFuncidDefChangeRecord qt = QFuncidDefChangeRecord.funcidDefChangeRecord;
-        BooleanExpression ex = qt.code.eq(code).and(qt.state.eq(EnumVersionState.INIT.getValue())).and(qt.version.isNull());
+        BooleanExpression ex = qt.code.eq(code).and(qt.state.eq(EnumVersionState.INIT)).and(qt.version.isNull());
         Iterable<FuncidDefChangeRecord> all = repository.findAll(ex);
         List<FuncidDefChangeRecord> list = new ArrayList<>();
         all.forEach(list::add);

+ 2 - 2
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/RwdeditVersionService.java

@@ -45,7 +45,7 @@ public class RwdeditVersionService {
         list.addAll(CriteriaUtils.parse(qt.version, criteria.get("version")));
         list.addAll(CriteriaUtils.parse(qt.createTime, criteria.get("createTime")));
         list.addAll(CriteriaUtils.parse(qt.createUser, criteria.get("createUser")));
-        list.addAll(CriteriaUtils.parse(qt.state, criteria.get("state")));
+        list.addAll(CriteriaUtils.parse(qt.state, criteria.get("state"), EnumVersionState.class));
         return list;
     }
 
@@ -62,7 +62,7 @@ public class RwdeditVersionService {
             response.setFail("版本编号不可为空!");
             return response;
         }
-        long count = repository.count(QRwdeditVersion.rwdeditVersion.state.in(EnumVersionState.INIT.getValue(), EnumVersionState.CONFIRM.getValue(), EnumVersionState.PUBLISH.getValue()));
+        long count = repository.count(QRwdeditVersion.rwdeditVersion.state.in(EnumVersionState.INIT, EnumVersionState.CONFIRM, EnumVersionState.PUBLISH));
         if (count > 0) {
             response.setFail("存在未发布完成版本,不可重复创建!");
             return response;