From 6e2e56de2850204f51642ee3f3b4aff2b04af87c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 26 七月 2023 11:03:26 +0800
Subject: [PATCH] 功能修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 44 +++++++++++++++++-----
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseFinancesubjectServiceImpl.java | 2 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 3 +
ruoyi-admin/src/main/resources/application.yml | 4 +-
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ItemTypeVO.java | 12 ++++++
6 files changed, 53 insertions(+), 14 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 87e72dc..b266873 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
@@ -686,7 +686,8 @@
dataMap.put("BXDFJ", serviceFund.getAttachcount() == 0 ? " " : serviceFund.getAttachcount());
dataMap.put("JXZXM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname());
dataMap.put("JSR", serviceFund.getUsername() == null ? "" : serviceFund.getUsername());
- dataMap.put("FYXM1", "鏀粯涓撳璐圭敤锛屽叾涓◣鍓嶉噾棰�" + serviceFund.getPretaxcost() + "鍏冿紝绋庡悗閲戦" + serviceFund.getTaxedcost() + "鍏冦��");
+// dataMap.put("FYXM1", "鏀粯涓撳璐圭敤锛屽叾涓◣鍓嶉噾棰�" + serviceFund.getPretaxcost() + "鍏冿紝绋庡悗閲戦" + serviceFund.getTaxedcost() + "鍏冦��");
+ dataMap.put("FYXM1", "浜轰綋鍣ㄥ畼鎹愮尞涓撳鍔冲姟璐�:" + serviceFund.getTaxedcost() + "鍏� (鍏朵腑绋庡悗璐圭敤鐢变腑蹇冩壙鎷呯◣璐�)銆�");
dataMap.put("FYXM2", "");
dataMap.put("FYXM3", "");
dataMap.put("JEXS", serviceFund.getAmountrequested());
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 5cc6f16..c210bc5 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
@@ -773,18 +773,30 @@
FYXM1.delete(0, FYXM1.length());
//鍐嶆柊澧�
otherMoneyall = otherMoneyall.add(otherMoney);
- FYXM1.append("OPO宸ヤ綔浜哄憳" + ":" + otherMoneyall + " ");
+ FYXM1.append("OP0 宸ヤ綔浜哄憳鎶ラ攢宸梾璐�" + ":" + otherMoneyall + " ");
} else {
if (flag == 0) {
key1 = key;
flag = 1;
}
if (key1 == key) {
- FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
- allMoney = allMoney.add(otherMoney);
+ if (key.equals("3")) {
+// FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
+ FYXM2.append("涓撳鎶ラ攢宸梾璐� :" + otherMoney);
+ allMoney = allMoney.add(otherMoney);
+ } else {
+ FYXM2.append("瀹跺睘鎶ラ攢宸梾璐瑰強璇伐璐圭敤 : " + otherMoney);
+ allMoney = allMoney.add(otherMoney);
+ }
} else {
- FYXM3.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
- allMoney = allMoney.add(otherMoney);
+ if (key.equals("3")) {
+// FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
+ FYXM3.append("涓撳鎶ラ攢宸梾璐� :" + otherMoney);
+ allMoney = allMoney.add(otherMoney);
+ } else {
+ FYXM3.append("瀹跺睘鎶ラ攢宸梾璐瑰強璇伐璐圭敤 : " + otherMoney);
+ allMoney = allMoney.add(otherMoney);
+ }
}
}
} else {
@@ -793,18 +805,30 @@
FYXM1.delete(0, FYXM1.length());
//鍐嶆柊澧�
otherMoneyall = otherMoneyall.add(otherMoney);
- FYXM1.append("OPO宸ヤ綔浜哄憳" + ":" + otherMoneyall + " ");
+ FYXM1.append("OP0 宸ヤ綔浜哄憳鎶ラ攢宸梾璐�" + ":" + otherMoneyall + " ");
} else {
if (flag == 0) {
key1 = key;
flag = 1;
}
if (key1 == key) {
- FYXM2.append(key + ":" + otherMoney);
- allMoney = allMoney.add(otherMoney);
+ if (key.equals("涓撳")) {
+// FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
+ FYXM2.append("涓撳鎶ラ攢宸梾璐� :" + otherMoney);
+ allMoney = allMoney.add(otherMoney);
+ } else {
+ FYXM2.append("瀹跺睘鎶ラ攢宸梾璐瑰強璇伐璐圭敤 : " + otherMoney);
+ allMoney = allMoney.add(otherMoney);
+ }
} else {
- FYXM3.append(key + ":" + otherMoney);
- allMoney = allMoney.add(otherMoney);
+ if (key.equals("涓撳")) {
+// FYXM2.append(PersonType.getInfoByCode(key) + ":" + otherMoney);
+ FYXM3.append("涓撳鎶ラ攢宸梾璐� :" + otherMoney);
+ allMoney = allMoney.add(otherMoney);
+ } else {
+ FYXM3.append("瀹跺睘鎶ラ攢宸梾璐瑰強璇伐璐圭敤 : " + otherMoney);
+ allMoney = allMoney.add(otherMoney);
+ }
}
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
index 3ca0ad9..f2504ab 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
@@ -103,7 +103,7 @@
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceReimbursementdetailVO serviceReimbursementdetailVO) {
ServiceReimbursementdetail serviceReimbursementdetail = DtoConversionUtils.sourceToTarget(serviceReimbursementdetailVO, ServiceReimbursementdetail.class);
- if (StringUtils.isNotBlank(serviceReimbursementdetailVO.getAnnexfilesList().toString())) {
+ if (!CollectionUtils.isEmpty(serviceReimbursementdetailVO.getAnnexfilesList())) {
serviceReimbursementdetail.setAnnexfiles(JSON.toJSONString(serviceReimbursementdetailVO.getAnnexfilesList()));
}
return toAjax(serviceReimbursementdetailService.save(serviceReimbursementdetail));
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 781e7a8..297e022 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -10,9 +10,9 @@
demoEnabled: true
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
# 寮�鍙戠幆澧� window
-# profile: D:/lihusoft/OPO/WEB/Upload
+ profile: D:/lihusoft/OPO/WEB/Upload
# 寮�鍙戠幆澧� linux
- profile: /home/smartor/uploadFile
+# profile: /home/smartor/uploadFile
# 鍖婚櫌鐜
#profile: E:/OPO/WEB/Upload
# 鑾峰彇ip鍦板潃寮�鍏�
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ItemTypeVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ItemTypeVO.java
index 7c9fe4e..4a7e926 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ItemTypeVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ItemTypeVO.java
@@ -1,16 +1,28 @@
package com.ruoyi.project.domain.vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
+@ApiModel("鏀跺叆璐圭敤绉戠洰绫诲瀷")
public class ItemTypeVO {
+ @ApiModelProperty("椤圭洰绫诲瀷")
private String itemType;
+ @ApiModelProperty("椤圭洰绫诲瀷缂栧彿")
private String itemTypeName;
+ @ApiModelProperty("绉戠洰绫诲瀷鍚嶇О")
+ private String subjecttypename;
+
+ @ApiModelProperty("绉戠洰绫诲瀷锛氭垚鏈敹鍏�")
+ private String subjecttype;
+
+ @ApiModelProperty("椤圭洰鍏蜂綋淇℃伅")
private List<ItemDetailVO> itemDetails;
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseFinancesubjectServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseFinancesubjectServiceImpl.java
index 4aaff4b..fc5f999 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseFinancesubjectServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseFinancesubjectServiceImpl.java
@@ -97,6 +97,8 @@
ItemTypeVO itemTypeVO = new ItemTypeVO();
itemTypeVO.setItemType(b.getItemtype());
itemTypeVO.setItemTypeName(b.getItemtypename());
+ itemTypeVO.setSubjecttype(b.getSubjecttype());
+ itemTypeVO.setSubjecttypename(b.getSubjecttypename());
ItemDetailVO id = new ItemDetailVO();
id.setId(b.getId());
--
Gitblit v1.9.3