枚举添加注解

POJO 注解顺序调整
添加用户复杂查询

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

@@ -227,10 +227,13 @@ public class CommonEnumUtil {
     /**
      * 用户状态
      * 1正常
-     * 2冻结使用
+     * 2冻结
      * 3账号异常
      * 4离职
      * 5服务到期
+     * 6锁定
+     * 7启用
+     * 8禁止
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum USER_STATUS {
@@ -240,7 +243,8 @@ public class CommonEnumUtil {
         RESIGNATION(4, "离职", "离职_RESIGNATION"),
         EXPIRE(5, "服务到期", "服务到期_EXPIRE"),
         LOCKING(6, "锁定", "fa cell-fa fa-lock"),
-        ENABLE(7, "启用", "fa fa-success cell-fa fa-check");
+        ENABLE(7, "启用", "fa fa-success cell-fa fa-check"),
+        DISABLE(8, "禁止", "fa fa-disabled cell-fa fa-times-circle");
 
         private int value;
         private String code;
@@ -390,11 +394,12 @@ public class CommonEnumUtil {
     /**
      * 是否有效
      */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum IS_VAILD {
         VAILD(1, "有效"), INVAILD(2, "无效");
 
-        private int value = 0;
-        private String description = null;
+        private int value;
+        private String description;
 
         public int getValue() {
             return value;
@@ -426,8 +431,8 @@ public class CommonEnumUtil {
     public enum ASC_OR_DESC {
         ASC(1, "正序"), DESC(2, "倒序");
 
-        private int value = 0;
-        private String description = null;
+        private int value;
+        private String description;
 
         public int getValue() {
             return value;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java

@@ -24,9 +24,9 @@ import java.util.List;
  **/
 @Data
 @Entity
-@Table(name="SYS_MENU")
 @DynamicInsert
 @DynamicUpdate
+@Table(name="SYS_MENU")
 @Api(value="系统功能",description = "系统功能")
 public class SysMenu extends BaseBean {
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java

@@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -18,9 +20,11 @@ import javax.persistence.Table;
  * @CreateDate : 2018-10-11 11:02
  * @Modify:
  **/
+@Data
 @Entity
+@DynamicInsert
+@DynamicUpdate
 @Table(name="SYS_ROLE")
-@Data
 @Api(value="用户角色表",description = "用户权限角色。")
 public class SysRole extends BaseBean {
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java

@@ -6,6 +6,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -19,9 +21,11 @@ import java.util.List;
  * @CreateDate : 2018-10-11 11:02
  * @Modify:
  **/
+@Data
 @Entity
+@DynamicInsert
+@DynamicUpdate
 @Table(name="sys_user")
-@Data
 @Api(value="用户登陆表",description = "用户登陆系统账户。")
 public class SysUser extends BaseBean {
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -230,4 +230,28 @@ public class CoreHqlPack {
 
         return  result.toString();
     }
+
+    /**
+     * 用戶复杂查询
+     * @param user
+     * @return
+     */
+    public static String packHqlSysUser(SysUser user){
+        StringBuffer result = new StringBuffer();
+
+        // hql拼接
+        HqlPack.getStringLikerPack(user.getName(),"name",result);
+        HqlPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);
+        HqlPack.getStringLikerPack(user.getUserEmail(),"userEmail",result);
+        HqlPack.getStringLikerPack(user.getUserEmpNo(),"userEmpNo",result);
+        HqlPack.getStringLikerPack(user.getUserPhone(),"userPhone",result);
+        HqlPack.getNumLikerPack(user.getUserStatusId(),"userStatusId",result);
+        HqlPack.getNumLikerPack(user.getDepartmentId(),"departmentId",result);
+        HqlPack.getNumEqualPack(user.getPositionId(),"positionId",result);
+        HqlPack.getNumEqualPack(user.getRoleId(),"roleId",result);
+        HqlPack.getNumEqualPack(user.getIsValid(),"isValid",result);
+
+        return  result.toString();
+    }
+
 }