From 395bbce86a24138a3534c41c8a568a7c8d97da67 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 10 五月 2023 21:22:24 +0800
Subject: [PATCH] 下载代码修改

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java |   60 +++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 39 insertions(+), 21 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 cac7c25..cb60c65 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
@@ -188,6 +188,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("鏂板鎶ラ攢鐢宠")
@@ -199,9 +211,9 @@
     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);
     }
@@ -215,8 +227,7 @@
         } else //modify
         {
             List<ServiceReimbursementShared> remlist = serviceReimbursementServiceShare.getRemShareInfoByRemId(serviceReimbursement.getId());
-            if (remlist != null)
-                remShare = remlist.get(0);
+            if (remlist != null) remShare = remlist.get(0);
         }
 
         remShare.setUserno(serviceReimbursement.getUserno());
@@ -618,9 +629,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);
     }
 
@@ -702,8 +713,7 @@
         //鑾峰彇鎶ラ攢鏀粯淇℃伅
         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();
@@ -791,17 +801,20 @@
         } 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 = "";
         for (ServiceReimbursementpayee serviceReimbursementpayee : reimbursementpayeeInfo) {
-            remark += "<w:br/> "+PersonType.getInfoByCode(serviceReimbursementpayee.getPersontype())+ "(" + serviceReimbursementpayee.getPersonname() + " " + serviceReimbursementpayee.getAmount();
-            remark += " 鍏�; " + serviceReimbursementpayee.getBankname() + ": " + serviceReimbursementpayee.getBankcardno() + ") 澶囨敞: " + serviceReimbursementpayee.getRemark();
+            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);
 
@@ -846,11 +859,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);

--
Gitblit v1.9.3