Commit ba0234cb authored by fangxinjiang's avatar fangxinjiang

社保公积金户名称日期优化-fxj

parent 06b22e4a
...@@ -2165,7 +2165,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2165,7 +2165,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
List<String> fundHolds, List<String> fundHolds,
Map<String, SysBaseSetInfo> socialHoldMap, Map<String, SysBaseSetInfo> socialHoldMap,
Map<String, SysBaseSetInfo> fundHoldMap) { Map<String, SysBaseSetInfo> fundHoldMap) {
Date now = DateUtil.getCurrentDateTime(); String now = DateUtil.getCurrentDateString(DateUtil.ISO_EXPANDED_DATE_FORMAT);
if (Common.isNotNull(socialholds)) { if (Common.isNotNull(socialholds)) {
List<SysBaseSetInfo> socialBases = baseSetMapper.selectList(Wrappers.<SysBaseSetInfo>query().lambda() List<SysBaseSetInfo> socialBases = baseSetMapper.selectList(Wrappers.<SysBaseSetInfo>query().lambda()
.eq(SysBaseSetInfo::getBaseType, CommonConstants.ZERO_STRING) .eq(SysBaseSetInfo::getBaseType, CommonConstants.ZERO_STRING)
......
...@@ -463,8 +463,8 @@ ...@@ -463,8 +463,8 @@
1=1 1=1
and and
( (
(a.APPLY_START_DATE <![CDATA[ <= ]]> now() and a.APPLY_END_DATE >= now()) (a.APPLY_START_DATE <![CDATA[ <= ]]> CURDATE() and a.APPLY_END_DATE >= CURDATE())
or (a.APPLY_START_DATE <![CDATA[ <= ]]> now() and a.APPLY_END_DATE is null) or (a.APPLY_START_DATE <![CDATA[ <= ]]> CURDATE() and a.APPLY_END_DATE is null)
) )
<if test="fundHolds != null and fundHolds.size > 0"> <if test="fundHolds != null and fundHolds.size > 0">
and a.DEPART_NAME in and a.DEPART_NAME in
......
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