From 00e066b1b6c1f2c5e94adfcf50b49cf2a3d682d0 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 12 九月 2023 13:43:02 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 1328 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 750 insertions(+), 578 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 df35e04..982ecc3 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
@@ -1,7 +1,5 @@
package com.ruoyi.web.controller.project;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
@@ -13,43 +11,57 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.HttpClientKit;
+import com.ruoyi.common.tax.TaxtUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.*;
+import com.ruoyi.project.mapper.ServiceFunddetailMapper;
import com.ruoyi.project.service.*;
+import com.ruoyi.system.service.ISysPostService;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
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.*;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
import static com.ruoyi.web.controller.project.ServiceReimbursementController.convert;
/**
* 璐圭敤鐢宠涓籆ontroller
- *
+ *
* @author ruoyi
* @date 2022-01-24
*/
+@Slf4j
@Api("璐圭敤鐢宠涓�")
@RestController
@RequestMapping("/project/fund")
-public class ServiceFundController extends BaseController
-{
+public class ServiceFundController extends BaseController {
private static Configuration configuration = null;
@Autowired
private IServiceFundService serviceFundService;
@Autowired
+ private IServiceFundSharedService fundSharedService;
+ @Autowired
+ private ServiceFunddetailMapper serviceFunddetailMapper;
+ @Autowired
private IServiceFunddetailService serviceFunddetailService;
+ @Autowired
+ private IServiceFunddetailSharedService funddetailSharedService;
@Autowired
private IServiceFundflowruleService serviceFundflowruleService;
@Autowired
@@ -66,6 +78,12 @@
@Autowired
private IServiceFundSharedService fundServiceShare;
+ @Autowired
+ private IServiceExternalpersonService externalpersonService;
+
+ @Autowired
+ private ISysPostService postService;
+
public ServiceFundController() {
configuration = new Configuration();
@@ -78,16 +96,17 @@
@ApiOperation("鏌ヨ璐圭敤鐢宠涓诲垪琛�")
//@PreAuthorize("@ss.hasPermi('project:fund:list')")
@GetMapping("/list")
- public TableDataInfo list(ServiceFund serviceFund)
- {
+ public TableDataInfo list(ServiceFund serviceFund) {
startPage();
//List<ServiceFund> list = serviceFundService.queryList(serviceFund);
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ serviceFund.setUsername(user.getNickName());
List<ServiceFund> list = serviceFundService.selectServiceFundList(serviceFund);
return getDataTable(list);
}
@GetMapping("/listnew")
- public TableDataInfo listnew(FundVO fundVO){
+ public TableDataInfo listnew(FundVO fundVO) {
startPage();
List<FundVO> list = serviceFundService.selectVOList(fundVO);
return getDataTable(list);
@@ -99,67 +118,77 @@
@ApiOperation("鏍规嵁鏉冮檺鏄剧ず瀹℃牳鍒楄〃")
@Log(title = "鏍规嵁鏉冮檺鏄剧ず瀹℃牳鍒楄〃", businessType = BusinessType.OTHER)
@GetMapping("/listbypower")
- public TableDataInfo getListBypower(SpFinancialExpensesIn spFinancialExpensesIn)
- {
+ public TableDataInfo getListBypower(SpFinancialExpensesIn spFinancialExpensesIn) {
LoginUser loginUser = getLoginUser();
- String APPLICANT=spFinancialExpensesIn.getAPPLICANT();
- String APPLICATIONBEGTIME=spFinancialExpensesIn.getAPPLICATIONBEGTIME();
- String APPLICATIONENDTIME=spFinancialExpensesIn.getAPPLICATIONENDTIME();
- Integer CHECKFLAG=spFinancialExpensesIn.getCHECKFLAG();
- Integer APPLYTYPE=spFinancialExpensesIn.getAPPLYTYPE();
- Integer pageNum=spFinancialExpensesIn.getPageNum();
- Integer pageSize=spFinancialExpensesIn.getPageSize();
+ String APPLICANT = spFinancialExpensesIn.getAPPLICANT();
+ String APPLICATIONBEGTIME = spFinancialExpensesIn.getAPPLICATIONBEGTIME();
+ String APPLICATIONENDTIME = spFinancialExpensesIn.getAPPLICATIONENDTIME();
+ Integer CHECKFLAG = spFinancialExpensesIn.getCHECKFLAG();
+ Integer APPLYTYPE = spFinancialExpensesIn.getAPPLYTYPE();
+ Integer pageNum = spFinancialExpensesIn.getPageNum();
+ Integer pageSize = spFinancialExpensesIn.getPageSize();
- if(pageNum==null)
- {
- pageNum=1;
+ if (pageNum == null) {
+ pageNum = 1;
}
- if(pageSize==null)
- {
- pageSize=10;
+ if (pageSize == null) {
+ pageSize = 10;
}
- if(APPLICANT==null)
- {
- APPLICANT="";
+ if (APPLICANT == null) {
+ APPLICANT = "";
}
- if(APPLICATIONBEGTIME==null)
- {
- APPLICATIONBEGTIME="";
+ if (APPLICATIONBEGTIME == null) {
+ APPLICATIONBEGTIME = "";
}
- if(APPLICATIONENDTIME==null)
- {
- APPLICATIONENDTIME="";
+ if (APPLICATIONENDTIME == null) {
+ APPLICATIONENDTIME = "";
}
//startPage();
- List<SpFinancialExpensesFundOut> list = serviceFundService.getListBypower(loginUser.getUsername(),2,APPLICANT,APPLICATIONBEGTIME,APPLICATIONENDTIME,loginUser.getDeptId().toString(),CHECKFLAG,APPLYTYPE);
- //return getDataTable(list);
- return getCustomDataTable(list,pageNum,pageSize);
+ List<SpFinancialExpensesFundOut> list = serviceFundService.getListBypower(loginUser.getUsername(), 2, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE);
+ //閫氳繃鎹愮尞鑰呰繃婊�
+ if (StringUtils.isNotEmpty(spFinancialExpensesIn.getDonorname())) {
+ list = list.stream().filter(obj -> obj.getDonorname().contains(spFinancialExpensesIn.getDonorname())).collect(Collectors.toList());
+ }
+
+ //閫氳繃閲戦杩囨护
+ if (spFinancialExpensesIn.getMoney() != null) {
+ list = list.stream().filter(reimbursementOut -> new BigDecimal(reimbursementOut.getPretaxcost()).compareTo(new BigDecimal(spFinancialExpensesIn.getMoney())) == 0).collect(Collectors.toList());
+
+ }
+
+ Collections.sort(list, new Comparator<SpFinancialExpensesFundOut>() {
+ @Override
+ public int compare(SpFinancialExpensesFundOut o1, SpFinancialExpensesFundOut o2) {
+ return o1.getCreateTime().compareTo(o2.getCreateTime());
+ }
+ });
+ return getCustomDataTable(list, pageNum, pageSize);
}
@ApiOperation("鏌ヨ璐圭敤鐢宠涓诲垪琛�")
//@PreAuthorize("@ss.hasPermi('project:fund:list')")
@GetMapping(value = "/getInfo/{infoid}")
- public AjaxResult getInfoByInfoId(@PathVariable("infoid") Long infoid)
- {
+ public AjaxResult getInfoByInfoId(@PathVariable("infoid") Long infoid) {
return AjaxResult.success(serviceFundService.getInfoByInfoId(infoid));
}
@GetMapping("/getFundId/{infoid}")
- public AjaxResult getFundId(@PathVariable("infoid") Long infoid){
+ public AjaxResult getFundId(@PathVariable("infoid") Long infoid) {
return AjaxResult.success(serviceFundService.getFundId(infoid));
}
- @GetMapping("/getFundDetail/{id}")
- public AjaxResult getFundDetail(@PathVariable("id") Long id){
- return AjaxResult.success(serviceFundService.getFundDetail(id));
- }
+// @GetMapping("/addFundSharedInfo/{id}")
+// public AjaxResult addFundSharedInfo(@PathVariable("id") Long id) {
+// return AjaxResult.success(serviceFundService.addFundSharedInfo(id));
+// }
+
/**
* 瀵煎嚭璐圭敤鐢宠涓诲垪琛�
@@ -168,13 +197,11 @@
//@PreAuthorize("@ss.hasPermi('project:fund:export')")
@Log(title = "璐圭敤鐢宠涓�", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceFund serviceFund)
- {
+ public AjaxResult export(ServiceFund serviceFund) {
List<ServiceFund> list = serviceFundService.queryList(serviceFund);
ExcelUtil<ServiceFund> util = new ExcelUtil<ServiceFund>(ServiceFund.class);
return util.exportExcel(list, "璐圭敤鐢宠涓绘暟鎹�");
}
-
/**
@@ -183,8 +210,7 @@
@ApiOperation("鑾峰彇璐圭敤鐢宠涓昏缁嗕俊鎭�")
//@PreAuthorize("@ss.hasPermi('project:fund:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceFundService.getById(id));
}
@@ -197,266 +223,239 @@
@PostMapping
@RepeatSubmit
@Options(useGeneratedKeys = true, keyProperty = "id")
- public AjaxResult add(@RequestBody ServiceFund serviceFund)
- {
+ public AjaxResult add(@RequestBody ServiceFund serviceFund) {
boolean b = serviceFundService.save(serviceFund);
Long id = serviceFund.getId();
- if(b)
- {
- addReiSharedDatd(serviceFund,1);
- }
+// if (b) {
+// addReiSharedDatd(serviceFund, 1);
+// }
return AjaxResult.success(id);
}
- public int addReiSharedDatd(ServiceFund serviceFund,int nType)
- {
- //remShare = ;
- ServiceFundShared remShare = null;
- if(nType == 1)
- {
- remShare = new ServiceFundShared();
- remShare.setSerfunid(serviceFund.getId());
- }
- else //modify
- {
- List<ServiceFundShared> remlist = fundServiceShare.getFundShareInfoById(serviceFund.getId());
- if(remlist!=null)
- remShare =remlist.get(0);
- }
-
- remShare.setDonorno(serviceFund.getDonorno());
- remShare.setDonorname(serviceFund.getDonorname());
- remShare.setUserno(serviceFund.getUserno());
- remShare.setUsername(serviceFund.getUsername());
- remShare.setUnitname(serviceFund.getUnitname());
- remShare.setUnitno(serviceFund.getUnitno());
- remShare.setUnituserno(serviceFund.getUnituserno());
- remShare.setPhone(serviceFund.getPhone());
- remShare.setAnnexbankcard(serviceFund.getAnnexbankcard());
- remShare.setAnnexregistform(serviceFund.getAnnexregistform());
- Double nTemp= serviceFund.getPretaxcost();
- if( nTemp == null) nTemp = 0d;
- remShare.setPretaxcost(BigDecimal.valueOf(nTemp));
- //remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles());
- // remShare.setAmountrequested(BigDecimal.valueOf(serviceReimbursement.getAmountrequested()));
-
- nTemp= serviceFund.getTaxedcost();
- if( nTemp == null) nTemp = 0d;
- remShare.setTaxedcost(BigDecimal.valueOf(nTemp));
-
- nTemp = serviceFund.getTotalcost();
- if( nTemp == null) nTemp = 0d;
- remShare.setTotalcost(BigDecimal.valueOf(nTemp));
-
- nTemp = serviceFund.getExpertcost();
- if(nTemp == null) nTemp = 0.0;
- remShare.setExpertcost(BigDecimal.valueOf(nTemp));
-
- nTemp = serviceFund.getEthicscost();
- if(nTemp == null) nTemp = 0.0;
- remShare.setEthicscost(BigDecimal.valueOf(nTemp));
-
- nTemp = serviceFund.getMedicalcost();
- if(nTemp == null) nTemp = 0.0;
- remShare.setMedicalcost(BigDecimal.valueOf(nTemp));
-
- nTemp = serviceFund.getFamilycost();
- if(nTemp == null) nTemp = 0.0;
- remShare.setFamilycost(BigDecimal.valueOf(nTemp));
-
- nTemp = serviceFund.getAftercarecost();
- if(nTemp == null) nTemp = 0.0;
- remShare.setAftercarecost(BigDecimal.valueOf(nTemp));
-
- nTemp = serviceFund.getAmountrequested();
- if(nTemp == null) nTemp = 0.0;
- remShare.setAmountrequested(BigDecimal.valueOf(nTemp));
+// public int addReiSharedDatd(ServiceFund serviceFund, int nType) {
+// //remShare = ;
+// ServiceFundShared remShare = null;
+// if (nType == 1) {
+// remShare = new ServiceFundShared();
+// remShare.setSerfunid(serviceFund.getId());
+// } else //modify
+// {
+// List<ServiceFundShared> remlist = fundServiceShare.getFundShareInfoById(serviceFund.getId());
+// if (remlist != null) remShare = remlist.get(0);
+// }
+//
+// remShare.setDonorno(serviceFund.getDonorno());
+// remShare.setDonorname(serviceFund.getDonorname());
+// remShare.setUserno(serviceFund.getUserno());
+// remShare.setUsername(serviceFund.getUsername());
+// remShare.setUnitname(serviceFund.getUnitname());
+// remShare.setUnitno(serviceFund.getUnitno());
+// remShare.setUnituserno(serviceFund.getUnituserno());
+// remShare.setPhone(serviceFund.getPhone());
+// remShare.setAnnexbankcard(serviceFund.getAnnexbankcard());
+// remShare.setAnnexregistform(serviceFund.getAnnexregistform());
+// Double nTemp = serviceFund.getPretaxcost();
+// if (nTemp == null) nTemp = 0d;
+// remShare.setPretaxcost(BigDecimal.valueOf(nTemp));
+// //remShare.setAnnexfiles(serviceReimbursement.getAnnexfiles());
+// // remShare.setAmountrequested(BigDecimal.valueOf(serviceReimbursement.getAmountrequested()));
+//
+// nTemp = serviceFund.getTaxedcost();
+// if (nTemp == null) nTemp = 0d;
+// remShare.setTaxedcost(BigDecimal.valueOf(nTemp));
+//
+// nTemp = serviceFund.getTotalcost();
+// if (nTemp == null) nTemp = 0d;
+// remShare.setTotalcost(BigDecimal.valueOf(nTemp));
+//
+// nTemp = serviceFund.getExpertcost();
+// if (nTemp == null) nTemp = 0.0;
+// remShare.setExpertcost(BigDecimal.valueOf(nTemp));
+//
+// nTemp = serviceFund.getEthicscost();
+// if (nTemp == null) nTemp = 0.0;
+// remShare.setEthicscost(BigDecimal.valueOf(nTemp));
+//
+// nTemp = serviceFund.getMedicalcost();
+// if (nTemp == null) nTemp = 0.0;
+// remShare.setMedicalcost(BigDecimal.valueOf(nTemp));
+//
+// nTemp = serviceFund.getFamilycost();
+// if (nTemp == null) nTemp = 0.0;
+// remShare.setFamilycost(BigDecimal.valueOf(nTemp));
+//
+// nTemp = serviceFund.getAftercarecost();
+// if (nTemp == null) nTemp = 0.0;
+// remShare.setAftercarecost(BigDecimal.valueOf(nTemp));
+//
+// nTemp = serviceFund.getAmountrequested();
+// if (nTemp == null) nTemp = 0.0;
+// remShare.setAmountrequested(BigDecimal.valueOf(nTemp));
+//
+//
+// remShare.setApplytype(serviceFund.getApplytype());
+//
+// nTemp = serviceFund.getPrepaidamount();
+// if (nTemp == null) nTemp = 0.0;
+// remShare.setPrepaidamount(BigDecimal.valueOf(nTemp));
+//
+// remShare.setInvoicecount(serviceFund.getInvoicecount());
+// remShare.setAttachcount(serviceFund.getAttachcount());
+// remShare.setManagerno(serviceFund.getManagerno());
+// remShare.setManagername(serviceFund.getManagername());
+// remShare.setDeptmentno(serviceFund.getDeptmentno());
+// remShare.setDeptmentname(serviceFund.getDeptmentname());
+// remShare.setOpochecker(serviceFund.getOpochecker());
+// remShare.setFinvicepresident(serviceFund.getFinvicepresident());
+// remShare.setBusvicepresident(serviceFund.getBusvicepresident());
+// remShare.setOfficedirector(serviceFund.getOfficedirector());
+// remShare.setFinancedirector(serviceFund.getFinancedirector());
+// remShare.setFinancechecher(serviceFund.getFinancechecher());
+// //remShare.setIsdistribute(serviceFund.getIsdistribute());
+// remShare.setRecordstatus(serviceFund.getRecordstatus());
+// remShare.setUploadflag(serviceFund.getUploadflag());
+// remShare.setUploadtime(serviceFund.getUploadtime());
+// long nLevel = serviceFund.getFlowlevel();
+// remShare.setFlowlevel(nLevel);
+//
+// remShare.setInfoid(serviceFund.getInfoid());
+//
+// //remShare.setOaid(serviceReimbursement.getOaid());
+// //remShare.setDonorno(serviceReimbursement.getDonorno());
+//
+// boolean bRet = false;
+// if (nType == 1) {
+// bRet = fundServiceShare.save(remShare);
+// } else {
+// //remShare.setId(serviceReimbursement.);
+// bRet = fundServiceShare.updateById(remShare);
+// }
+//
+// //if(!bRet) return -1;
+// String strMutfileUrl = remShare.getAnnexbankcard();
+// //鏈夐檮浠舵椂鎵嶈皟鐢ㄧ涓夋柟杩涜涓婁紶
+// if (strMutfileUrl == null) return 0;
+// if (strMutfileUrl.isEmpty()) return 0;
+//
+// try {
+// uploadOAFileAndUpdateDb(remShare);
+// } catch (Exception e) {
+// logger.error("璋冪敤绗笁鏂规帴鍙ｅ嚭閿�!");
+// e.printStackTrace();
+// }
+//
+// //姝ゅ淇濆瓨鎴愬姛鍚庤涓婁紶OA锛屼繚瀛樿繑鍥炲��
+//
+// return 0;
+// }
- remShare.setApplytype(serviceFund.getApplytype());
-
- nTemp = serviceFund.getPrepaidamount();
- if(nTemp == null) nTemp = 0.0;
- remShare.setPrepaidamount(BigDecimal.valueOf(nTemp));
-
- remShare.setInvoicecount(serviceFund.getInvoicecount());
- remShare.setAttachcount(serviceFund.getAttachcount());
- remShare.setManagerno(serviceFund.getManagerno());
- remShare.setManagername(serviceFund.getManagername());
- remShare.setDeptmentno(serviceFund.getDeptmentno());
- remShare.setDeptmentname(serviceFund.getDeptmentname());
- remShare.setOpochecker(serviceFund.getOpochecker());
- remShare.setFinvicepresident(serviceFund.getFinvicepresident());
- remShare.setBusvicepresident(serviceFund.getBusvicepresident());
- remShare.setOfficedirector(serviceFund.getOfficedirector());
- remShare.setFinancedirector(serviceFund.getFinancedirector());
- remShare.setFinancechecher(serviceFund.getFinancechecher());
- //remShare.setIsdistribute(serviceFund.getIsdistribute());
- remShare.setRecordstatus(serviceFund.getRecordstatus());
- remShare.setUploadflag(serviceFund.getUploadflag());
- remShare.setUploadtime(serviceFund.getUploadtime());
- long nLevel = serviceFund.getFlowlevel();
- remShare.setFlowlevel(nLevel);
-
- remShare.setInfoid(serviceFund.getInfoid());
-
- //remShare.setOaid(serviceReimbursement.getOaid());
- //remShare.setDonorno(serviceReimbursement.getDonorno());
-
- boolean bRet = false;
- if(nType==1)
- {
- bRet = fundServiceShare.save(remShare);
- }
- else
- {
- //remShare.setId(serviceReimbursement.);
- bRet = fundServiceShare.updateById(remShare);
- }
-
- //if(!bRet) return -1;
- String strMutfileUrl = remShare.getAnnexbankcard();
- //鏈夐檮浠舵椂鎵嶈皟鐢ㄧ涓夋柟杩涜涓婁紶
- if(strMutfileUrl == null) return 0;
- if(strMutfileUrl.isEmpty()) return 0;
-
- try
- {
- uploadOAFileAndUpdateDb(remShare);
- }
- catch (Exception e)
- {
- logger.error("璋冪敤绗笁鏂规帴鍙ｅ嚭閿�!");
- e.printStackTrace();
- }
-
- //姝ゅ淇濆瓨鎴愬姛鍚庤涓婁紶OA锛屼繚瀛樿繑鍥炲��
-
- return 0;
- }
-
-
- int uploadOAFileAndUpdateDb(ServiceFundShared remShare)
- {
- //涓婁紶OA鏂囦欢
- //String strUrl = "http://129.88.242.39:8899/seeyon/rest/token?userName=opo&password=127814f8-84e8-4304-84a5-a71573567efd&loginName=demo3";
- String strUrl = "http://129.88.242.39:8899/seeyon/rest/token";
- //String strUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/token";
- //涓婁紶鏂囦欢鎴愬姛鍚庯紝鍘绘洿鏂扮浉鍏崇殑鏁版嵁搴�
-
-
- Map<String, Object> map = new HashMap<String, Object>();
- map.put("userName","opo");
- map.put("password","4126407a-9821-4874-be41-6568abd6dbe5");
- map.put("loginName","demo3");
-
- JSONObject jsonObj = new JSONObject(map);
-
- System.out.println("uploadOAFileAndUpdateDb + jsonObject"+jsonObj.toString() + "\r\n" + jsonObj.toJSONString());
- String strRes = HttpClientKit.postOpr(strUrl,jsonObj.toString());//
- //String strRes = HttpClientKit.postMsg(strUrl,jsonObj);//寰楀埌杩斿洖鐨則oken?
-
- JSONObject json1 = JSONObject.parseObject(strRes);
- strRes = json1.get("id").toString();
-
- ///if(strRes.isEmpty() || "" == strRes) return -1;// 涓虹┖浠ｈ〃澶辫触
-
- //涓嬮潰闇�姹傝皟鐢ㄦ枃浠剁殑鎺ュ彛锛岃皟鐢ㄦ垚鍔熻繑鍥炲悗锛屽緱鍒癴ilename鍜宖ileid 鐢ㄨ繖浜屼釜鍊煎幓鏇存柊鏁版嵁
-
- String filePath = RuoYiConfig.getUploadPath();
- String strMutfileUrl = remShare.getAnnexbankcard();//鍙兘瀛樺湪澶氫釜鍦板潃锛屼互,鍒嗗紑
-
- String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token="+strRes;
- //String strFUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/attachment?token="+strRes;
- //strFUrl = String.format(strFUrl, strRes);
-
- /*File test = null;
- File file = new File("E:\\YYJQ\\OPO\\WEB\\Upload\\upload\\2023\\02\\17");
- if (file.exists() && file.isDirectory()) {
- // 鑾峰彇鎵�鏈夌洸鐩掓枃浠跺す
- File[] ones = file.listFiles();
- for (File one : ones) {
- test = one;
- }
- }*/
-
- String filename = "";
- String fileid = "";
-
- String[] urlArray = strMutfileUrl.split(",");
- for (int i = 0; i < urlArray.length; i++)
- {
- String strOneFileName = urlArray[i];
- String strTemp = strOneFileName.substring(15);
- String strFile = filePath + strTemp ;
- //FileUploadUtils.getAbsoluteFile(filePath,strOneFileName);
- String struploadResult = "";
- File filetest = new File(strFile);
- try
- {
- struploadResult = HttpClientKit.sendPostWithFile(filetest,strFUrl);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
-
-
- //String strFRes = HttpClientKit.postMsg(strFUrl,jsonFObj);
- if(struploadResult == null) return 0;
- if(struploadResult.isEmpty()) return 0;
-
- JSONObject jsonR = JSONObject.parseObject(struploadResult);
-
- JSONArray jsonArr = jsonR.getJSONArray("atts");
- for(int j=0;j<jsonArr.size();j++)
- {
- JSONObject jsonRet = jsonArr.getJSONObject(j);
- String name1= jsonRet.get("filename").toString();
- String id1 = jsonRet.get("fileUrl").toString();
- filename+=name1;
- fileid+=id1;
- if(i!=urlArray.length-1)
- {
- filename+=",";
- fileid+=",";
- }
- }
-
- }
-
- long nId = remShare.getId();
- remShare.setId(nId);
- remShare.setFilename(filename);
- remShare.setFileid(fileid);
- boolean bRet = fundServiceShare.updateById(remShare);
- if(!bRet) return -1;
-
- return 0;
- }
+// int uploadOAFileAndUpdateDb(ServiceFundShared remShare) {
+// //涓婁紶OA鏂囦欢
+// //String strUrl = "http://129.88.242.39:8899/seeyon/rest/token?userName=opo&password=127814f8-84e8-4304-84a5-a71573567efd&loginName=demo3";
+// String strUrl = "http://129.88.242.39:8899/seeyon/rest/token";
+// //String strUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/token";
+// //涓婁紶鏂囦欢鎴愬姛鍚庯紝鍘绘洿鏂扮浉鍏崇殑鏁版嵁搴�
+//
+//
+// Map<String, Object> map = new HashMap<String, Object>();
+// map.put("userName", "opo");
+// map.put("password", "4126407a-9821-4874-be41-6568abd6dbe5");
+// map.put("loginName", "demo3");
+//
+// JSONObject jsonObj = new JSONObject(map);
+//
+// System.out.println("uploadOAFileAndUpdateDb + jsonObject" + jsonObj.toString() + "\r\n" + jsonObj.toJSONString());
+// String strRes = HttpClientKit.postOpr(strUrl, jsonObj.toString());//
+// //String strRes = HttpClientKit.postMsg(strUrl,jsonObj);//寰楀埌杩斿洖鐨則oken?
+//
+// JSONObject json1 = JSONObject.parseObject(strRes);
+// strRes = json1.get("id").toString();
+//
+// ///if(strRes.isEmpty() || "" == strRes) return -1;// 涓虹┖浠ｈ〃澶辫触
+//
+// //涓嬮潰闇�姹傝皟鐢ㄦ枃浠剁殑鎺ュ彛锛岃皟鐢ㄦ垚鍔熻繑鍥炲悗锛屽緱鍒癴ilename鍜宖ileid 鐢ㄨ繖浜屼釜鍊煎幓鏇存柊鏁版嵁
+//
+// String filePath = RuoYiConfig.getUploadPath();
+// String strMutfileUrl = remShare.getAnnexbankcard();//鍙兘瀛樺湪澶氫釜鍦板潃锛屼互,鍒嗗紑
+//
+// String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token=" + strRes;
+// //String strFUrl = "http://slb.hospitalstar.com:8899/seeyon/rest/attachment?token="+strRes;
+// //strFUrl = String.format(strFUrl, strRes);
+//
+// /*File test = null;
+// File file = new File("E:\\YYJQ\\OPO\\WEB\\Upload\\upload\\2023\\02\\17");
+// if (file.exists() && file.isDirectory()) {
+// // 鑾峰彇鎵�鏈夌洸鐩掓枃浠跺す
+// File[] ones = file.listFiles();
+// for (File one : ones) {
+// test = one;
+// }
+// }*/
+//
+// String filename = "";
+// String fileid = "";
+//
+// String[] urlArray = strMutfileUrl.split(",");
+// for (int i = 0; i < urlArray.length; i++) {
+// String strOneFileName = urlArray[i];
+// String strTemp = strOneFileName.substring(15);
+// String strFile = filePath + strTemp;
+// //FileUploadUtils.getAbsoluteFile(filePath,strOneFileName);
+// String struploadResult = "";
+// File filetest = new File(strFile);
+// try {
+// struploadResult = HttpClientKit.sendPostWithFile(filetest, strFUrl);
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+//
+//
+// //String strFRes = HttpClientKit.postMsg(strFUrl,jsonFObj);
+// if (struploadResult == null) return 0;
+// if (struploadResult.isEmpty()) return 0;
+//
+// JSONObject jsonR = JSONObject.parseObject(struploadResult);
+//
+// JSONArray jsonArr = jsonR.getJSONArray("atts");
+// for (int j = 0; j < jsonArr.size(); j++) {
+// JSONObject jsonRet = jsonArr.getJSONObject(j);
+// String name1 = jsonRet.get("filename").toString();
+// String id1 = jsonRet.get("fileUrl").toString();
+// filename += name1;
+// fileid += id1;
+// if (i != urlArray.length - 1) {
+// filename += ",";
+// fileid += ",";
+// }
+// }
+//
+// }
+//
+// long nId = remShare.getId();
+// remShare.setId(nId);
+// remShare.setFilename(filename);
+// remShare.setFileid(fileid);
+// boolean bRet = fundServiceShare.updateById(remShare);
+// if (!bRet) return -1;
+//
+// return 0;
+// }
/**
* 鏂板璐圭敤姹囨��
*/
@ApiOperation("鏂板璐圭敤姹囨��")
@Log(title = "鏂板璐圭敤姹囨��", businessType = BusinessType.INSERT)
- @PostMapping("/addnew")
+ @PostMapping("/addOrUpdateNew")
@RepeatSubmit
@Options(useGeneratedKeys = true, keyProperty = "id")
- public AjaxResult addnew(@RequestBody ServiceFundVO serviceFundVO)
- {
- boolean b = serviceFundService.save(serviceFundVO);
- Long id = serviceFundVO.getId();
- if(b)
- {
- addReiSharedDatd(serviceFundVO,1);
- }
- List<ServiceFunddetail> serviceFunddetails=serviceFundVO.getServiceFunddetails();
- serviceFunddetails.forEach(item->item.setFundid(id));
- serviceFunddetailService.saveBatch(serviceFunddetails);
- return AjaxResult.success(id);
+ public AjaxResult addOrUpdateNew(@RequestBody ServiceFundVO serviceFundVO) {
+
+ return AjaxResult.success(serviceFundService.addOrUpdateNew(serviceFundVO));
}
+
/**
* 瀹℃牳璐圭敤
@@ -464,134 +463,176 @@
@ApiOperation("瀹℃牳璐圭敤")
@Log(title = "瀹℃牳璐圭敤", businessType = BusinessType.OTHER)
@PostMapping("/checkfund")
- public AjaxResult checkFund(@RequestBody CheckFundVO checkFundVO)
- {
- ServiceFund serviceFund= serviceFundService.getById(checkFundVO.getFundid());
- if(serviceFund!=null)
- {
- Integer TotalLevel=0;
- LoginUser loginUser = getLoginUser();
- ServiceFundflowrule serviceFundflowrule=new ServiceFundflowrule();
- serviceFundflowrule.setFundtype(2);
- serviceFundflowrule.setApplytype(serviceFund.getApplytype());
- serviceFundflowrule.setCheckuserno(loginUser.getUsername());
- List<ServiceFundflowrule> serviceFundflowrules= serviceFundflowruleService.queryList(serviceFundflowrule);
+ public AjaxResult checkFund(@RequestBody CheckFundVO checkFundVO) {
+ logger.info("serviceFundController---checkFund鐨勫叆鍙傚�糲heckFundVO :{}", checkFundVO);
+ ServiceFund serviceFund = serviceFundService.getById(checkFundVO.getFundid());
+ if (serviceFund != null) {
+ Integer TotalLevel = 0;
+ LoginUser loginUser = getLoginUser();
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setFundtype(2);
+ serviceFundflowrule.setApplytype(serviceFund.getApplytype());
+ serviceFundflowrule.setCheckuserno(loginUser.getUsername());
+ logger.info("serviceFundController---checkFund---queryList鐨勫叆鍙傚�約erviceFundflowrule:{}", serviceFundflowrule);
- if(serviceFundflowrules==null || serviceFundflowrules.stream().count()==0)
- {
- return AjaxResult.error(HttpStatus.ERROR,"褰撳墠浜哄憳鏃犳璁板綍瀹℃牳鏉冮檺");
- }
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
- if(serviceFundflowrules.get(0).getFlowlevel()-1!=serviceFund.getFlowlevel())
- {
- return AjaxResult.error(HttpStatus.ERROR,"褰撳墠浜哄憳涓庢璁板綍鐨勫鏍哥骇鍒笉绗�");
- }
+ if (serviceFundflowrules == null || serviceFundflowrules.stream().count() == 0) {
+ return AjaxResult.error(HttpStatus.ERROR, "褰撳墠浜哄憳鏃犳璁板綍瀹℃牳鏉冮檺");
+ }
- if(serviceFundflowrules!=null && serviceFundflowrules.stream().count()>0)
- {
- TotalLevel=serviceFundflowrules.get(0).getTotallevel();
- }
+ if (serviceFundflowrules.get(0).getFlowlevel() - 1 != serviceFund.getFlowlevel()) {
+ return AjaxResult.error(HttpStatus.ERROR, "褰撳墠浜哄憳涓庢璁板綍鐨勫鏍哥骇鍒笉绗�");
+ }
- Integer CheckFlag=0;
- Integer RecordStatus=serviceFund.getRecordstatus();
- Integer FlowLevel=serviceFund.getFlowlevel();
- Integer OriginalFlowLevel=FlowLevel;
- if(checkFundVO.getFlowconclusion()==1)
- {
- CheckFlag=1;
- if(TotalLevel==0)
- {
- RecordStatus=99;
- }
- else
- {
- if(TotalLevel==FlowLevel+1)
- {
- RecordStatus=99;
- }
- else
- {
- RecordStatus = (FlowLevel+1)*2;
- }
- }
- FlowLevel=FlowLevel+1;
- }
- else
- {
- CheckFlag=2;
- RecordStatus = (FlowLevel+1)*2 - 1;
- FlowLevel=(FlowLevel-1);
- if(FlowLevel<0)
- {
- FlowLevel=0;
+ if (serviceFundflowrules != null && serviceFundflowrules.stream().count() > 0) {
+ TotalLevel = serviceFundflowrules.get(0).getTotallevel();
+ }
+
+ Integer CheckFlag = 0;
+ Integer RecordStatus = serviceFund.getRecordstatus();
+ Integer FlowLevel = serviceFund.getFlowlevel();
+ Integer OriginalFlowLevel = FlowLevel;
+ if (checkFundVO.getFlowconclusion() == 1) {
+ CheckFlag = 1;
+ if (TotalLevel == 0) {
+ RecordStatus = 99;
+ } else {
+ if (TotalLevel == FlowLevel + 1) {
+ RecordStatus = 99;
+ } else {
+ RecordStatus = (FlowLevel + 1) * 2;
}
}
+ 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);
+ if (FlowLevel < 0) {
+ FlowLevel = 0;
+ }
+ }
+ }
- serviceFund.setRecordstatus(RecordStatus);
- serviceFund.setFlowlevel(FlowLevel);
+ serviceFund.setRecordstatus(RecordStatus);
+ serviceFund.setFlowlevel(FlowLevel);
+ // serviceFund.setBackflowlevel(serviceFund.getFlowlevel());
- ServiceFundflow serviceFundflow=new ServiceFundflow();
- SysUser user = loginUser.getUser();
- serviceFundflow.setFundid(serviceFund.getId());
- serviceFundflow.setCheckuserno(user.getUserName());
- serviceFundflow.setCheckusername(user.getNickName());
- serviceFundflow.setFundtype(2);
- serviceFundflow.setApplytype(serviceFund.getApplytype());
- serviceFundflow.setFlowconclusion(CheckFlag);
+ ServiceFundflow serviceFundflow = new ServiceFundflow();
+ SysUser user = loginUser.getUser();
+ serviceFundflow.setFundid(serviceFund.getId());
+ serviceFundflow.setCheckuserno(user.getUserName());
+ serviceFundflow.setCheckusername(user.getNickName());
+ serviceFundflow.setFundtype(2);
+ serviceFundflow.setApplytype(serviceFund.getApplytype());
+ serviceFundflow.setFlowconclusion(CheckFlag);
+ if (org.apache.commons.lang.StringUtils.isNotBlank(checkFundVO.getFlowcontent())) {
serviceFundflow.setFlowcontent(checkFundVO.getFlowcontent());
- serviceFundflow.setFlowlevel(OriginalFlowLevel+1);
- serviceFundflowService.save(serviceFundflow);
- serviceFundService.updateById(serviceFund);
-
- ServiceSystemmessage serviceSystemmessage=new ServiceSystemmessage();
- serviceSystemmessage.setFundtype(2);
- serviceSystemmessage.setApplytype(serviceFund.getApplytype());
- serviceSystemmessage.setSenduserno(user.getUserName());
- serviceSystemmessage.setSendusername(user.getNickName());
- serviceSystemmessage.setReceiveuserno(serviceFund.getUserno());
- serviceSystemmessage.setReceiveusername(serviceFund.getUsername());
- serviceSystemmessage.setIsread(0);
- serviceSystemmessage.setMessagetype(1);
- serviceSystemmessage.setRelevantno(serviceFund.getId());
-
- if(CheckFlag==1)
- {
- //閫氳繃
- serviceSystemmessage.setMessagetitle(""+(OriginalFlowLevel+1)+"绾у鏍搁�氳繃");
- serviceSystemmessage.setMessagecontent("鎮�"+new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime())+"鎻愪氦鐨勫叧浜庢崘鐚渚嬨��"+serviceFund.getDonorname()+"銆戠殑璐圭敤鐢宠宸查�氳繃"+(OriginalFlowLevel+1)+"绾у鏍�");
- }
- else
- {
- //椹冲洖
- serviceSystemmessage.setMessagetitle(""+(OriginalFlowLevel+1)+"绾у鏍搁┏鍥�");
- serviceSystemmessage.setMessagecontent("鎮�"+new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime())+"鎻愪氦鐨勫叧浜庢崘鐚渚嬨��"+serviceFund.getDonorname()+"銆戠殑璐圭敤鐢宠宸茶"+(OriginalFlowLevel+1)+"绾у鏍搁┏鍥烇紝鍘熷洜涓�"+checkFundVO.getFlowcontent()+"");
- }
- ServiceSystemmessage.save(serviceSystemmessage);
- return AjaxResult.success();
+ } else {
+ serviceFundflow.setFlowcontent(checkFundVO.getFlowconclusion() == 1 ? "閫氳繃" : "涓嶉�氳繃");
}
- else
- {
- return AjaxResult.error(HttpStatus.NO_CONTENT,"璐圭敤缂栧彿涓嶆纭�");
+ serviceFundflow.setFlowlevel(OriginalFlowLevel + 1);
+ serviceFundflowService.save(serviceFundflow);
+ serviceFundService.updateById(serviceFund);
+
+ ServiceSystemmessage serviceSystemmessage = new ServiceSystemmessage();
+ serviceSystemmessage.setFundtype(2);
+ serviceSystemmessage.setApplytype(serviceFund.getApplytype());
+ serviceSystemmessage.setSenduserno(user.getUserName());
+ serviceSystemmessage.setSendusername(user.getNickName());
+ serviceSystemmessage.setReceiveuserno(serviceFund.getUserno());
+ serviceSystemmessage.setReceiveusername(serviceFund.getUsername());
+ serviceSystemmessage.setIsread(0);
+ serviceSystemmessage.setMessagetype(1);
+ serviceSystemmessage.setRelevantno(serviceFund.getId());
+
+ if (CheckFlag == 1) {
+ //閫氳繃
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁�氳繃");
+ 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());
+ }
+
+ } else {
+ //椹冲洖
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁┏鍥�");
+ serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勫叧浜庢崘鐚渚嬨��" + serviceFund.getDonorname() + "銆戠殑璐圭敤鐢宠宸茶" + (OriginalFlowLevel + 1) + "绾у鏍搁┏鍥烇紝鍘熷洜涓�" + checkFundVO.getFlowcontent() + "");
}
+ ServiceSystemmessage.save(serviceSystemmessage);
+ return AjaxResult.success();
+ } else {
+ return AjaxResult.error(HttpStatus.NO_CONTENT, "璐圭敤缂栧彿涓嶆纭�");
}
+ }
/**
- * 淇敼璐圭敤鐢宠涓�
+ * 璐圭敤涓婃姤
*/
- @ApiOperation("淇敼璐圭敤鐢宠涓�")
- //@PreAuthorize("@ss.hasPermi('project:fund:edit')")
- @Log(title = "璐圭敤鐢宠涓�", businessType = BusinessType.UPDATE)
- @PutMapping
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceFund serviceFund)
- {
- boolean bret = serviceFundService.updateById(serviceFund);
- if(bret)
- {
- addReiSharedDatd(serviceFund,2);
+ @ApiOperation("璐圭敤涓婃姤")
+ @Log(title = "璐圭敤涓婃姤", businessType = BusinessType.UPDATE)
+ @PostMapping("/fundEdit")
+ @RepeatSubmit
+ public AjaxResult fundEdit(@RequestBody ServiceFund serviceFund) {
+ log.info("淇敼璐圭敤鐢宠鍏ュ弬:{}", serviceFund);
+ List<ServiceFund> infoByInfoIdList = serviceFundService.queryInfoById(serviceFund);
+ log.info("淇敼璐圭敤鐢宠锛岄�氳繃鍏ュ弬鏌ヨ serviceFundService.queryInfoById鏁版嵁涓虹┖,鍏ュ弬:{}", infoByInfoIdList.size());
+ if (CollectionUtils.isEmpty(infoByInfoIdList)) {
+ return toAjax(false);
}
- return toAjax(bret);
+ for (ServiceFund sf : infoByInfoIdList) {
+ //濡傛灉绛変簬100锛岃鏄庡凡缁忚蛋鍒板尰闄㈣储鍔￠偅杈逛簡锛涜储鍔￠偅杈瑰彇鏁版嵁鏄粠鍒嗕韩琛ㄥ彇锛屾墍浠ワ紝杩欓噷鐩存帴寰�鍒嗕韩琛ㄩ噷娣诲姞鏁版嵁灏辫浜�
+ if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 199) {
+ //灏唂und琛ㄧ殑瀹℃牳鐘舵�佹敼鎴�100
+ sf.setBackflowlevel(100);
+ serviceFundService.updateById(sf);
+
+ //寰�鍒嗕韩琛ㄩ噷鏂板
+ serviceFundService.addFundSharedInfo(serviceFund.getId());
+
+ return success();
+ } else {
+
+ Integer TotalLevel = 0;
+ LoginUser loginUser = getLoginUser();
+ SysUser user = loginUser.getUser();
+ List<Integer> postids = postService.selectPostListByUserId(loginUser.getUserId());
+ if (!postids.contains(2)) {
+ serviceFund.setRecordstatus(2);
+ if (serviceFund.getBackflowlevel() != null) {
+ serviceFund.setFlowlevel(serviceFund.getBackflowlevel());
+ } else {
+ serviceFund.setBackflowlevel(1);
+ serviceFund.setFlowlevel(1);
+ }
+ } else {
+ serviceFund.setRecordstatus(0);
+ if (serviceFund.getBackflowlevel() != null) {
+ serviceFund.setFlowlevel(serviceFund.getBackflowlevel());
+ } else {
+ serviceFund.setFlowlevel(0);
+ serviceFund.setBackflowlevel(0);
+ }
+
+ }
+ // serviceFund.setFlowlevel(sf.getBackflowlevel());
+ boolean bret = serviceFundService.updateById(serviceFund);
+ log.info("serviceFundService.updateById杩斿弬:{}", bret);
+
+ return toAjax(bret);
+ }
+ }
+
+ return toAjax(false);
}
/**
@@ -600,9 +641,8 @@
@ApiOperation("鍒犻櫎璐圭敤鐢宠涓�")
//@PreAuthorize("@ss.hasPermi('project:fund:remove')")
@Log(title = "璐圭敤鐢宠涓�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceFundService.removeByIds(Arrays.asList(ids)));
}
@@ -613,28 +653,28 @@
@GetMapping(value = "/downloadLW/{id}")
public Map downloadInfoLW(@PathVariable("id") Long id) throws IOException {
Map dataMap = new HashMap();
- getDataLW(dataMap,id);
+ getDataLW(dataMap, id);
String filePath = getClass().getResource("/template/").getPath();
System.out.println(filePath);
//璁剧疆妯℃湰瑁呯疆鏂规硶鍜岃矾寰�,FreeMarker鏀寔澶氱妯℃澘瑁呰浇鏂规硶銆傚彲浠ラ噸servlet锛宑lasspath锛屾暟鎹簱鏁欑▼瑁呰浇锛�
configuration.setDirectoryForTemplateLoading(new File(filePath));
- Template t=null;
+ Template t = null;
try {
//鎹愮尞琛�.ftl涓鸿瑁呰浇鐨勬ā鏉�
- t = configuration.getTemplate("涓撳鍔冲姟璐瑰彂鏀剧敵璇峰崟.ftl");
+ t = configuration.getTemplate("涓撳鍔冲姟璐瑰彂鏀剧敵璇峰崟(1).ftl");
} catch (IOException e) {
e.printStackTrace();
}
String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis());
- String name = "涓撳鍔冲姟璐瑰彂鏀剧敵璇峰崟_"+dataMap.get("XM")+"_"+ newTime;
+ String name = "涓撳鍔冲姟璐瑰彂鏀剧敵璇峰崟_" + dataMap.get("XM") + "_" + newTime;
//杈撳嚭鏂囨。璺緞鍙婂悕绉�
- File outFile = new File(RuoYiConfig.getProfile()+"/download/wordtemplate/"+name+".doc");
+ File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc");
Writer out = null;
try {
- out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile),"utf-8"));
+ out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"));
} catch (FileNotFoundException e1) {
e1.printStackTrace();
@@ -644,8 +684,8 @@
} catch (TemplateException e) {
e.printStackTrace();
}
- Map<String ,Object> map = new HashMap<>();
- map.put("downloadUrl", "/profile/download/wordtemplate/"+name+".doc");
+ Map<String, Object> map = new HashMap<>();
+ map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
return map;
}
@@ -659,15 +699,17 @@
String date = formatter.format(dt);
String time = date.substring(0, 10);
- dataMap.put("TBYYMMDD",time);
+ dataMap.put("XZBH", serviceFund.getBh() == null ? "" : serviceFund.getBh());
+ dataMap.put("TBYYMMDD", time);
dataMap.put("BXDFJ", serviceFund.getAttachcount() == 0 ? " " : serviceFund.getAttachcount());
dataMap.put("JXZXM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname());
dataMap.put("JSR", serviceFund.getUsername() == null ? "" : serviceFund.getUsername());
- dataMap.put("FYXM1", "鏀粯涓撳璐圭敤锛屽叾涓◣鍓嶉噾棰�" + serviceFund.getPretaxcost() + "鍏冿紝绋庡悗閲戦" + serviceFund.getTaxedcost() + "鍏冦��");
+// dataMap.put("FYXM1", "鏀粯涓撳璐圭敤锛屽叾涓◣鍓嶉噾棰�" + serviceFund.getPretaxcost() + "鍏冿紝绋庡悗閲戦" + serviceFund.getTaxedcost() + "鍏冦��");
+ dataMap.put("FYXM1", "浜轰綋鍣ㄥ畼鎹愮尞涓撳鍔冲姟璐�:" + serviceFund.getPretaxcost() + "鍏� (鍏朵腑绋庡悗璐圭敤鐢变腑蹇冩壙鎷呯◣璐�)銆�");
dataMap.put("FYXM2", "");
dataMap.put("FYXM3", "");
- dataMap.put("JEXS", serviceFund.getAmountrequested());
- dataMap.put("JEDS", convert(serviceFund.getAmountrequested()) + "鏁�");
+ dataMap.put("JEXS", serviceFund.getPretaxcost());
+ dataMap.put("JEDS", convert(serviceFund.getPretaxcost()) + "鏁�");
dataMap.put("BXBZ", serviceFund.getRemark() == null ? "" : serviceFund.getRemark());
@@ -680,14 +722,15 @@
if (fd == null) {
throw new ServiceException("涓嬭浇澶辫触锛屾病鏈夊搴斾俊鎭�", HttpStatus.NO_CONTENT);
}
- List<Map<String, Object>> newsList = new ArrayList<Map<String,Object>>();
+ List<Map<String, Object>> newsList = new ArrayList<Map<String, Object>>();
int count = 0;
double sq = 0;
double ks = 0;
double sh = 0;
- for(ServiceFunddetail f : fd){
- Map<String, Object> map=new HashMap<String, Object>();
+ for (ServiceFunddetail f : fd) {
+ Map<String, Object> map = new HashMap<String, Object>();
+
map.put("XH", f.getItemcode() == null ? "" : f.getItemcode());
String itemName = f.getItemname() == null ? "" : f.getItemname();
@@ -710,11 +753,72 @@
newsList.add(map);
}
- dataMap.put("list",newsList);
+ // 涓撳鍔冲姟璐圭粺璁¤〃
+ List<Map<String, Object>> lists = new ArrayList<Map<String, Object>>();
- dataMap.put("SQHJ",sq);
- dataMap.put("KSHJ",ks);
- dataMap.put("SHHJ",sh);
+ List<Double> sqljList = new ArrayList<>();
+ List<Double> ksljList = new ArrayList<>();
+ List<Double> shljList = new ArrayList<>();
+
+ //鏍规嵁鈥濈鐩被鍨嬪悕绉扳�滐紝鏉ヨ绠楃◣鍓嶆�诲拰锛岀◣閲戞�诲拰,绋庡悗鎬诲拰
+ Map<String, ServiceFunddetailAssort> funddetailMap = new HashMap<>();
+ for (ServiceFunddetail serviceFunddetail : fd) {
+ boolean b = funddetailMap.containsKey(serviceFunddetail.getSubjecttypename());
+ if (b == true) {
+ ServiceFunddetailAssort serviceFunddetailAssort = funddetailMap.get(serviceFunddetail.getSubjecttypename());
+ serviceFunddetailAssort.setKSXJ(serviceFunddetailAssort.getKSXJ() + serviceFunddetail.getTaxamount());
+ serviceFunddetailAssort.setSQXJ(serviceFunddetailAssort.getSQXJ() + serviceFunddetail.getAmount());
+ serviceFunddetailAssort.setSHXJ(serviceFunddetailAssort.getSHXJ() + serviceFunddetail.getTaxedamount());
+ } else {
+ funddetailMap.put(serviceFunddetail.getSubjecttypename(), new ServiceFunddetailAssort());
+ ServiceFunddetailAssort serviceFunddetailAssort = funddetailMap.get(serviceFunddetail.getSubjecttypename());
+ serviceFunddetailAssort.setKSXJ(serviceFunddetailAssort.getKSXJ() + serviceFunddetail.getTaxamount());
+ serviceFunddetailAssort.setSQXJ(serviceFunddetailAssort.getSQXJ() + serviceFunddetail.getAmount());
+ serviceFunddetailAssort.setSHXJ(serviceFunddetailAssort.getSHXJ() + serviceFunddetail.getTaxedamount());
+ }
+ }
+
+ funddetailMap.forEach((FWFL, serviceFunddetailAssort) -> {
+ Map<String, Object> map1 = new HashMap<String, Object>();
+ map1.put("FWFL", FWFL);
+ map1.put("SQXJ", serviceFunddetailAssort.getSQXJ());
+ map1.put("KSXJ", serviceFunddetailAssort.getKSXJ());
+ map1.put("SHXJ", serviceFunddetailAssort.getSHXJ());
+ sqljList.add(serviceFunddetailAssort.getSQXJ());
+ ksljList.add(serviceFunddetailAssort.getKSXJ());
+ shljList.add(serviceFunddetailAssort.getSHXJ());
+ lists.add(map1);
+ });
+
+ double sqxj = 0;
+ double kslj = 0;
+ double shlj = 0;
+ for (Double sqx : sqljList) {
+ sqxj += sqx;
+ }
+ for (Double ksl : ksljList) {
+ kslj += ksl;
+ }
+ for (Double shl : shljList) {
+ shlj += shl;
+ }
+
+ //鏁版嵁灏佽
+ dataMap.put("list", newsList);
+ for (int i = 0; i < lists.size(); i++) {
+ Map<String, Object> map = lists.get(i);
+ map.put("XH", i + 1);
+ }
+
+ dataMap.put("item", lists);
+
+ dataMap.put("SQHJ", sq);
+ dataMap.put("KSHJ", ks);
+ dataMap.put("SHHJ", sh);
+
+ dataMap.put("SQLJ", sqxj);
+ dataMap.put("KSLJ", kslj);
+ dataMap.put("SHLJ", shlj);
}
@@ -726,13 +830,13 @@
@GetMapping(value = "/downloadSH/{id}")
public Map downloadInfoSH(@PathVariable("id") Long id) throws IOException {
Map dataMap = new HashMap();
- getDataSH(dataMap,id);
+ getDataSH(dataMap, id);
String filePath = getClass().getResource("/template/").getPath();
System.out.println(filePath);
//璁剧疆妯℃湰瑁呯疆鏂规硶鍜岃矾寰�,FreeMarker鏀寔澶氱妯℃澘瑁呰浇鏂规硶銆傚彲浠ラ噸servlet锛宑lasspath锛屾暟鎹簱鏁欑▼瑁呰浇锛�
configuration.setDirectoryForTemplateLoading(new File(filePath));
- Template t=null;
+ Template t = null;
try {
//鎹愮尞琛�.ftl涓鸿瑁呰浇鐨勬ā鏉�
t = configuration.getTemplate("鎹愮尞鑰呭杽鍚庢垚鏈〃.ftl");
@@ -740,14 +844,14 @@
e.printStackTrace();
}
String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis());
- String name = "鎹愮尞鑰呭杽鍚庢垚鏈〃_"+dataMap.get("XM")+"_"+ newTime;
+ String name = "鎹愮尞鑰呭杽鍚庢垚鏈〃_" + dataMap.get("XM") + "_" + newTime;
//杈撳嚭鏂囨。璺緞鍙婂悕绉�
- File outFile = new File(RuoYiConfig.getProfile()+"/download/wordtemplate/"+name+".doc");
+ File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc");
Writer out = null;
try {
- out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile),"utf-8"));
+ out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"));
} catch (FileNotFoundException e1) {
e1.printStackTrace();
@@ -757,8 +861,8 @@
} catch (TemplateException e) {
e.printStackTrace();
}
- Map<String ,Object> map = new HashMap<>();
- map.put("downloadUrl", "/profile/download/wordtemplate/"+name+".doc");
+ Map<String, Object> map = new HashMap<>();
+ map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
return map;
}
@@ -781,14 +885,14 @@
if (fd == null) {
throw new ServiceException("涓嬭浇澶辫触锛屾病鏈夊搴斾俊鎭�", HttpStatus.NO_CONTENT);
}
- List<Map<String, Object>> newsList = new ArrayList<Map<String,Object>>();
+ List<Map<String, Object>> newsList = new ArrayList<Map<String, Object>>();
int count = 0;
double sq = 0;
double ks = 0;
double sh = 0;
- for(ServiceFunddetail f : fd){
- Map<String, Object> map=new HashMap<String, Object>();
+ for (ServiceFunddetail f : fd) {
+ Map<String, Object> map = new HashMap<String, Object>();
count++;
map.put("XH", count);
map.put("FWNR", f.getItemname() == null ? "" : f.getItemname());
@@ -808,11 +912,11 @@
newsList.add(map);
}
- dataMap.put("list",newsList);
+ dataMap.put("list", newsList);
- dataMap.put("SQHJ",sq);
- dataMap.put("KSHJ",ks);
- dataMap.put("SHHJ",sh);
+ dataMap.put("SQHJ", sq);
+ dataMap.put("KSHJ", ks);
+ dataMap.put("SHHJ", sh);
}
@@ -823,13 +927,13 @@
@GetMapping(value = "/downloadSS/{id}")
public Map downloadInfoSS(@PathVariable("id") Long id) throws IOException {
Map dataMap = new HashMap();
- getDataSS(dataMap,id);
+ getDataSS(dataMap, id);
String filePath = getClass().getResource("/template/").getPath();
System.out.println(filePath);
//璁剧疆妯℃湰瑁呯疆鏂规硶鍜岃矾寰�,FreeMarker鏀寔澶氱妯℃澘瑁呰浇鏂规硶銆傚彲浠ラ噸servlet锛宑lasspath锛屾暟鎹簱鏁欑▼瑁呰浇锛�
configuration.setDirectoryForTemplateLoading(new File(filePath));
- Template t=null;
+ Template t = null;
try {
//鎹愮尞琛�.ftl涓鸿瑁呰浇鐨勬ā鏉�
t = configuration.getTemplate("鎹愮尞鑰呭灞炰氦閫氶瀹胯垂鐢ㄨ〃.ftl");
@@ -837,14 +941,14 @@
e.printStackTrace();
}
String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis());
- String name = "鎹愮尞鑰呭灞炰氦閫氶瀹胯垂鐢ㄨ〃_"+dataMap.get("XM")+"_"+ newTime;
+ String name = "鎹愮尞鑰呭灞炰氦閫氶瀹胯垂鐢ㄨ〃_" + dataMap.get("XM") + "_" + newTime;
//杈撳嚭鏂囨。璺緞鍙婂悕绉�
- File outFile = new File(RuoYiConfig.getProfile()+"/download/wordtemplate/"+name+".doc");
+ File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc");
Writer out = null;
try {
- out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile),"utf-8"));
+ out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"));
} catch (FileNotFoundException e1) {
e1.printStackTrace();
@@ -854,8 +958,8 @@
} catch (TemplateException e) {
e.printStackTrace();
}
- Map<String ,Object> map = new HashMap<>();
- map.put("downloadUrl", "/profile/download/wordtemplate/"+name+".doc");
+ Map<String, Object> map = new HashMap<>();
+ map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
return map;
}
@@ -878,12 +982,12 @@
if (fd == null) {
throw new ServiceException("涓嬭浇澶辫触锛屾病鏈夊搴斾俊鎭�", HttpStatus.NO_CONTENT);
}
- List<Map<String, Object>> newsList = new ArrayList<Map<String,Object>>();
+ List<Map<String, Object>> newsList = new ArrayList<Map<String, Object>>();
int count = 0;
double hj = 0;
- for(ServiceFunddetail f : fd){
- Map<String, Object> map=new HashMap<String, Object>();
+ for (ServiceFunddetail f : fd) {
+ Map<String, Object> map = new HashMap<String, Object>();
count++;
map.put("XH", count);
map.put("FWNR", f.getItemname() == null ? "" : f.getItemname());
@@ -897,8 +1001,8 @@
newsList.add(map);
}
- dataMap.put("list",newsList);
- dataMap.put("JEHJ",hj);
+ dataMap.put("list", newsList);
+ dataMap.put("JEHJ", hj);
}
@@ -909,28 +1013,37 @@
@GetMapping(value = "/downloadYX/{id}")
public Map downloadInfoYX(@PathVariable("id") Long id) throws IOException {
Map dataMap = new HashMap();
- getDataYX(dataMap,id);
+ String dataYX = getDataYX(dataMap, id);
String filePath = getClass().getResource("/template/").getPath();
System.out.println(filePath);
//璁剧疆妯℃湰瑁呯疆鏂规硶鍜岃矾寰�,FreeMarker鏀寔澶氱妯℃澘瑁呰浇鏂规硶銆傚彲浠ラ噸servlet锛宑lasspath锛屾暟鎹簱鏁欑▼瑁呰浇锛�
configuration.setDirectoryForTemplateLoading(new File(filePath));
- Template t=null;
+ Template t = null;
try {
//鎹愮尞琛�.ftl涓鸿瑁呰浇鐨勬ā鏉�
- t = configuration.getTemplate("鍖诲鎴愭湰璐圭敤鐢宠鍗�.ftl");
+ //涓撳鍔冲姟璐圭敵璇� 1 浼︾悊璇勪及鍔冲姟璐圭敵璇� 2 鍖诲鎴愭湰璐圭敤鐢宠 3 鍔炲叕璐圭敤鎶ラ攢鐢宠 4
+ if (dataYX.equals("3")) {
+ t = configuration.getTemplate("鍖诲鎴愭湰璐圭敤鐢宠鍗�.ftl");
+ } else if (dataYX.equals("4")) {
+ t = configuration.getTemplate("鍔炲叕璐圭敤鐢宠鍗�.ftl");
+ }
} catch (IOException e) {
e.printStackTrace();
}
String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis());
- String name = "鍖诲鎴愭湰璐圭敤鐢宠鍗昣"+dataMap.get("XM")+"_"+ newTime;
-
+ String name = null;
+ if (dataYX.equals("3")) {
+ name = "鍖诲鎴愭湰璐圭敤鐢宠鍗昣" + dataMap.get("XM") + "_" + newTime;
+ } else if (dataYX.equals("4")) {
+ name = "鍔炲叕璐圭敤鐢宠鍗昣" + dataMap.get("XM") + "_" + newTime;
+ }
//杈撳嚭鏂囨。璺緞鍙婂悕绉�
- File outFile = new File(RuoYiConfig.getProfile()+"/download/wordtemplate/"+name+".doc");
+ File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc");
Writer out = null;
try {
- out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile),"utf-8"));
+ out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"));
} catch (FileNotFoundException e1) {
e1.printStackTrace();
@@ -940,15 +1053,19 @@
} catch (TemplateException e) {
e.printStackTrace();
}
- Map<String ,Object> map = new HashMap<>();
- map.put("downloadUrl", "/profile/download/wordtemplate/"+name+".doc");
+ Map<String, Object> map = new HashMap<>();
+ map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
return map;
}
- private void getDataYX(Map dataMap, Long id) {
+ private String getDataYX(Map dataMap, Long id) {
ServiceFund serviceFund = serviceFundService.getById(id);
if (serviceFund == null) {
throw new ServiceException("涓嬭浇澶辫触锛岀敤鎴蜂俊鎭嚭閿�", HttpStatus.NO_CONTENT);
+ }
+ ServiceExternalperson infoByUserNo = null;
+ if (StringUtils.isNotBlank(serviceFund.getUserno())) {
+ infoByUserNo = externalpersonService.getInfoByUserNo(serviceFund.getUserno());
}
List<ServiceFunddetail> fd = serviceFunddetailService.getAllDetailsByFDIDHZ(id);
@@ -961,34 +1078,76 @@
String date = formatter.format(dt);
String time = date.substring(0, 10);
- List<Map<String, Object>> newList = new ArrayList<Map<String,Object>>();
+ List<Map<String, Object>> newList = new ArrayList<Map<String, Object>>();
int seqno = 0;
- dataMap.put("TBYYMMDD",time);
+ dataMap.put("XZBH", serviceFund.getBh() == null ? "" : serviceFund.getBh());
+ dataMap.put("TBYYMMDD", time);
dataMap.put("BXDFJ", serviceFund.getAttachcount() == 0 ? " " : serviceFund.getAttachcount());
dataMap.put("JXZXM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname());
dataMap.put("JSR", serviceFund.getUsername() == null ? "" : serviceFund.getUsername());
+ dataMap.put("YWZ", serviceFund.getDeptmentname() == null ? "" : serviceFund.getDeptmentname());
+ dataMap.put("ZHUZANG", serviceFund.getManagername() == null ? "" : serviceFund.getManagername());
- for(ServiceFunddetail f : fd) {
+ String bz = "";
+ int i = 0;
+ for (ServiceFunddetail f : fd) {
seqno++;
- Map<String, Object> map=new HashMap<String, Object>();
+ Map<String, Object> map = new HashMap<String, Object>();
map.put("seqno", seqno);
+// String fyxm = "";
+// fyxm += f.getItemname() == null ? "" : f.getItemname();
+// fyxm += f.getAmount() + "鍏�";
+// //濡傛灉鏄尰鐤楁垚鏈紝鍒欐妸閾惰鍗″姞涓婃瘡鏉℃槑缁嗙殑鍚庨潰
+// if (serviceFund.getApplytype().equals("3")) {
+// fyxm += "(";
+// fyxm += f.getUnitname() == null ? "" : f.getUnitname() + ";";
+// fyxm += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
+// fyxm += f.getBankcardno() == null ? "" : f.getBankcardno();
+// fyxm += ")";
+// }
+
+ //濡傛灉鏄尰鐤楁垚鏈紝鍒欐妸閾惰鍗″姞涓婃瘡鏉℃槑缁嗙殑鍚庨潰
+ if (serviceFund.getApplytype().equals("3")) {
+ i = i + 1;
+ bz += f.getUnitname() == null ? "(" + i + ")" : "(" + i + ")" + f.getUnitname() + "锛�";
+ bz += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
+ bz += f.getBankcardno() == null ? "" : f.getBankcardno() + "锛�";
+ bz += "閲戦 : " + f.getAmount() + "鍏�";
+ bz += "<w:br/>";
+ }
+ if (serviceFund.getApplytype().equals("4")) {
+ i = i + 1;
+ bz += f.getBeneficiaryname() == null ? "(" + i + ")" : "(" + i + ")" + f.getBeneficiaryname() + "锛�";
+ bz += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
+ bz += f.getBankcardno() == null ? "" : f.getBankcardno() + "锛�";
+ bz += "閲戦 : " + f.getAmount() + "鍏�";
+ bz += "<w:br/>";
+ }
+
String fyxm = "";
fyxm += f.getItemname() == null ? "" : f.getItemname();
fyxm += f.getAmount() + "鍏�";
- fyxm += "(";
- fyxm += f.getUnitname() == null ? "" : f.getUnitname() + ";";
- fyxm += f.getDepositbank() == null ? "" : f.getDepositbank() + ": ";
- fyxm += f.getBankcardno() == null ? "" : f.getBankcardno();
- fyxm += ")";
map.put("FYXM", fyxm);
newList.add(map);
}
+ //鍚堝苟鍗曞厓鏍�
+ checkList(newList);
dataMap.put("items", newList);
- dataMap.put("JEXS", serviceFund.getAmountrequested());
- dataMap.put("JEDS", convert(serviceFund.getAmountrequested()) + "鏁�");
- dataMap.put("BXBZ", serviceFund.getRemark() == null ? "" : serviceFund.getRemark());
+ 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.getApplytype().equals("3") || serviceFund.getApplytype().equals("4") ? bz : infoByUserNo == null ? "" : infoByUserNo.getBranchbankname() + " " + infoByUserNo.getBankcardno());
+ dataMap.put("YZ", serviceFund.getPresident() == null ? "" : serviceFund.getPresident());
+ dataMap.put("CWFYZ", serviceFund.getFinvicepresident() == null ? "" : serviceFund.getFinvicepresident());
+ dataMap.put("YWFYZ", serviceFund.getBusvicepresident() == null ? "" : serviceFund.getBusvicepresident());
+ dataMap.put("BGSZR", serviceFund.getOfficedirector() == null ? "" : serviceFund.getOfficedirector());
+ dataMap.put("CWBZR", serviceFund.getFinancedirector() == null ? "" : serviceFund.getFinancedirector());
+ dataMap.put("CWSH", serviceFund.getFinancechecher() == null ? "" : serviceFund.getFinancechecher());
dataMap.put("YYMMDD", time);
dataMap.put("XM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname());
@@ -996,12 +1155,12 @@
dataMap.put("ZZ", serviceFund.getManagername() == null ? "" : serviceFund.getManagername());
- List<Map<String, Object>> newsList = new ArrayList<Map<String,Object>>();
+ List<Map<String, Object>> newsList = new ArrayList<Map<String, Object>>();
int count = 0;
double hj = 0;
- for(ServiceFunddetail f : fd){
- Map<String, Object> map=new HashMap<String, Object>();
+ for (ServiceFunddetail f : fd) {
+ Map<String, Object> map = new HashMap<String, Object>();
count++;
map.put("XH", count);
map.put("FWNR", f.getItemname() == null ? "" : f.getItemname());
@@ -1018,6 +1177,21 @@
dataMap.put("list", newsList);
dataMap.put("BYHJ", hj);
+ dataMap.put("BGSZR2", serviceFund.getOfficedirector() == null ? "" : serviceFund.getOfficedirector());
+ dataMap.put("CWBZR2", serviceFund.getFinancedirector() == null ? "" : serviceFund.getFinancedirector());
+ dataMap.put("CWSH2", serviceFund.getFinancechecher() == null ? "" : serviceFund.getFinancechecher());
+
+ return serviceFund.getApplytype();
+ }
+
+ public List<Map<String, Object>> checkList(List<Map<String, Object>> list) {
+ String start = "<w:vMerge w:val='restart'/>";
+ String end = "<w:vMerge/>";
+ list.get(0).put("start", start);
+ for (int i = 1; i < list.size(); i++) {
+ list.get(i).put("end", end);
+ }
+ return list;
}
@@ -1028,13 +1202,13 @@
@GetMapping(value = "/downloadBX/{id}")
public Map downloadInfoBX(@PathVariable("id") Long id) throws IOException {
Map dataMap = new HashMap();
- getDataBX(dataMap,id);
+ getDataBX(dataMap, id);
String filePath = getClass().getResource("/template/").getPath();
System.out.println(filePath);
//璁剧疆妯℃湰瑁呯疆鏂规硶鍜岃矾寰�,FreeMarker鏀寔澶氱妯℃澘瑁呰浇鏂规硶銆傚彲浠ラ噸servlet锛宑lasspath锛屾暟鎹簱鏁欑▼瑁呰浇锛�
configuration.setDirectoryForTemplateLoading(new File(filePath));
- Template t=null;
+ Template t = null;
try {
//鎹愮尞琛�.ftl涓鸿瑁呰浇鐨勬ā鏉�
t = configuration.getTemplate("璐圭敤鎶ラ攢鍗�.ftl");
@@ -1042,14 +1216,14 @@
e.printStackTrace();
}
String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis());
- String name = "璐圭敤鎶ラ攢鍗昣"+dataMap.get("XM")+"_"+ newTime;
+ String name = "璐圭敤鎶ラ攢鍗昣" + dataMap.get("XM") + "_" + newTime;
//杈撳嚭鏂囨。璺緞鍙婂悕绉�
- File outFile = new File(RuoYiConfig.getProfile()+"/download/wordtemplate/"+name+".doc");
+ File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc");
Writer out = null;
try {
- out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile),"utf-8"));
+ out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"));
} catch (FileNotFoundException e1) {
e1.printStackTrace();
@@ -1059,8 +1233,8 @@
} catch (TemplateException e) {
e.printStackTrace();
}
- Map<String ,Object> map = new HashMap<>();
- map.put("downloadUrl", "/profile/download/wordtemplate/"+name+".doc");
+ Map<String, Object> map = new HashMap<>();
+ map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
return map;
}
@@ -1102,7 +1276,7 @@
//璁剧疆妯℃湰瑁呯疆鏂规硶鍜岃矾寰�,FreeMarker鏀寔澶氱妯℃澘瑁呰浇鏂规硶銆傚彲浠ラ噸servlet锛宑lasspath锛屾暟鎹簱鏁欑▼瑁呰浇锛�
configuration.setDirectoryForTemplateLoading(new File(filePath));
- Template t=null;
+ Template t = null;
try {
//鎹愮尞琛�.ftl涓鸿瑁呰浇鐨勬ā鏉�
t = configuration.getTemplate("鑾峰彇璐圭敤鏀嚭姹囨�昏〃.ftl");
@@ -1110,14 +1284,14 @@
e.printStackTrace();
}
String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis());
- String name = "鑾峰彇璐圭敤鏀嚭姹囨�昏〃_"+dataMap.get("XM")+"_"+ newTime;
+ String name = "鑾峰彇璐圭敤鏀嚭姹囨�昏〃_" + dataMap.get("XM") + "_" + newTime;
//杈撳嚭鏂囨。璺緞鍙婂悕绉�
- File outFile = new File(RuoYiConfig.getProfile()+"/download/wordtemplate/"+name+".doc");
+ File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc");
Writer out = null;
try {
- out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile),"utf-8"));
+ out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"));
} catch (FileNotFoundException e1) {
e1.printStackTrace();
@@ -1127,8 +1301,8 @@
} catch (TemplateException e) {
e.printStackTrace();
}
- Map<String ,Object> map = new HashMap<>();
- map.put("downloadUrl", "/profile/download/wordtemplate/"+name+".doc");
+ Map<String, Object> map = new HashMap<>();
+ map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
return map;
}
@@ -1140,9 +1314,9 @@
dataMap.put("JSR", "");
List<ServiceFunddetail> fd = new ArrayList<>();
- for(ServiceFund s : serviceFunds){
+ for (ServiceFund s : serviceFunds) {
List<ServiceFunddetail> l = serviceFunddetailService.getAllDetailsByFDIDHZ(s.getId());
- for(ServiceFunddetail df : l){
+ for (ServiceFunddetail df : l) {
fd.add(df);
}
}
@@ -1258,226 +1432,224 @@
double sh52 = 0;
double shhj = 0;
- for(ServiceReimbursement sr : serviceReimbursements1){
+ for (ServiceReimbursement sr : serviceReimbursements1) {
f28 += sr.getAmountrequested();
sh28 += sr.getAmountrequested();
}
- for(ServiceReimbursement sr : serviceReimbursements2){
+ for (ServiceReimbursement sr : serviceReimbursements2) {
f51 += sr.getAmountrequested();
sh51 += sr.getAmountrequested();
}
- for(ServiceFunddetail s : fd){
- if(s.getItemid() == 1){
+ for (ServiceFunddetail s : fd) {
+ if (s.getItemid() == 1) {
f1 += s.getAmount();
sh1 += s.getTaxedamount();
}
- if(s.getItemid() == 2){
+ if (s.getItemid() == 2) {
f2 += s.getAmount();
sh2 += s.getTaxedamount();
}
- if(s.getItemid() == 3){
+ if (s.getItemid() == 3) {
f3 += s.getAmount();
sh3 += s.getTaxedamount();
}
- if(s.getItemid() == 4){
+ if (s.getItemid() == 4) {
f4 += s.getAmount();
sh4 += s.getTaxedamount();
}
- if(s.getItemid() == 5){
+ if (s.getItemid() == 5) {
f5 += s.getAmount();
sh5 += s.getTaxedamount();
}
- if(s.getItemid() == 6){
+ if (s.getItemid() == 6) {
f6 += s.getAmount();
sh6 += s.getTaxedamount();
}
- if(s.getItemid() == 7){
+ if (s.getItemid() == 7) {
f7 += s.getAmount();
sh7 += s.getTaxedamount();
}
- if(s.getItemid() == 8){
+ if (s.getItemid() == 8) {
f8 += s.getAmount();
sh8 += s.getTaxedamount();
}
- if(s.getItemid() == 9){
+ if (s.getItemid() == 9) {
f9 += s.getAmount();
sh9 += s.getTaxedamount();
}
- if(s.getItemid() == 10){
+ if (s.getItemid() == 10) {
f10 += s.getAmount();
sh10 += s.getTaxedamount();
}
- if(s.getItemid() == 11){
+ if (s.getItemid() == 11) {
f11 += s.getAmount();
sh11 += s.getTaxedamount();
}
- if(s.getItemid() == 12){
+ if (s.getItemid() == 12) {
f12 += s.getAmount();
sh12 += s.getTaxedamount();
}
- if(s.getItemid() == 13){
+ if (s.getItemid() == 13) {
f13 += s.getAmount();
sh13 += s.getTaxedamount();
}
- if(s.getItemid() == 14){
+ if (s.getItemid() == 14) {
f14 += s.getAmount();
sh14 += s.getTaxedamount();
}
- if(s.getItemid() == 15){
+ if (s.getItemid() == 15) {
f15 += s.getAmount();
sh15 += s.getTaxedamount();
}
- if(s.getItemid() == 16){
+ if (s.getItemid() == 16) {
f16 += s.getAmount();
sh16 += s.getTaxedamount();
}
- if(s.getItemid() == 17){
+ if (s.getItemid() == 17) {
f17 += s.getAmount();
sh17 += s.getTaxedamount();
}
- if(s.getItemid() == 18){
+ if (s.getItemid() == 18) {
f18 += s.getAmount();
sh18 += s.getTaxedamount();
}
- if(s.getItemid() == 19){
+ if (s.getItemid() == 19) {
f19 += s.getAmount();
sh19 += s.getTaxedamount();
}
- if(s.getItemid() == 20){
+ if (s.getItemid() == 20) {
f20 += s.getAmount();
sh20 += s.getTaxedamount();
}
- if(s.getItemid() == 21){
+ if (s.getItemid() == 21) {
f21 += s.getAmount();
sh21 += s.getTaxedamount();
}
- if(s.getItemid() == 22){
+ if (s.getItemid() == 22) {
f22 += s.getAmount();
sh22 += s.getTaxedamount();
}
- if(s.getItemid() == 23){
+ if (s.getItemid() == 23) {
f23 += s.getAmount();
sh23 += s.getTaxedamount();
}
- if(s.getItemid() == 24){
+ if (s.getItemid() == 24) {
f24 += s.getAmount();
sh24 += s.getTaxedamount();
}
- if(s.getItemid() == 25){
+ if (s.getItemid() == 25) {
f25 += s.getAmount();
sh25 += s.getTaxedamount();
}
- if(s.getItemid() == 26){
+ if (s.getItemid() == 26) {
f26 += s.getAmount();
sh26 += s.getTaxedamount();
}
- if(s.getItemid() == 27){
+ if (s.getItemid() == 27) {
f27 += s.getAmount();
sh27 += s.getTaxedamount();
}
- if(s.getItemid() == 29){
+ if (s.getItemid() == 29) {
f29 += s.getAmount();
sh29 += s.getTaxedamount();
}
- if(s.getItemid() == 30){
+ if (s.getItemid() == 30) {
f30 += s.getAmount();
sh30 += s.getTaxedamount();
}
- if(s.getItemid() == 31){
+ if (s.getItemid() == 31) {
f31 += s.getAmount();
sh31 += s.getTaxedamount();
}
- if(s.getItemid() == 32){
+ if (s.getItemid() == 32) {
f32 += s.getAmount();
sh32 += s.getTaxedamount();
}
- if(s.getItemid() == 33){
+ if (s.getItemid() == 33) {
f33 += s.getAmount();
sh33 += s.getTaxedamount();
}
- if(s.getItemid() == 34){
+ if (s.getItemid() == 34) {
f34 += s.getAmount();
sh34 += s.getTaxedamount();
}
- if(s.getItemid() == 35){
+ if (s.getItemid() == 35) {
f35 += s.getAmount();
sh35 += s.getTaxedamount();
}
- if(s.getItemid() == 36){
+ if (s.getItemid() == 36) {
f36 += s.getAmount();
sh36 += s.getTaxedamount();
}
- if(s.getItemid() == 37){
+ if (s.getItemid() == 37) {
f37 += s.getAmount();
sh37 += s.getTaxedamount();
}
- if(s.getItemid() == 38){
+ if (s.getItemid() == 38) {
f38 += s.getAmount();
sh38 += s.getTaxedamount();
}
- if(s.getItemid() == 39){
+ if (s.getItemid() == 39) {
f39 += s.getAmount();
sh39 += s.getTaxedamount();
}
- if(s.getItemid() == 40){
+ if (s.getItemid() == 40) {
f40 += s.getAmount();
sh40 += s.getTaxedamount();
}
- if(s.getItemid() == 41){
+ if (s.getItemid() == 41) {
f41 += s.getAmount();
sh41 += s.getTaxedamount();
}
- if(s.getItemid() == 42){
+ if (s.getItemid() == 42) {
f42 += s.getAmount();
sh42 += s.getTaxedamount();
}
- if(s.getItemid() == 43){
+ if (s.getItemid() == 43) {
f43 += s.getAmount();
sh43 += s.getTaxedamount();
}
- if(s.getItemid() == 44){
+ if (s.getItemid() == 44) {
f44 += s.getAmount();
sh44 += s.getTaxedamount();
}
- if(s.getItemid() == 45){
+ if (s.getItemid() == 45) {
f45 += s.getAmount();
sh45 += s.getTaxedamount();
}
- if(s.getItemid() == 46){
+ if (s.getItemid() == 46) {
f46 += s.getAmount();
sh46 += s.getTaxedamount();
}
- if(s.getItemid() == 47){
+ if (s.getItemid() == 47) {
f47 += s.getAmount();
sh47 += s.getTaxedamount();
}
- if(s.getItemid() == 48){
+ if (s.getItemid() == 48) {
f48 += s.getAmount();
sh48 += s.getTaxedamount();
}
- if(s.getItemid() == 49){
+ if (s.getItemid() == 49) {
f49 += s.getAmount();
sh49 += s.getTaxedamount();
}
- if(s.getItemid() == 50){
+ if (s.getItemid() == 50) {
f50 += s.getAmount();
sh50 += s.getTaxedamount();
}
- if(s.getItemid() == 52){
+ if (s.getItemid() == 52) {
f52 += s.getAmount();
sh52 += s.getTaxedamount();
}
}
- hj = f1 + f2 + f3 + f4 + f5 + f6 + f7 + f8 + f9 + f10 + f11 + f12 + f13 + f14 + f15 + f16 + f17 + f18 + f19 + f20 + f21 + f22 + f23 + f24 + f25 + f26 + f27 + f28 + f29 + f30 + f31 + f32 + f33 + f34 + f35
- + f36 + f37 + f38 + f39 + f40 + f41 + f42 + f43 + f44 + f45 + f46 + f47 + f48 + f49 + f50 + f51 + f52;
+ hj = f1 + f2 + f3 + f4 + f5 + f6 + f7 + f8 + f9 + f10 + f11 + f12 + f13 + f14 + f15 + f16 + f17 + f18 + f19 + f20 + f21 + f22 + f23 + f24 + f25 + f26 + f27 + f28 + f29 + f30 + f31 + f32 + f33 + f34 + f35 + f36 + f37 + f38 + f39 + f40 + f41 + f42 + f43 + f44 + f45 + f46 + f47 + f48 + f49 + f50 + f51 + f52;
- shhj = sh1 + sh2 + sh3 + sh4 + sh5 + sh6 + sh7 + sh8 + sh9 + sh10 + sh11 + sh12 + sh13 + sh14 + sh15 + sh16 + sh17 + sh18 + sh19 + sh20 + sh21 + sh22 + sh23 + sh24 + sh25 + sh26 + sh27 + sh28 + sh29 + sh30 + sh31 + sh32 + sh33 + sh34 + sh35
- + sh36 + sh37 + sh38 + sh39 + sh40 + sh41 + sh42 + sh43 + sh44 + sh45 + sh46 + sh47 + sh48 + sh49 + sh50 + sh51 + sh52;
+ shhj = sh1 + sh2 + sh3 + sh4 + sh5 + sh6 + sh7 + sh8 + sh9 + sh10 + sh11 + sh12 + sh13 + sh14 + sh15 + sh16 + sh17 + sh18 + sh19 + sh20 + sh21 + sh22 + sh23 + sh24 + sh25 + sh26 + sh27 + sh28 + sh29 + sh30 + sh31 + sh32 + sh33 + sh34 + sh35 + sh36 + sh37 + sh38 + sh39 + sh40 + sh41 + sh42 + sh43 + sh44 + sh45 + sh46 + sh47 + sh48 + sh49 + sh50 + sh51 + sh52;
dataMap.put("FY1", f1 == 0 ? "" : f1);
dataMap.put("FY2", f2 == 0 ? "" : f2);
@@ -1531,7 +1703,7 @@
dataMap.put("FY50", f50 == 0 ? "" : f50);
dataMap.put("FY51", f51 == 0 ? "" : f51);
dataMap.put("FY52", f52 == 0 ? "" : f52);
- dataMap.put("FY53", hj == 0 ? "" : hj);
+ dataMap.put("FY53", hj == 0 ? "" : hj);
dataMap.put("SH1", sh1 == 0 ? "" : sh1);
dataMap.put("SH2", sh2 == 0 ? "" : sh2);
@@ -1597,13 +1769,13 @@
@GetMapping(value = "/downloadLWF/{id}")
public Map downloadInfoLWF(@PathVariable("id") Long id) throws IOException {
Map dataMap = new HashMap();
- getDataLWF(dataMap,id);
+ getDataLWF(dataMap, id);
String filePath = getClass().getResource("/template/").getPath();
System.out.println(filePath);
//璁剧疆妯℃湰瑁呯疆鏂规硶鍜岃矾寰�,FreeMarker鏀寔澶氱妯℃澘瑁呰浇鏂规硶銆傚彲浠ラ噸servlet锛宑lasspath锛屾暟鎹簱鏁欑▼瑁呰浇锛�
configuration.setDirectoryForTemplateLoading(new File(filePath));
- Template t=null;
+ Template t = null;
try {
//鎹愮尞琛�.ftl涓鸿瑁呰浇鐨勬ā鏉�
t = configuration.getTemplate("鍣ㄥ畼鑾峰彇涓撳鍔冲姟璐圭粺璁¤〃.ftl");
@@ -1611,14 +1783,14 @@
e.printStackTrace();
}
String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis());
- String name = "鍣ㄥ畼鑾峰彇涓撳鍔冲姟璐圭粺璁¤〃_"+dataMap.get("XM")+"_"+ newTime;
+ String name = "鍣ㄥ畼鑾峰彇涓撳鍔冲姟璐圭粺璁¤〃_" + dataMap.get("XM") + "_" + newTime;
//杈撳嚭鏂囨。璺緞鍙婂悕绉�
- File outFile = new File(RuoYiConfig.getProfile()+"/download/wordtemplate/"+name+".doc");
+ File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc");
Writer out = null;
try {
- out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile),"utf-8"));
+ out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"));
} catch (FileNotFoundException e1) {
e1.printStackTrace();
@@ -1628,8 +1800,8 @@
} catch (TemplateException e) {
e.printStackTrace();
}
- Map<String ,Object> map = new HashMap<>();
- map.put("downloadUrl", "/profile/download/wordtemplate/"+name+".doc");
+ Map<String, Object> map = new HashMap<>();
+ map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
return map;
}
@@ -1644,6 +1816,7 @@
String date = formatter.format(dt);
String time = date.substring(0, 10);
+ dataMap.put("XZBH", serviceFund.getBh() == null ? "" : serviceFund.getBh());
dataMap.put("YYMMDD", time);
dataMap.put("XM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname());
dataMap.put("GZRY", serviceFund.getUsername() == null ? "" : serviceFund.getUsername());
@@ -1653,12 +1826,12 @@
if (fd == null) {
throw new ServiceException("涓嬭浇澶辫触锛屾病鏈夊搴斾俊鎭�", HttpStatus.NO_CONTENT);
}
- List<Map<String, Object>> newsList = new ArrayList<Map<String,Object>>();
+ List<Map<String, Object>> newsList = new ArrayList<Map<String, Object>>();
int count = 0;
double hj = 0;
- for(ServiceFunddetail f : fd){
- Map<String, Object> map=new HashMap<String, Object>();
+ for (ServiceFunddetail f : fd) {
+ Map<String, Object> map = new HashMap<String, Object>();
count++;
map.put("XH", count);
map.put("FWNR", f.getItemname() == null ? "" : f.getItemname());
@@ -1666,12 +1839,12 @@
map.put("DW", f.getUnitname() == null ? "" : f.getUnitname());
map.put("ZW", f.getTitle() == null ? "" : f.getTitle());
map.put("SFZH", f.getIdcardno() == null ? "" : f.getIdcardno());
- map.put("JE", f.getAmount() == 0 ? "" : f.getAmount());
+ map.put("JE", f.getAmount() == 0 ? "" : f.getAmount());
hj += f.getAmount();
newsList.add(map);
}
- dataMap.put("list",newsList);
+ dataMap.put("list", newsList);
dataMap.put("HJ", hj);
@@ -1684,13 +1857,13 @@
@GetMapping(value = "/downloadLL/{id}")
public Map downloadInfoLL(@PathVariable("id") Long id) throws IOException {
Map dataMap = new HashMap();
- getDataLL(dataMap,id);
+ getDataLL(dataMap, id);
String filePath = getClass().getResource("/template/").getPath();
System.out.println(filePath);
//璁剧疆妯℃湰瑁呯疆鏂规硶鍜岃矾寰�,FreeMarker鏀寔澶氱妯℃澘瑁呰浇鏂规硶銆傚彲浠ラ噸servlet锛宑lasspath锛屾暟鎹簱鏁欑▼瑁呰浇锛�
configuration.setDirectoryForTemplateLoading(new File(filePath));
- Template t=null;
+ Template t = null;
try {
//鎹愮尞琛�.ftl涓鸿瑁呰浇鐨勬ā鏉�
t = configuration.getTemplate("浼︾悊涓撳鍔冲姟璐瑰彂鏀剧敵璇峰崟.ftl");
@@ -1698,14 +1871,14 @@
e.printStackTrace();
}
String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis());
- String name = "浼︾悊涓撳鍔冲姟璐瑰彂鏀剧敵璇峰崟_"+dataMap.get("XM")+"_"+ newTime;
+ String name = "浼︾悊涓撳鍔冲姟璐瑰彂鏀剧敵璇峰崟_" + dataMap.get("XM") + "_" + newTime;
//杈撳嚭鏂囨。璺緞鍙婂悕绉�
- File outFile = new File(RuoYiConfig.getProfile()+"/download/wordtemplate/"+name+".doc");
+ File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc");
Writer out = null;
try {
- out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile),"utf-8"));
+ out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"));
} catch (FileNotFoundException e1) {
e1.printStackTrace();
@@ -1715,8 +1888,8 @@
} catch (TemplateException e) {
e.printStackTrace();
}
- Map<String ,Object> map = new HashMap<>();
- map.put("downloadUrl", "/profile/download/wordtemplate/"+name+".doc");
+ Map<String, Object> map = new HashMap<>();
+ map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
return map;
}
@@ -1730,7 +1903,8 @@
String date = formatter.format(dt);
String time = date.substring(0, 10);
- dataMap.put("TBYYMMDD",time);
+ dataMap.put("XZBH", serviceFund.getBh() == null ? "" : serviceFund.getBh());
+ dataMap.put("TBYYMMDD", time);
dataMap.put("BXDFJ", serviceFund.getAttachcount() == 0 ? " " : serviceFund.getAttachcount());
dataMap.put("JXZXM", serviceFund.getDonorname() == null ? "" : serviceFund.getDonorname());
dataMap.put("JSR", serviceFund.getUsername() == null ? "" : serviceFund.getUsername());
@@ -1751,14 +1925,14 @@
if (fd == null) {
throw new ServiceException("涓嬭浇澶辫触锛屾病鏈夊搴斾俊鎭�", HttpStatus.NO_CONTENT);
}
- List<Map<String, Object>> newsList = new ArrayList<Map<String,Object>>();
+ List<Map<String, Object>> newsList = new ArrayList<Map<String, Object>>();
int count = 0;
double sq = 0;
double ks = 0;
double sh = 0;
- for(ServiceFunddetail f : fd){
- Map<String, Object> map=new HashMap<String, Object>();
+ for (ServiceFunddetail f : fd) {
+ Map<String, Object> map = new HashMap<String, Object>();
count++;
map.put("XH", count);
map.put("FWNR", f.getItemname() == null ? "" : f.getItemname());
@@ -1770,7 +1944,7 @@
map.put("KH", f.getBankcardno() == null ? "" : f.getBankcardno());
map.put("SQ", f.getAmount() == 0.00 ? "" : String.format("%.2f", f.getAmount()).toString() + "");
sq += f.getAmount();
- map.put("KS", f.getTaxamount() == 0.00 ? "" : String.format("%.2f",f.getTaxamount()).toString() + "");
+ map.put("KS", f.getTaxamount() == 0.00 ? "" : String.format("%.2f", f.getTaxamount()).toString() + "");
ks += f.getTaxamount();
map.put("SH", f.getTaxedamount() == 0.00 ? "" : String.format("%.2f", f.getTaxedamount()).toString() + "");
sh += f.getTaxedamount();
@@ -1778,7 +1952,7 @@
newsList.add(map);
}
- dataMap.put("list",newsList);
+ dataMap.put("list", newsList);
dataMap.put("SQHJ", String.format("%.2f", sq).toString() + "");
dataMap.put("KSHJ", String.format("%.2f", ks).toString() + "");
@@ -1795,7 +1969,7 @@
*/
@ApiOperation("灞曠ず璐圭敤缁嗚妭")
@GetMapping(value = "/showFundDetailOne/{id}")
- public AjaxResult showFundDetailOne(@PathVariable Long id){
+ public AjaxResult showFundDetailOne(@PathVariable Long id) {
ServiceFund serviceFund = serviceFundService.getById(id);
return AjaxResult.success(serviceFundService.showFundDetailOne(serviceFund));
}
@@ -1805,7 +1979,7 @@
*/
@ApiOperation("灞曠ず璐圭敤缁嗚妭")
@GetMapping(value = "/showFundDetailTwo/{infoid}")
- public AjaxResult showFundDetailTwo(@PathVariable Long infoid){
+ public AjaxResult showFundDetailTwo(@PathVariable Long infoid) {
return AjaxResult.success(serviceFundService.showFundDetailTwo(infoid));
@@ -1816,12 +1990,10 @@
*/
@ApiOperation("璐圭敤绫诲瀷璁℃暟")
@GetMapping(value = "/countItem/{infoid}/{itemid}")
- public AjaxResult countItem(@PathVariable Long infoid, @PathVariable Long itemid){
+ public AjaxResult countItem(@PathVariable Long infoid, @PathVariable Long itemid) {
return AjaxResult.success(serviceFundService.countItem(infoid, itemid));
}
-
-
}
--
Gitblit v1.9.3