Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -1731,4 +1731,42 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+    /**
+     * 流程明细动作类型
+     *  10=交互动作,20=后台动作,30=提交动作
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum GROUP_VALUE_TYPE {
+
+        INTERACTIVE_ACTION(10, "交互动作"),
+        BACKSTAGE_ACTION(20, "后台动作"),
+        SUBMIT_ACTION(30, "提交动作");
+
+        private int value;
+        private String description;
+
+        GROUP_VALUE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -714,7 +714,8 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public double findByHqlDouble(String hql) {
-        return entityManager.createQuery(hql,Double.class).getSingleResult();
+        Double result = entityManager.createQuery(hql,Double.class).getSingleResult();
+        return result == null ? 0 : result;
     }
 
     @Override