用户和报表里面增加机构代码和机构序号字段和查询

src/main/java/com/anjiplus/template/gaea/business/enums/SourceFlagEnum.java

@@ -0,0 +1,47 @@
+package com.anjiplus.template.gaea.business.enums;
+public enum SourceFlagEnum {
+    YYJH(1,"机构养老"),
+    JJYL(2,"居家"),
+    ;
+
+    private int codeValue;
+    private String codeDesc;
+
+    private SourceFlagEnum(int  codeValue, String codeDesc) {
+        this.codeValue = codeValue;
+        this.codeDesc = codeDesc;
+    }
+
+    public int   getCodeValue(){ return this.codeValue;}
+
+    public String getCodeDesc(){ return this.codeDesc;}
+
+    //根据codeValue获取枚举
+    public static SourceFlagEnum parseFromCodeValue(int codeValue){
+        for (SourceFlagEnum e : SourceFlagEnum.values()){
+            if(e.codeValue == codeValue){ return e;}
+        }
+        return null;
+    }
+
+    //根据codeValue获取描述
+    public static String getCodeDescByCodeValue(int codeValue){
+        SourceFlagEnum enumItem = parseFromCodeValue(codeValue);
+        return enumItem == null ? "" : enumItem.getCodeDesc();
+    }
+
+    //验证codeValue是否有效
+    public static boolean validateCodeValue(int codeValue){ return parseFromCodeValue(codeValue)!=null;}
+
+    //列出所有值字符串
+    public static String getString(){
+        StringBuffer buffer = new StringBuffer();
+        for (SourceFlagEnum e : SourceFlagEnum.values()){
+            buffer.append(e.codeValue).append("--").append(e.getCodeDesc()).append(", ");
+        }
+        buffer.deleteCharAt(buffer.lastIndexOf(","));
+        return buffer.toString().trim();
+    }
+
+
+}

src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/GaeaUserDto.java

@@ -24,4 +24,13 @@ public class GaeaUserDto {
 
     /** 用户所拥有的权限合集 */
     private List<String> authorities;
+
+    /** 机构代码 */
+    private String jgdm;
+
+    /** 机构序号 */
+    private String jgxh;
+
+    /**  1--机构养老 2--居家 DIC_NAME=SOURCE_FLAG */
+    private Integer source;
 }

src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/dao/entity/AccessUser.java

@@ -45,4 +45,12 @@ public class AccessUser extends GaeaBaseEntity {
     /** 最后一次登陆时间 */
     private Date lastLoginTime;
 
+    /** 机构代码 */
+    private String jgdm;
+
+    /** 机构序号 */
+    private String jgxh;
+
+    /**  1--机构养老 2--居家 DIC_NAME=SOURCE_FLAG */
+    private Integer source;
 }

src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/service/impl/AccessUserServiceImpl.java

@@ -240,6 +240,9 @@ public class AccessUserServiceImpl implements AccessUserService {
             accessUser.setUpdateTime(new Date());
             accessUser.setUpdateBy(BusinessConstant.USER_ADMIN);
             accessUser.setVersion(1);
+            accessUser.setJgdm(gaeaUserDto.getJgdm());
+            accessUser.setJgxh(gaeaUserDto.getJgxh());
+            accessUser.setSource(gaeaUserDto.getSource());
             insert(accessUser);
             //创建用户角色
             AccessUserDto accessUserDto = new AccessUserDto();
@@ -293,6 +296,9 @@ public class AccessUserServiceImpl implements AccessUserService {
         gaeaUser.setLoginName(loginName);
         gaeaUser.setRealName(accessUser.getRealName());
         gaeaUser.setToken(token);
+        gaeaUser.setJgdm(accessUser.getJgdm());
+        gaeaUser.setJgxh(accessUser.getJgxh());
+        gaeaUser.setSource(accessUser.getSource());
 
         String gaeaUserStr = JSONObject.toJSONString(gaeaUser);
         cacheHelper.stringSetExpire(userKey, gaeaUserStr, 3600);

src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/dto/ReportDto.java

@@ -56,4 +56,12 @@ public class ReportDto extends GaeaBaseDTO implements Serializable {
     /** 下载次数 */
     private Long downloadCount;
 
+    /** 机构代码 */
+    private String jgdm;
+
+    /** 机构序号 */
+    private String jgxh;
+
+    /**  1--机构养老 2--居家 DIC_NAME=SOURCE_FLAG */
+    private Integer source;
 }

src/main/java/com/anjiplus/template/gaea/business/modules/report/controller/param/ReportParam.java

@@ -32,5 +32,15 @@ public class ReportParam extends PageParam implements Serializable{
     @Query(QueryEnum.EQ)
     private String reportType;
 
+    /** 机构代码 */
+    @Query(QueryEnum.EQ)
+    private String jgdm;
+
+    /** 机构序号 */
+    @Query(QueryEnum.EQ)
+    private String jgxh;
 
+    /**  1--机构养老 2--居家 DIC_NAME=SOURCE_FLAG */
+    @Query(QueryEnum.EQ)
+    private Integer source;
 }

src/main/java/com/anjiplus/template/gaea/business/modules/report/dao/entity/Report.java

@@ -46,4 +46,13 @@ public class Report extends GaeaBaseEntity {
 
     /** 0--未删除 1--已删除 DIC_NAME=DELETE_FLAG */
     private Integer deleteFlag;
+
+    /** 机构代码 */
+    private String jgdm;
+
+    /** 机构序号 */
+    private String jgxh;
+
+    /**  1--机构养老 2--居家 DIC_NAME=SOURCE_FLAG */
+    private Integer source;
 }