From 1c6d2cc4867b730a055164b75dd1ff43eeb049b0 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 11 五月 2023 15:15:31 +0800
Subject: [PATCH] yxh
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 83 +++++++++++++++++++++++++----------------
1 files changed, 50 insertions(+), 33 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..4a6cbe0 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
@@ -32,6 +32,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.ibatis.annotations.Options;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.io.*;
@@ -54,6 +55,9 @@
public class ServiceReimbursementController extends BaseController {
@Autowired
private IServiceReimbursementService serviceReimbursementService;
+
+ @Autowired
+ private IServiceReimbursementpayeeService reimbursementpayeeService;
@Autowired
private IServiceReimbursementSharedService serviceReimbursementServiceShare;
@@ -185,6 +189,18 @@
}
/**
+ * 寰�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));
+ }
+
+ /**
* 鏂板鎶ラ攢鐢宠
*/
@ApiOperation("鏂板鎶ラ攢鐢宠")
@@ -196,24 +212,23 @@
public AjaxResult add(@RequestBody ServiceReimbursement serviceReimbursement) {
boolean b = serviceReimbursementService.save(serviceReimbursement);
- if (b) {
- addReiSharedDatd(serviceReimbursement, 1);
- }
+// if (b) {
+// addReiSharedDatd(serviceReimbursement, 1);
+// }
Long id = serviceReimbursement.getId();
return AjaxResult.success(id);
}
public int addReiSharedDatd(ServiceReimbursement serviceReimbursement, int nType) {
//remShare = ;
- ServiceReimbursementShared remShare = null;
+ ServiceReimbursementShared remShare = new ServiceReimbursementShared();
if (nType == 1) {
- remShare = new ServiceReimbursementShared();
+ // remShare = new ServiceReimbursementShared();
remShare.setReimid(serviceReimbursement.getId());
} else //modify
{
List<ServiceReimbursementShared> remlist = serviceReimbursementServiceShare.getRemShareInfoByRemId(serviceReimbursement.getId());
- if (remlist != null)
- remShare = remlist.get(0);
+ if (!CollectionUtils.isEmpty(remlist)) remShare = remlist.get(0);
}
remShare.setUserno(serviceReimbursement.getUserno());
@@ -615,9 +630,9 @@
@PostMapping("/editMoney")
public AjaxResult editMoney(@RequestBody List<ReimbursementService> serviceReimbursement) {
boolean b = serviceReimbursementService.updateById(null);
- if (b) {
- addReiSharedDatd(null, 2);
- }
+// if (b) {
+// addReiSharedDatd(null, 2);
+// }
return toAjax(b);
}
@@ -696,9 +711,10 @@
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));
+ Map<String, List<ServiceReimbursementEo>> listMap = rdInfoByItem.stream().collect(Collectors.groupingBy(ServiceReimbursementEo::getPersontype));
List<Map<String, BigDecimal>> list = new ArrayList<>();
StringBuffer FYXM1 = new StringBuffer();
StringBuffer FYXM2 = new StringBuffer();
@@ -786,25 +802,21 @@
} else {
dataMap.put("FYXM3", "");
}
- // 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(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/> " + serviceReimbursementpayee.getPersonname() + " " + serviceReimbursementpayee.getAmount();
+ remark += " 鍏�; ";
+ if (!StringUtils.isEmpty(serviceReimbursementpayee.getBankname())) {
+ remark += serviceReimbursementpayee.getBankname() + " ( " + serviceReimbursementpayee.getBankcardno() + ")";
+ }
+ remark += " 澶囨敞: " + serviceReimbursementpayee.getPersontype();
+ if (!StringUtils.isEmpty(serviceReimbursementpayee.getRemark())) {
+ remark += serviceReimbursementpayee.getRemark();
+ }
+ }
dataMap.put("BXBZ", remark);
@@ -848,11 +860,16 @@
map.put("DA", s.getDeparture() == null ? "" : s.getDeparture());
Date et = s.getEndtime();
- SimpleDateFormat formatter_et = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String date_et = formatter_et.format(et);
- String year_et = date_et.substring(0, 4);
- String month_et = date_et.substring(5, 7);
- String day_et = date_et.substring(8, 10);
+ String year_et = null;
+ String month_et = null;
+ String day_et = null;
+ if (et != null) {
+ SimpleDateFormat formatter_et = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String date_et = formatter_et.format(et);
+ year_et = date_et.substring(0, 4);
+ month_et = date_et.substring(5, 7);
+ day_et = date_et.substring(8, 10);
+ }
map.put("AY", year_et == null ? "" : year_et);
map.put("AM", month_et == null ? "" : month_et);
@@ -882,7 +899,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