Commit bb644f7e authored by hongguangwu's avatar hongguangwu

MVP1.6.4-优化社保士兵

parent 70144f64
......@@ -1733,7 +1733,7 @@
<!-- 社保士兵列表查询 -->
<sql id="where_getSocialSoldier">
<where>
s.DELETE_FLAG = 0
a.DELETE_FLAG = '0'
AND a.social_id is not null
and a.AUTO_FLAG = '0'
<include refid="where_getSocialRecordRoster_base"/>
......
......@@ -96,7 +96,7 @@
left join t_social_deadline_info sd on sd.MONTH = DATE_FORMAT(a.AUDIT_TIME,'%Y%m') and sd.STATUS = '0'
and sd.PROVINCE=s.SOCIAL_PROVINCE and sd.CITY=a.SOCIAL_CITY and ( (s.SOCIAL_TOWN is null and sd.TOWN is null) or (sd.TOWN=s.SOCIAL_TOWN))
<include refid="where_getSocialSoldier_base_handler"/>
and DATE_FORMAT(d.AUDIT_TIME,'%Y%m') = DATE_FORMAT(now(),'%Y%m')
and DATE_FORMAT(a.AUDIT_TIME,'%Y%m') = DATE_FORMAT(now(),'%Y%m')
and (sd.id is null or NOW() <![CDATA[ <= ]]> sd.SOCIAL_END_DATE)
</sql>
......@@ -114,7 +114,7 @@
<sql id="where_getSocialSoldier_base_handler">
<where>
s.DELETE_FLAG = 0
a.DELETE_FLAG = '0'
<if test="idsStr != null and idsStr.size > 0">
AND a.ID in
<foreach item="items" index="index" collection="idsStr" open="(" separator="," close=")">
......
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