Commit 9b6eafeb authored by hongguangwu's avatar hongguangwu

MVP1.7.15-死亡时间等

parent 3dbeb7e7
...@@ -193,4 +193,8 @@ public class SociaFriendYgsAddVo implements Serializable { ...@@ -193,4 +193,8 @@ public class SociaFriendYgsAddVo implements Serializable {
@ExcelProperty("医保仅补缴生成材料") @ExcelProperty("医保仅补缴生成材料")
private String dataFlagYsd; private String dataFlagYsd;
// ryszswrq 入狱/失踪/死亡日期 yyyy-MM-dd;
@ExcelProperty("离职日")
private String leaveDay;
} }
...@@ -563,6 +563,14 @@ public class SocialFriendConfig { ...@@ -563,6 +563,14 @@ public class SocialFriendConfig {
ybjyclArr.addAll(vo.getImgListYsd()); ybjyclArr.addAll(vo.getImgListYsd());
} }
tszdxx.put("ybjycl", ybjyclArr); tszdxx.put("ybjycl", ybjyclArr);
if (type == 4 && "16".equals(vo.getTbyy())) {
// 生存状态变更类型
tszdxx.put("scztbglx", "死亡");
// 生存状态变更原因
tszdxx.put("scztbgyy", "死亡");
// 入狱/失踪/死亡日期 yyyy-MM-dd
tszdxx.put("ryszswrq", vo.getLeaveDay());
}
} else { } else {
if (Common.isNotNull(vo.getAutoLeaveDoc())) { if (Common.isNotNull(vo.getAutoLeaveDoc())) {
tszdxx.put("shjycl", vo.getAutoLeaveDoc()); tszdxx.put("shjycl", vo.getAutoLeaveDoc());
......
...@@ -290,6 +290,7 @@ ...@@ -290,6 +290,7 @@
a.IS_AUTO_LEAVE_DOC isAutoLeaveDoc, a.IS_AUTO_LEAVE_DOC isAutoLeaveDoc,
DATE_FORMAT(a.LEAVE_DATE,'%Y年%m月%d日') leaveDate, DATE_FORMAT(a.LEAVE_DATE,'%Y年%m月%d日') leaveDate,
DATE_FORMAT(a.LEAVE_DATE,'%Y-%m-%d') leaveDay,
DATE_FORMAT(a.create_time,'%Y年%m月%d日') dispatchDate, DATE_FORMAT(a.create_time,'%Y年%m月%d日') dispatchDate,
a.settle_domain deptId, a.settle_domain deptId,
a.ID dispatchId a.ID dispatchId
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment