Commit d2815d62 authored by huyuchen's avatar huyuchen

huych-合同自动化代码提交

parent 2b3d0111
...@@ -748,6 +748,10 @@ public class DoJointInsuranceTask { ...@@ -748,6 +748,10 @@ public class DoJointInsuranceTask {
pushParam.setFd_3b16dfb32778f2(deptInfoVo.getFdId()); pushParam.setFd_3b16dfb32778f2(deptInfoVo.getFdId());
pushParam.setFd_3b16dfb32778f2_text(deptInfoVo.getDeptNo()); pushParam.setFd_3b16dfb32778f2_text(deptInfoVo.getDeptNo());
//实际结算月份DateUtil.parseDate(dateStringInsert(param.getSettleMonth()),"yyyy-MM") //实际结算月份DateUtil.parseDate(dateStringInsert(param.getSettleMonth()),"yyyy-MM")
//同倩倩确认结算月为空时,且结算方式不为全量未结算数据时,默认当月
if (Common.isEmpty(param.getSettleMonth()) && !"全量未结算数据".equals(deptInfoVo.getInsurancesType())) {
param.setSettleMonth(LocalDateTimeUtils.formatTime(LocalDateTime.now(),DateUtil.DATETIME_YYYY_MM));
}
if ("结算月本月数据".equals(deptInfoVo.getInsurancesType())) { if ("结算月本月数据".equals(deptInfoVo.getInsurancesType())) {
pushParam.setFd_3af9d11088facc(DateUtil.parseDate(param.getSettleMonth(), DateUtil.DATETIME_YYYY_MM)); pushParam.setFd_3af9d11088facc(DateUtil.parseDate(param.getSettleMonth(), DateUtil.DATETIME_YYYY_MM));
} else if ("结算月上月数据".equals(deptInfoVo.getInsurancesType())) { } else if ("结算月上月数据".equals(deptInfoVo.getInsurancesType())) {
...@@ -820,6 +824,10 @@ public class DoJointInsuranceTask { ...@@ -820,6 +824,10 @@ public class DoJointInsuranceTask {
//商险更新赋值 //商险更新赋值
public void initValueUpdate(EkpInsurancesInfo info,EkpInsuranceDeptInfoVo deptInfoVo,EkpInteractiveParam param) throws ParseException { public void initValueUpdate(EkpInsurancesInfo info,EkpInsuranceDeptInfoVo deptInfoVo,EkpInteractiveParam param) throws ParseException {
//实际结算月份 //实际结算月份
//同倩倩确认结算月为空时,且结算方式不为全量未结算数据时,默认当月
if (Common.isEmpty(param.getSettleMonth()) && !"全量未结算数据".equals(deptInfoVo.getInsurancesType())) {
param.setSettleMonth(LocalDateTimeUtils.formatTime(LocalDateTime.now(),DateUtil.DATETIME_YYYY_MM));
}
info.setFd_3af9d11088facc(!"全量未结算数据".equals(deptInfoVo.getInsurancesType()) ? DateUtil.parseDate(param.getSettleMonth(), DateUtil.DATETIME_YYYY_MM) : null); info.setFd_3af9d11088facc(!"全量未结算数据".equals(deptInfoVo.getInsurancesType()) ? DateUtil.parseDate(param.getSettleMonth(), DateUtil.DATETIME_YYYY_MM) : null);
//是否全部结算 //是否全部结算
info.setFd_3b13b2ecc164aa("全量未结算数据".equals(deptInfoVo.getInsurancesType()) ? "是" : "否"); info.setFd_3b13b2ecc164aa("全量未结算数据".equals(deptInfoVo.getInsurancesType()) ? "是" : "否");
......
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