From ae29f1b7da8a405a358f5d71150b60a504af5f3a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 11 八月 2023 18:24:35 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 58 ++++++++++++++--------------------------------------------
1 files changed, 14 insertions(+), 44 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 19f6304..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
@@ -484,11 +484,14 @@
}
}
FlowLevel = FlowLevel + 1;
+ //璁板綍涓�涓嬶紝涓嬩竴绾х殑瀹℃壒锛屼互渚夸簬涓嬩竴绾ч��鍥炲悗锛屽彂璧疯�呮彁浜ゆ椂锛岃兘鍐嶆彁鍒板綋鍓嶅鎵瑰眰绾�
+ serviceFund.setBackflowlevel(FlowLevel);
} else {
CheckFlag = 2;
if (CheckFlag == 2) {
//搴斿尰闄㈣姹傚鏋滃嚭鐜伴��鍥烇紝鐩存帴閫�鍒板彂璧疯��
FlowLevel = 0;
+ RecordStatus = -1;
} else {
RecordStatus = (FlowLevel + 1) * 2 - 1;
FlowLevel = (FlowLevel - 1);
@@ -500,6 +503,7 @@
serviceFund.setRecordstatus(RecordStatus);
serviceFund.setFlowlevel(FlowLevel);
+ // serviceFund.setBackflowlevel(serviceFund.getFlowlevel());
ServiceFundflow serviceFundflow = new ServiceFundflow();
SysUser user = loginUser.getUser();
@@ -531,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 {
@@ -595,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);
}
}
@@ -1073,8 +1041,10 @@
}
dataMap.put("items", newList);
- dataMap.put("JEXS", serviceFund.getAmountrequested());
- dataMap.put("JEDS", convert(serviceFund.getAmountrequested()) + "鏁�");
+ dataMap.put("JEXS", serviceFund.getPretaxcost());
+ dataMap.put("JEDS", convert(serviceFund.getPretaxcost()) + "鏁�");
+// dataMap.put("JEXS", serviceFund.getAmountrequested());
+// dataMap.put("JEDS", convert(serviceFund.getAmountrequested()) + "鏁�");
dataMap.put("BXBZ", serviceFund.getRemark() == null ? "" : serviceFund.getRemark());
dataMap.put("YYMMDD", time);
--
Gitblit v1.9.3