From ae29f1b7da8a405a358f5d71150b60a504af5f3a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 11 八月 2023 18:24:35 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 15 +++----
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 29 ++++++++++----
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 48 +++---------------------
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 1
5 files changed, 35 insertions(+), 60 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 34ba26a..737e585 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
@@ -535,39 +535,6 @@
serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勫叧浜庢崘鐚渚嬨��" + serviceFund.getDonorname() + "銆戠殑璐圭敤鐢宠宸查�氳繃" + (OriginalFlowLevel + 1) + "绾у鏍�");
if (TotalLevel == OriginalFlowLevel + 1) {
serviceFundService.addFundSharedInfo(checkFundVO.getFundid());
-// ServiceFundShared serviceFundShared = DtoConversionUtils.sourceToTarget(serviceFund, ServiceFundShared.class);
-// serviceFundShared.setId(null);
-// serviceFundShared.setSerfunid(serviceFund.getId());
-// serviceFundShared.setAmountrequested(new BigDecimal(serviceFund.getAmountrequested()));
-// serviceFundShared.setPrepaidamount(new BigDecimal(serviceFund.getPrepaidamount()));
-// serviceFundShared.setTotalcost(new BigDecimal(serviceFund.getTotalcost()));
-// serviceFundShared.setProcurementcost(new BigDecimal(serviceFund.getProcurementcost()));
-// serviceFundShared.setExpertcost(new BigDecimal(serviceFund.getExpertcost()));
-// serviceFundShared.setEthicscost(new BigDecimal(serviceFund.getEthicscost()));
-// serviceFundShared.setMedicalcost(new BigDecimal(serviceFund.getMedicalcost()));
-// serviceFundShared.setFamilycost(new BigDecimal(serviceFund.getFamilycost()));
-// serviceFundShared.setAftercarecost(new BigDecimal(serviceFund.getAftercarecost()));
-// fundSharedService.save(serviceFundShared);
-//
-// Map<String, Object> columnMap = new HashMap<>();
-// columnMap.put("fundID", checkFundVO.getFundid());
-// //鑾峰彇璇︽儏鏁版嵁
-// List<ServiceFunddetail> serviceFunddetails = serviceFunddetailMapper.selectByMap(columnMap);
-// logger.info("serviceFundController---checkFund鐨勮繑鍥炲�約erviceFunddetails :{}", serviceFunddetails);
-// List<ServiceFunddetailShared> serviceFunddetailShareds = DtoConversionUtils.sourceToTarget(serviceFunddetails, ServiceFunddetailShared.class);
-// for (int i = 0; i < serviceFunddetails.size(); i++) {
-// serviceFunddetailShareds.get(i).setFundid(serviceFundShared.getId());
-// serviceFunddetailShareds.get(i).setFdid(serviceFunddetails.get(i).getId());
-// serviceFunddetailShareds.get(i).setAmount(new BigDecimal(serviceFunddetails.get(i).getAmount()));
-// serviceFunddetailShareds.get(i).setPrepaidamount(new BigDecimal(serviceFunddetails.get(i).getPrepaidamount()));
-// serviceFunddetailShareds.get(i).setTaxamount(new BigDecimal(serviceFunddetails.get(i).getTaxamount()));
-// serviceFunddetailShareds.get(i).setTaxedamount(new BigDecimal(serviceFunddetails.get(i).getTaxedamount()));
-// serviceFunddetailShareds.get(i).setQuantity(new BigDecimal(serviceFunddetails.get(i).getQuantity()));
-// serviceFunddetailShareds.get(i).setPrice(new BigDecimal(serviceFunddetails.get(i).getPrice()));
-// serviceFunddetailShareds.get(i).setId(null);
-// }
-// funddetailSharedService.saveBatch(serviceFunddetailShareds);
-
}
} else {
@@ -599,23 +566,20 @@
}
for (ServiceFund sf : infoByInfoIdList) {
//濡傛灉绛変簬100锛岃鏄庡凡缁忚蛋鍒板尰闄㈣储鍔￠偅杈逛簡锛涜储鍔￠偅杈瑰彇鏁版嵁鏄粠鍒嗕韩琛ㄥ彇锛屾墍浠ワ紝杩欓噷鐩存帴寰�鍒嗕韩琛ㄩ噷娣诲姞鏁版嵁灏辫浜�
- if (sf.getBackflowlevel() == 100 || sf.getBackflowlevel() == 199) {
- ServiceFundShared serviceFundShared = DtoConversionUtils.sourceToTarget(serviceFund, ServiceFundShared.class);
- serviceFundShared.setId(null);
- serviceFundShared.setDel_flag(0);
- fundSharedService.save(serviceFundShared);
-
+ if (sf.getBackflowlevel() == 199) {
//灏唂und琛ㄧ殑瀹℃牳鐘舵�佹敼鎴�100
sf.setBackflowlevel(100);
serviceFundService.updateById(sf);
+
+ //寰�鍒嗕韩琛ㄩ噷鏂板
+ serviceFundService.addFundSharedInfo(serviceFund.getId());
+
return success();
} else {
serviceFund.setFlowlevel(sf.getBackflowlevel());
boolean bret = serviceFundService.updateById(serviceFund);
log.info("serviceFundService.updateById杩斿弬:{}", bret);
-// if (bret) {
-// addReiSharedDatd(serviceFund, 2);
-// }
+
return toAjax(bret);
}
}
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 24a3cec..22b64aa 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
@@ -450,20 +450,17 @@
ServiceReimbursement serviceReimbursement = serviceReimbursementService.getById(checkFundVO.getFundid());
//濡傛灉绛変簬100锛岃鏄庡凡缁忚蛋鍒板尰闄㈣储鍔￠偅杈逛簡锛涜储鍔￠偅杈瑰彇鏁版嵁鏄粠鍒嗕韩琛ㄥ彇锛屾墍浠ワ紝杩欓噷鐩存帴寰�鍒嗕韩琛ㄩ噷娣诲姞鏁版嵁灏辫浜�;
if (!Objects.isNull(serviceReimbursement) && serviceReimbursement.getBackflowlevel() != null) {
- if (serviceReimbursement.getBackflowlevel() == 100 || serviceReimbursement.getBackflowlevel() == 199) {
-
- //灏嗕慨鏀圭殑涓婃姤鏁版嵁 鏂板涓�鏉�
- ServiceReimbursementShared serviceReimbursementShared = DtoConversionUtils.sourceToTarget(serviceReimbursement, ServiceReimbursementShared.class);
- serviceReimbursementShared.setId(null);
- serviceReimbursementShared.setDelFlag(0L);
- serviceReimbursementShared.setReimid(serviceReimbursement.getId());
- serviceReimbursementSharedService.save(serviceReimbursementShared);
-
+// if (serviceReimbursement.getBackflowlevel() == 100 || serviceReimbursement.getBackflowlevel() == 199) {
+ if (serviceReimbursement.getBackflowlevel() == 199) {
//灏嗛��鍥為樁娈佃缃垚100
serviceReimbursement.setBackflowlevel(100L);
serviceReimbursement.setFlowlevel(100L);
serviceReimbursement.setRecordstatus(0);
serviceReimbursementService.updateById(serviceReimbursement);
+
+ //灏嗕慨鏀圭殑涓婃姤鏁版嵁 鏂板涓�鏉�
+ serviceReimbursementService.addSharedData(checkFundVO.getFundid());
+
return success();
}
}
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 322bbe7..98428b7 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
@@ -247,6 +247,7 @@
//file鐢ㄧ殑鏄粷瀵逛綅缃�
String substring = url.substring(url.indexOf("/profile/upload") + "/profile/upload".length());
String strFile = rbDetailFile.getUrl().replace(filePath, "/profile/upload");
+ System.out.println("filePath + substring鏄贡鐮佸悧: " + filePath + substring);
File filetest = new File(filePath + substring);
try {
log.info("璇锋眰绗笁鏂圭殑鍏ュ弬strFile : {}, strFUrl : {}", strFile, filePath);
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
index 519981a..026504e 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementMapper.xml
@@ -163,7 +163,7 @@
<select id="getRDInfoByItem" resultType="com.ruoyi.project.domain.ServiceReimbursementEo">
SELECT a.id as id,a.UserNo as userno,a.FlowLevel as recordstatus,b.persontype as persontype,a.create_time as
- createTime,
+ createTime,a.managername as managername,
a.UserName as username,b.personname as travelers,a.AmountRequested as amountrequested,a.Reason as reason,a.Phone
as phone,a.DepositBank as depositbank,a.BankCardNo as bankcardno,a.DonorName as donorname,b.trafficexpense as
trafficexpense,b.hotelexpense as hotelexpense,b.FoodExpenses as foodexpenses, b.foodallowance as foodallowance,
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 732e3f3..1d6ab7c 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -60,7 +60,7 @@
//鏌ュ嚭鎵�鏈夎鍖婚櫌閫�鍥炵殑Fund鏁版嵁
List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryFundShareList();
for (ServiceFundShared serviceFundShared : serviceFundShareds) {
- if (StringUtils.isNotBlank(serviceFundShared.getCxrjyj())) {
+ if (serviceFundShared.getOabdzt().equals("宸叉挙閿�")) {
//濡傛灉鏈夎储鍔￠┏鍥炰俊鎭鏄庢槸閫�鍥炵殑
String[] split = serviceFundShared.getCxrjyj().split("&");
String phone = serviceFundShared.getPhone();
@@ -83,14 +83,20 @@
ServiceFund serviceFund = new ServiceFund();
serviceFund.setId(serviceFundShared.getSerfunid());
serviceFund.setZffs(serviceFundShared.getZffs());
- if (StringUtils.isNotBlank(serviceFundShared.getOpochecker())) {
- serviceFund.setOpochecker(serviceFundShared.getOpochecker());
- }
if (StringUtils.isNotBlank(serviceFundShared.getFinvicepresident())) {
serviceFund.setFinvicepresident(serviceFundShared.getFinvicepresident());
}
if (StringUtils.isNotBlank(serviceFundShared.getBusvicepresident())) {
serviceFund.setBusvicepresident(serviceFundShared.getBusvicepresident());
+ }
+ if (StringUtils.isNotBlank(serviceFundShared.getOfficedirector())) {
+ serviceFund.setBusvicepresident(serviceFundShared.getOfficedirector());
+ }
+ if (StringUtils.isNotBlank(serviceFundShared.getFinancedirector())) {
+ serviceFund.setBusvicepresident(serviceFundShared.getFinancedirector());
+ }
+ if (StringUtils.isNotBlank(serviceFundShared.getFinancechecher())) {
+ serviceFund.setBusvicepresident(serviceFundShared.getFinancechecher());
}
serviceFund.setRiqi(serviceFundShared.getRiqi());
boolean b = serviceFundService.updateById(serviceFund);
@@ -269,7 +275,7 @@
//鏌ュ嚭鎵�鏈夎鍖婚櫌閫�鍥炵殑Reimbursement鏁版嵁
List<ServiceReimbursementShared> serviceReimbursementShareds = serviceReimbursementSharedService.queryReShareList();
for (ServiceReimbursementShared serviceReimbursementShared : serviceReimbursementShareds) {
- if (StringUtils.isNotBlank(serviceReimbursementShared.getCxrjyj())) {
+ if (serviceReimbursementShared.getOabdzt().equals("宸叉挙閿�")) {
String phone = serviceReimbursementShared.getPhone();
String[] split = serviceReimbursementShared.getCxrjyj().split("&");
@@ -296,15 +302,22 @@
serviceReimbursement.setId(serviceReimbursementShared.getReimid());
serviceReimbursement.setZffs(serviceReimbursementShared.getZffs());
serviceReimbursement.setRiqi(serviceReimbursementShared.getRiqi());
- if (StringUtils.isNotBlank(serviceReimbursementShared.getOpochecker())) {
- serviceReimbursement.setOpochecker(serviceReimbursementShared.getOpochecker());
- }
+
if (StringUtils.isNotBlank(serviceReimbursementShared.getFinvicepresident())) {
serviceReimbursement.setFinvicepresident(serviceReimbursementShared.getFinvicepresident());
}
if (StringUtils.isNotBlank(serviceReimbursementShared.getBusvicepresident())) {
serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getBusvicepresident());
}
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getOfficedirector())) {
+ serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getOfficedirector());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getFinancedirector())) {
+ serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getFinancedirector());
+ }
+ if (StringUtils.isNotBlank(serviceReimbursementShared.getFinancechecher())) {
+ serviceReimbursement.setBusvicepresident(serviceReimbursementShared.getFinancechecher());
+ }
boolean b = serviceReimbursementService.updateById(serviceReimbursement);
log.info("鏇存柊serviceReimbursement閲岀殑zffs琛ㄦ槸鍚︽垚鍔�: {}", b);
ServiceFundflow serviceFundflow = new ServiceFundflow();
--
Gitblit v1.9.3