From 893cc60ecc152d29472412a13544d52b148cac39 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期二, 14 十月 2025 14:28:51 +0800 Subject: [PATCH] 将applyType传给第三方 --- ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java index 556c138..f66c3ec 100644 --- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java +++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java @@ -15,6 +15,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.enums.ApplyTypeEnum; import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.utils.HttpClientKit; import com.ruoyi.common.utils.StringUtils; @@ -696,13 +697,13 @@ map.put("寮�鎴烽摱琛�", serviceFunddetailShared.getDepositbank()); map.put("鍗″彿", serviceFunddetailShared.getBankcardno()); map.put("鏀剁泭浜哄灞炴垨涓撳", serviceFunddetailShared.getBeneficiaryname()); - map.put("绋庡悗閲戦", serviceFunddetailShared.getTaxamount()); + map.put("绋庡悗閲戦", serviceFunddetailShared.getTaxedamount()); map.put("浣滃簾鏈�缁堥噾棰�", null); Long fpuuid = COUNTER.incrementAndGet(); map.put("鍙戠エ闄勪欢", fpuuid); map.put("鍙戠エ璇嗗埆", null); map.put("璇嗗埆浜�", null); - map.put("绋庨", null); + map.put("绋庨", serviceFunddetailShared.getTaxamount()); long qtuuid = COUNTER.incrementAndGet(); map.put("鍏朵粬闄勪欢", qtuuid); map.put("椤圭洰缂栫爜", serviceFunddetailShared.getItemcode()); @@ -765,7 +766,12 @@ formmain_0831.put("澶囨敞", null); formmain_0831.put("璐㈠姟瀹℃壒", null); formmain_0831.put("璐㈠姟閮ㄨ礋璐d汉瀹℃壒", getLastApprovalInfo(serviceFundflows, serviceFund.getFinancedirector())); - formmain_0831.put("鍔炲叕瀹や富浠诲鎵�", getLastApprovalInfo(serviceFundflows, serviceFund.getOfficedirector())); + +// formmain_0831.put("鍔炲叕瀹や富浠诲鎵�", "鍔炲叕瀹や富浠诲鎵�", "瀹℃壒浜猴細鍛ㄨ偛鎴� & 瀹℃壒鏃堕棿锛�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃"); + if (serviceFund.getBackflowlevel() == 3) + formmain_0831.put("鍔炲叕瀹や富浠诲鎵�", "瀹℃壒浜猴細鍛ㄨ偛鎴� & 瀹℃壒鏃堕棿锛�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃"); + else formmain_0831.put("鍔炲叕瀹や富浠诲鎵�", getLastApprovalInfo(serviceFundflows, "鍛ㄨ偛鎴�")); + formmain_0831.put("涓氬姟鍓櫌闀垮鎵�", serviceFund.getBusvicepresident()); formmain_0831.put("璐㈠姟鍓櫌闀垮鎵�", serviceFund.getFinvicepresident()); formmain_0831.put("涓績璐熻矗浜哄鎵�", serviceFund.getOpochecker()); @@ -776,7 +782,7 @@ formmain_0831.put("璇嗗埆浜�-浣滃簾", null); formmain_0831.put("璐㈠姟瀹℃壒绛惧瓧", serviceFund.getFinancedirector()); formmain_0831.put("璐㈠姟閮ㄨ礋璐d汉绛惧瓧", serviceFund.getFinancedirector()); - formmain_0831.put("琛ㄨ揪绫诲瀷", null); + formmain_0831.put("琛ㄨ揪绫诲瀷", StringUtils.isEmpty(serviceFund.getApplytype()) ? null : ApplyTypeEnum.getDescByCode(serviceFund.getApplytype())); formmain_0831.put("绋庡墠閲戦鍚堣", serviceFund.getPretaxcost()); formmain_0831.put("绋庨鍚堣", serviceFund.getPretaxcost() - serviceFund.getTaxedcost()); formmain_0831.put("琛ㄥ崟缂栧彿1", null); @@ -806,8 +812,9 @@ SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); return "瀹℃壒浜猴細" + managerName + " & 瀹℃壒鏃堕棿锛�" + sd.format(new Date()) + " & 瀹℃壒缁撴灉锛氶�氳繃"; } - - Optional<ServiceFundflow> lastApproval = serviceFundflows.stream().filter(flow -> managerName.contains(flow.getCheckusername())).max(Comparator.comparing(ServiceFundflow::getCreateTime)); + //鍘讳竴涓嬬┖鏍� + String mn = managerName.trim(); + Optional<ServiceFundflow> lastApproval = serviceFundflows.stream().filter(flow -> mn.trim().contains(flow.getCheckusername())).max(Comparator.comparing(ServiceFundflow::getCreateTime)); if (lastApproval.isPresent()) { ServiceFundflow flow = lastApproval.get(); -- Gitblit v1.9.3