Commit 2a0c3b29 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/master'

parents f220e7a7 01419081
......@@ -1264,13 +1264,14 @@
a.TRUST_REMARK,
DATE_FORMAT(d.CREATE_TIME, '%Y-%m-%d %H:%i:%s') as dispatchTime
FROM t_social_fund_info a
inner join t_dispatch_info d on a.DISPATCH_ID = d.ID
where a.EMP_IDCARD = #{empIdcard}
inner join t_dispatch_info d on a.EMP_IDCARD = d.EMP_IDCARD
where a.EMP_IDCARD = #{empIdcard} and d.DELETE_FLAG = '0' and d.type = '0' and d.SOCIAL_ID is not null
<!-- 社保状态:派增(0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败 10 审核不通过)、派减(6待审核 7待办理 8办理成功 9 办理失败 11派减办理中 12 派减部分办理失败) -->
and a.social_status in ('0', '1', '2', '3', '4', '6', '7', '9', '11', '12')
<if test="type != null and type = '1'">
and d.create_name not like '自动化%'
</if>
group by a.ID
</select>
<!--tSocialFundInfo简单分页查询-->
<select id="selectUnFundInfoByEmpIdcard" resultMap="unFundInfoMap">
......@@ -1290,14 +1291,14 @@
a.PROVIDENT_START,
a.UNIT_PROVIDENG_CARDINAL
FROM t_social_fund_info a
inner join t_dispatch_info d on a.DISPATCH_ID = d.ID
where a.EMP_IDCARD = #{empIdcard}
inner join t_dispatch_info d on a.EMP_IDCARD = d.EMP_IDCARD
where a.EMP_IDCARD = #{empIdcard} and d.DELETE_FLAG = '0' and d.type = '0' and d.FUND_ID is not null
<!-- 派增(0待审核、1待办理、3办理成功、4办理失败9 审核不通过)、派减(5待审核 6待办理 7 办理成功 8 办理失败 ) -->
and a.fund_status in ('0', '1', '3', '5', '6', '8')
<if test="type != null and type = '1'">
and d.create_name not like '自动化%'
</if>
group by a.ID
</select>
<select id="selectSocialFundInfoCountByEmpIdcard" resultType="java.lang.Long">
SELECT count(1)
......
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