From a8b458570fea9039e464150da723b9415b95a64c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 01 二月 2024 16:30:05 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 5 +++--
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementSharedServiceImpl.java | 3 +++
ruoyi-common/src/main/java/com/ruoyi/common/tax/TaxtUtils.java | 10 +++++-----
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesReimbursementOut.java | 7 ++++---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 12 ++++++++++--
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 1 +
6 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
index c65212d..bea9174 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -1189,8 +1189,12 @@
dataMap.put("YWZ", serviceFund.getDeptmentname() == null ? "" : serviceFund.getDeptmentname());
dataMap.put("ZHUZANG", serviceFund.getManagername() == null ? "" : serviceFund.getManagername());
- dataMap.put("FYMC", LocalDate.now().getYear() + "骞�" + LocalDate.now().getMonthValue() + "鏈堜汉浣撳櫒瀹樿幏鍙栨湇鍔＄鐞嗕腑蹇冨伐浣滀汉鍛樼哗鏁�");
+ if (StringUtils.isEmpty(serviceFund.getRemark())) {
+ dataMap.put("FYMC", LocalDate.now().getYear() + "骞�" + LocalDate.now().getMonthValue() + "鏈堜汉浣撳櫒瀹樿幏鍙栨湇鍔＄鐞嗕腑蹇冨伐浣滀汉鍛樼哗鏁�");
+ } else {
+ dataMap.put("FYMC", serviceFund.getRemark().substring(0, serviceFund.getRemark().length() - 2) + "浜轰綋鍣ㄥ畼鑾峰彇鏈嶅姟绠＄悊涓績宸ヤ綔浜哄憳缁╂晥");
+ }
String bz = "";
int i = 0;
if (!serviceFund.getApplytype().equals("5")) {
@@ -1231,7 +1235,11 @@
Map<String, Object> map = new HashMap<String, Object>();
map.put("seqno", 1);
String fyxm = "";
- fyxm += LocalDate.now().getYear() + "骞�" + LocalDate.now().getMonthValue() + "鏈堜汉浣撳櫒瀹樿幏鍙栨湇鍔＄鐞嗕腑蹇冨伐浣滀汉鍛樼哗鏁�,鍏辫";
+ if (StringUtils.isEmpty(serviceFund.getRemark())) {
+ fyxm += LocalDate.now().getYear() + "骞�" + LocalDate.now().getMonthValue() + "鏈堜汉浣撳櫒瀹樿幏鍙栨湇鍔＄鐞嗕腑蹇冨伐浣滀汉鍛樼哗鏁�,鍏辫";
+ } else {
+ fyxm += serviceFund.getRemark().substring(0, serviceFund.getRemark().length() - 2) + "浜轰綋鍣ㄥ畼鑾峰彇鏈嶅姟绠＄悊涓績宸ヤ綔浜哄憳缁╂晥,鍏辫";
+ }
fyxm += serviceFund.getPretaxcost() + "鍏�";
if (serviceFund.getPretaxcost() == null && serviceFund.getPretaxcost() == 0.0) {
fyxm = "";
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
index 09ac2f0..357605a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -368,12 +368,13 @@
}
if (serviceReimbursement.getFlowlevel() == 1 && serviceReimbursement.getBackflowlevel() == 100) {
- log.info("鍑哄樊琛ヨ创琚� 璐㈠姟閫�鍥炲啀鎻愪氦锛屽嚭绾冲啀娆″鎵癸紝涔嬪悗鎻愪氦鍒拌储鍔�");
+ log.info("鍑哄樊琛ヨ创琚� 璐㈠姟閫�鍥炲啀鎻愪氦锛屽嚭绾冲啀娆″鎵癸紝涔嬪悗鎻愪氦鍒拌储鍔�:{}", serviceReimbursement.getId());
//璇存槑鏄储鍔￠��鍥炲啀鎻愪氦鐨�.闇�瑕佸嚭绾冲啀鐪嬩竴閬嶏紝娌￠棶棰樹箣鍚庯紝寰�鍒嗕韩琛ㄩ噷鏂板
serviceReimbursementService.addSharedData(serviceReimbursement.getId());
serviceReimbursement.setFlowlevel(100L);
serviceReimbursement.setRecordstatus(99);
- serviceReimbursementService.updateById(serviceReimbursement);
+ boolean b = serviceReimbursementService.updateById(serviceReimbursement);
+ log.info("鏄惁淇敼鎴愬姛:{}", b);
//淇濆瓨瀹℃壒娴佺▼琛�
ServiceFundflow serviceFundflow = new ServiceFundflow();
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/tax/TaxtUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/tax/TaxtUtils.java
index fbbde5d..a54caba 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/tax/TaxtUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/tax/TaxtUtils.java
@@ -85,12 +85,12 @@
taxMoney = money.divide(new BigDecimal(0.84), 2, BigDecimal.ROUND_CEILING);
}
- if (money.doubleValue() > 21000 && money.doubleValue() <= 40000) {
+ if (money.doubleValue() > 21000 && money.doubleValue() <= 49500) {
money = money.subtract(new BigDecimal(2000));
taxMoney = money.divide(new BigDecimal(0.76), 2, BigDecimal.ROUND_CEILING);
}
- if (money.doubleValue() > 40000) {
+ if (money.doubleValue() > 49500) {
money = money.subtract(new BigDecimal(7000));
taxMoney = money.divide(new BigDecimal(0.68), 2, BigDecimal.ROUND_CEILING);
}
@@ -106,11 +106,11 @@
public static void main(String[] args) {
- String taxation = getTaxation(BigDecimal.valueOf(80589.723));
- String taxationBefore = getTaxationBefore(BigDecimal.valueOf(900.531));
+ String taxation = getTaxation(BigDecimal.valueOf(43000));
+ String taxationBefore = getTaxationBefore(BigDecimal.valueOf(205892.36));
- System.out.println(taxation + " " + taxationBefore);
+ System.out.println("taxation:" + taxation + "============taxationBefore: " + taxationBefore);
}
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesReimbursementOut.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesReimbursementOut.java
index 759f0f7..051a0af 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesReimbursementOut.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/SpFinancialExpensesReimbursementOut.java
@@ -10,9 +10,10 @@
import java.util.Date;
@Data
-public class SpFinancialExpensesReimbursementOut extends ServiceReimbursement
-{
- /** 瀹℃牳鎸夐挳鏍囧織 */
+public class SpFinancialExpensesReimbursementOut extends ServiceReimbursement {
+ /**
+ * 瀹℃牳鎸夐挳鏍囧織
+ */
@ApiModelProperty("瀹℃牳鎸夐挳鏍囧織 0锛氫笉鏄剧ず瀹℃牳锛�1锛氭樉绀哄鏍�")
@Excel(name = "瀹℃牳鎸夐挳鏍囧織")
private Integer CheckFlag;
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
index 72c9c02..ae593c3 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
@@ -158,6 +158,7 @@
reimbursementShared1.setReimid(id);
reimbursementShared1.setDelFlag(0L);
List<ServiceReimbursementShared> serviceReimbursementShareds = sharedService.queryList(reimbursementShared1);
+ log.info("serviceReimbursementShareds鐨勬煡璇㈢粨鏋� :{}", serviceReimbursementShareds.size());
if (!CollectionUtils.isEmpty(serviceReimbursementShareds)) {
return true;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementSharedServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementSharedServiceImpl.java
index b6c33c0..ee8cd01 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementSharedServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementSharedServiceImpl.java
@@ -40,6 +40,9 @@
if (serviceReimbursementShared.getReimid() != null) {
wrappers.eq(ServiceReimbursementShared::getReimid, serviceReimbursementShared.getReimid());
}
+ if (serviceReimbursementShared.getDelFlag() != null) {
+ wrappers.eq(ServiceReimbursementShared::getDelFlag, serviceReimbursementShared.getDelFlag());
+ }
if (StringUtils.isNotBlank(serviceReimbursementShared.getUsername())) {
wrappers.like(ServiceReimbursementShared::getUsername, serviceReimbursementShared.getUsername());
}
--
Gitblit v1.9.3