Parcourir la source

员工信息详情职务类型变更记录同步市平台信息

hanqingsong il y a 1 an
Parent
commit
c3e9191c7a

+ 2 - 2
src/main/java/com/chinaitop/depot/basic/mapper/DRyxxsjyMapper.xml

@@ -131,8 +131,8 @@
131 131
             zw.bgfsrq
132 132
         from
133 133
             base:d_zwlxbgjl zw
134
-            left join base:d_ryzwlxb zwlx on zwlx.rysfzh = zw.bgqzzdwtyshxydm and zwlx.tyshxydm = zw.bgqzzdwtyshxydm
135
-            left join base:d_ryzwlxb zwlx1 on zwlx1.rysfzh = zw.bgqzzdwtyshxydm and zwlx1.tyshxydm = zw.bgqzzdwtyshxydm
134
+            left join base:d_ryzwlxb zwlx on zwlx.rysfzh = zw.rysfzh
135
+	        left join base:d_ryzwlxb zwlx1 on zwlx1.rysfzh = zw.rysfzh
136 136
         where
137 137
             zw.rysfzh = #{sfzh}
138 138
     </select>

+ 10 - 0
src/main/java/com/chinaitop/depot/basic/model/vo/ZwlxbgjlVO.java

@@ -1,5 +1,6 @@
1 1
 package com.chinaitop.depot.basic.model.vo;
2 2
 
3
+import com.fasterxml.jackson.annotation.JsonFormat;
3 4
 import lombok.Data;
4 5
 
5 6
 /**
@@ -9,4 +10,13 @@ import lombok.Data;
9 10
  */
10 11
 @Data
11 12
 public class ZwlxbgjlVO {
13
+
14
+    private String bgqzzdwmc;// 变更前单位名称
15
+    private String zwlxQ;// 职务类型变更前(职务类型,0:主职,1:副职)
16
+    private String bghzzdwmc;// 变更后单位名称
17
+    private String zwlxH;// 职务类型变更后(职务类型,0:主职,1:副职)
18
+    private String bgr;// 变更人
19
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
20
+    private String bgfsrq;// 变更时间
21
+
12 22
 }