From 86cc230f0297589a685917f9f4d5aa552720c8b3 Mon Sep 17 00:00:00 2001 From: fangxinjiang <3004453899@qq.com> Date: Mon, 11 Sep 2023 15:49:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E5=8D=95=E6=9F=A5=E8=AF=A2-=E5=A2=9E?= =?UTF-8?q?=E5=87=8F=E5=91=98=E8=8A=B1=E5=90=8D=E5=86=8C=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=92=88=E5=AF=B9=E5=AE=A1=E6=A0=B8=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=BA=E2=80=9C=E6=9C=AA=E5=AE=A1=E6=A0=B8=E2=80=9D?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yifu/social/controller/TDispatchInfoController.java | 6 +++--- .../src/main/resources/mapper/TDispatchInfoMapper.xml | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java b/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java index dec484f34..2a6d5baca 100644 --- a/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java +++ b/yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java @@ -828,14 +828,14 @@ public class TDispatchInfoController { /** * @Author wzb - * @Description 导出 导出医ä¿èŠ±å册 + * @Description 导出ä½æˆ¿å…¬ç§¯é‡‘补缴清册 * @Date 10:05 2023/7/28 * @Param * @return **/ @PostMapping("/doexportFundSupplementaryInfo") - @Operation(description = "导出ä½æˆ¿å…¬ç§¯é‡‘补缴申请书") - @SysLog("导出ä½æˆ¿å…¬ç§¯é‡‘补缴申请书") + @Operation(description = "导出ä½æˆ¿å…¬ç§¯é‡‘补缴清册") + @SysLog("导出ä½æˆ¿å…¬ç§¯é‡‘补缴清册") public void doexportFundInfoOne(HttpServletResponse response, HttpServletRequest request, @RequestBody SocialHandleSearchVo searchVo) { YifuUser user = SecurityUtils.getUser(); diff --git a/yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml b/yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml index 571938720..ab7fc0ac9 100644 --- a/yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml +++ b/yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml @@ -1978,11 +1978,17 @@ <sql id="where_getFund"> a.DELETE_FLAG = 0 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 a.DISPATCH_ITEM like concat('%','公积金','%') AND a.Type=0 <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() != ''"> AND a.PROVIDENT_HOUSEHOLD_NAME = #{tDispatchInfo.providentHouseholdName} </if> -- 2.18.1