Commit 86cc230f authored by fangxinjiang's avatar fangxinjiang

派单查询-增减员花名册导出支持针对审核状态为“未审核”的数据导出

parent 212985ff
...@@ -828,14 +828,14 @@ public class TDispatchInfoController { ...@@ -828,14 +828,14 @@ public class TDispatchInfoController {
/** /**
* @Author wzb * @Author wzb
* @Description 导出 导出医保花名 * @Description 导出住房公积金补缴清
* @Date 10:05 2023/7/28 * @Date 10:05 2023/7/28
* @Param * @Param
* @return * @return
**/ **/
@PostMapping("/doexportFundSupplementaryInfo") @PostMapping("/doexportFundSupplementaryInfo")
@Operation(description = "导出住房公积金补缴申请书") @Operation(description = "导出住房公积金补缴清册")
@SysLog("导出住房公积金补缴申请书") @SysLog("导出住房公积金补缴清册")
public void doexportFundInfoOne(HttpServletResponse response, HttpServletRequest request, public void doexportFundInfoOne(HttpServletResponse response, HttpServletRequest request,
@RequestBody SocialHandleSearchVo searchVo) { @RequestBody SocialHandleSearchVo searchVo) {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
......
...@@ -1978,11 +1978,17 @@ ...@@ -1978,11 +1978,17 @@
<sql id="where_getFund"> <sql id="where_getFund">
a.DELETE_FLAG = 0 a.DELETE_FLAG = 0
AND a.fund_id is not null AND a.fund_id is not null
AND a.STATUS in ('2','4')
AND ((PERIOD_DIFF(#{tDispatchInfo.disMonth},REPLACE ( DATE_FORMAT( s.PROVIDENT_START, "%Y-%m" ), '-', '' )))+1) >0 AND ((PERIOD_DIFF(#{tDispatchInfo.disMonth},REPLACE ( DATE_FORMAT( s.PROVIDENT_START, "%Y-%m" ), '-', '' )))+1) >0
AND a.DISPATCH_ITEM like concat('%','公积金','%') AND a.DISPATCH_ITEM like concat('%','公积金','%')
AND a.Type=0 AND a.Type=0
<if test="tDispatchInfo != null"> <if test="tDispatchInfo != null">
<!-- dispatch-status 未提交1待审核2审核通过3审核不通过4办理完成5待SSC审核 -->
<if test='tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == "0" '>
AND a.STATUS in ('2','4')
</if>
<if test='tDispatchInfo.auditStatus != null and tDispatchInfo.auditStatus.trim() == "1" '>
AND a.STATUS in ('1','5')
</if>
<if test="tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''"> <if test="tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''">
AND a.PROVIDENT_HOUSEHOLD_NAME = #{tDispatchInfo.providentHouseholdName} AND a.PROVIDENT_HOUSEHOLD_NAME = #{tDispatchInfo.providentHouseholdName}
</if> </if>
......
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