From 6a746727b2149ba3a8f1ddcb97ca38c6687788c8 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 10 五月 2023 21:08:04 +0800
Subject: [PATCH] yxh
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
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 7de9e32..0d00995 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
@@ -56,6 +56,9 @@
private IServiceReimbursementService serviceReimbursementService;
@Autowired
+ private IServiceReimbursementpayeeService reimbursementpayeeService;
+
+ @Autowired
private IServiceReimbursementSharedService serviceReimbursementServiceShare;
@Autowired
@@ -182,6 +185,17 @@
@GetMapping("/getRBDetailList/{id}")
public AjaxResult getRBDetailList(@PathVariable("id") Long id) {
return AjaxResult.success(serviceReimbursementService.getRBDetailList(id));
+ }
+
+ /**
+ * 寰�service_reimbursement_share,寰�service_reimbursementdetail_share,寰�service_reimbursementpyee_share鏂板澶囦唤鏁版嵁
+ * @param id
+ * @return
+ */
+ @GetMapping("/addShareData/{id}")
+ public AjaxResult addSharedData(@PathVariable("id") Long id) {
+
+ return AjaxResult.success(serviceReimbursementService.addSharedData(id));
}
/**
@@ -696,6 +710,8 @@
ServiceReimbursementEo serviceReimbursementEo = new ServiceReimbursementEo();
serviceReimbursementEo.setId(id);
List<ServiceReimbursementEo> rdInfoByItem = serviceReimbursementService.getRDInfoByItem(serviceReimbursementEo);
+ //鑾峰彇鎶ラ攢鏀粯淇℃伅
+ List<ServiceReimbursementpayee> reimbursementpayeeInfo = reimbursementpayeeService.getReimbursementpayeeInfo(serviceReimbursementEo);
Map<String, List<ServiceReimbursementEo>> listMap = rdInfoByItem.stream()
.collect(Collectors.groupingBy(ServiceReimbursementEo::getPersontype));
@@ -786,25 +802,18 @@
} else {
dataMap.put("FYXM3", "");
}
- // dataMap.put("JEXS", rdInfoByItem.get(0).getAmountrequested());
+ // dataMap.put("JEXS", rdInfoByItem.get(0).getAmountrequested());
dataMap.put("JEXS", allMoney);
//double temp = 0;
//temp = Math.round(serviceReimbursement.getAmountrequested() * 100) * 0.01d;
- // dataMap.put("JEDS", convert(rdInfoByItem.get(0).getAmountrequested().doubleValue()) + "鏁�");
+ // dataMap.put("JEDS", convert(rdInfoByItem.get(0).getAmountrequested().doubleValue()) + "鏁�");
dataMap.put("JEDS", convert(allMoney.doubleValue()) + "鏁�");
String remark = "";
- remark += rdInfoByItem.get(0).getCosttypename() == null ? "" : rdInfoByItem.get(0).getCosttypename() + "(";
-
- remark += rdInfoByItem.get(0).getTravelers() == null ? "" : rdInfoByItem.get(0).getTravelers() + ": ";
-
- remark += rdInfoByItem.get(0).getIdcardno() == null ? "" : rdInfoByItem.get(0).getIdcardno() + "; ";
-
- remark += rdInfoByItem.get(0).getDepositbank() == null ? "" : rdInfoByItem.get(0).getDepositbank() + ": ";
-
- remark += rdInfoByItem.get(0).getBankcardno() == null ? "" : rdInfoByItem.get(0).getBankcardno() + ")";
- remark += "\n";
- remark += rdInfoByItem.get(0).getRemark() == null ? "" : rdInfoByItem.get(0).getRemark();
+ for (ServiceReimbursementpayee serviceReimbursementpayee : reimbursementpayeeInfo) {
+ remark += "<w:br/> "+PersonType.getInfoByCode(serviceReimbursementpayee.getPersontype())+ "(" + serviceReimbursementpayee.getPersonname() + " " + serviceReimbursementpayee.getAmount();
+ remark += " 鍏�; " + serviceReimbursementpayee.getBankname() + ": " + serviceReimbursementpayee.getBankcardno() + ") 澶囨敞: " + serviceReimbursementpayee.getRemark();
+ }
dataMap.put("BXBZ", remark);
@@ -882,7 +891,7 @@
//hj = Math.round(hj * 100) * 0.01d;
// DecimalFormat df = new DecimalFormat("0.00");
- // hj = new Double(df.format(hj).toString());
+ // hj = new Double(df.format(hj).toString());
newsList.add(map);
}
--
Gitblit v1.9.3