人员增加字段

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -78,10 +78,34 @@ public class SysUser implements Serializable {
     private Date birthday;
 
 
-
+    /**
+     * 人员编码
+     */
     private String code;
 
+    /**
+     * 同步信息（0不同步，1同步到微信，2同步到u8，3都同步）
+     */
+    @Dict(dicCode = "infoSy")
     private Integer infoSy;
+    /**
+     * 同步状态（0未同步，1已同步）
+     */
+    @Dict(dicCode = "syState")
+    private Integer syState;
+
+    /**
+     * 雇佣状态 10在职 20离退 30离职
+     */
+    @Excel(name = "雇佣状态", width = 15,dicCode="employmentStatus")
+    @Dict(dicCode = "employmentStatus")
+    private Integer employmentStatus;
+    /**
+     * 人员类别 101正式工 102 合同工 103 实习生 104 劳务工
+     */
+    @Excel(name = "人员类别", width = 15,dicCode="category")
+    @Dict(dicCode = "category")
+    private Integer category;
 
     /**
      * 性别（1：男 2：女）
@@ -199,6 +223,10 @@ public class SysUser implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private  Date entryDate;
+    /**离职日期**/
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private  Date termDate;
     /**紧急联系人**/
     @Excel(name="紧急联系人",width = 15)
     private  String urgentName;

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -118,7 +118,7 @@ spring:
         timeBetweenEvictionRunsMillis: 60000
         # 配置一个连接在池中最小生存的时间，单位是毫秒
         minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
+        validationQuery: SELECT 1
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
@@ -131,10 +131,17 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3306/geke?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://10.0.0.199:3306/geke?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+#          url: jdbc:mysql://127.0.0.1:3306/geke?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
           password: 123
           driver-class-name: com.mysql.cj.jdbc.Driver
+
+        multi-datasource1:
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+          url: jdbc:sqlserver://10.0.0.199:1433;SelectMethod=cursor;DatabaseName=UFDATA_111_2021
+          username: sa
+          password: 123@qaz
           # 多数据源配置
           #multi-datasource1:
           #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai