From dd07c6da3fdb6c4adb9d167d015afc955ad412e1 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 17 五月 2023 15:33:10 +0800
Subject: [PATCH] 数据插入分享表
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 757 ++++++++++++++++++++++++++++-----------------------------
2 files changed, 370 insertions(+), 389 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 56aae00..bebe86e 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
@@ -14,9 +14,11 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.HttpClientKit;
+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 freemarker.template.Configuration;
import freemarker.template.Template;
@@ -36,20 +38,25 @@
/**
* 璐圭敤鐢宠涓籆ontroller
- *
+ *
* @author ruoyi
* @date 2022-01-24
*/
@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
@@ -78,8 +85,7 @@
@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);
List<ServiceFund> list = serviceFundService.selectServiceFundList(serviceFund);
@@ -87,7 +93,7 @@
}
@GetMapping("/listnew")
- public TableDataInfo listnew(FundVO fundVO){
+ public TableDataInfo listnew(FundVO fundVO) {
startPage();
List<FundVO> list = serviceFundService.selectVOList(fundVO);
return getDataTable(list);
@@ -99,70 +105,63 @@
@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);
+ List<SpFinancialExpensesFundOut> list = serviceFundService.getListBypower(loginUser.getUsername(), 2, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE);
//return getDataTable(list);
- return getCustomDataTable(list,pageNum,pageSize);
+ 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("/addFundSharedInfo/{id}")
- public AjaxResult addFundSharedInfo(@PathVariable("id") Long id){
+ public AjaxResult addFundSharedInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceFundService.addFundSharedInfo(id));
}
@GetMapping("/getFundDetail/{id}")
- public AjaxResult getFundDetail(@PathVariable("id") Long id){
+ public AjaxResult getFundDetail(@PathVariable("id") Long id) {
return AjaxResult.success(serviceFundService.getFundDetail(id));
}
@@ -173,13 +172,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, "璐圭敤鐢宠涓绘暟鎹�");
}
-
/**
@@ -188,8 +185,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));
}
@@ -202,32 +198,26 @@
@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)
- {
+ public int addReiSharedDatd(ServiceFund serviceFund, int nType) {
//remShare = ;
ServiceFundShared remShare = null;
- if(nType == 1)
- {
+ if (nType == 1) {
remShare = new ServiceFundShared();
remShare.setSerfunid(serviceFund.getId());
- }
- else //modify
+ } else //modify
{
List<ServiceFundShared> remlist = fundServiceShare.getFundShareInfoById(serviceFund.getId());
- if(remlist!=null)
- remShare =remlist.get(0);
+ if (remlist != null) remShare = remlist.get(0);
}
remShare.setDonorno(serviceFund.getDonorno());
@@ -240,49 +230,49 @@
remShare.setPhone(serviceFund.getPhone());
remShare.setAnnexbankcard(serviceFund.getAnnexbankcard());
remShare.setAnnexregistform(serviceFund.getAnnexregistform());
- Double nTemp= serviceFund.getPretaxcost();
- if( nTemp == null) nTemp = 0d;
+ 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;
+ nTemp = serviceFund.getTaxedcost();
+ if (nTemp == null) nTemp = 0d;
remShare.setTaxedcost(BigDecimal.valueOf(nTemp));
nTemp = serviceFund.getTotalcost();
- if( nTemp == null) nTemp = 0d;
+ if (nTemp == null) nTemp = 0d;
remShare.setTotalcost(BigDecimal.valueOf(nTemp));
nTemp = serviceFund.getExpertcost();
- if(nTemp == null) nTemp = 0.0;
+ if (nTemp == null) nTemp = 0.0;
remShare.setExpertcost(BigDecimal.valueOf(nTemp));
nTemp = serviceFund.getEthicscost();
- if(nTemp == null) nTemp = 0.0;
+ if (nTemp == null) nTemp = 0.0;
remShare.setEthicscost(BigDecimal.valueOf(nTemp));
nTemp = serviceFund.getMedicalcost();
- if(nTemp == null) nTemp = 0.0;
+ if (nTemp == null) nTemp = 0.0;
remShare.setMedicalcost(BigDecimal.valueOf(nTemp));
nTemp = serviceFund.getFamilycost();
- if(nTemp == null) nTemp = 0.0;
+ if (nTemp == null) nTemp = 0.0;
remShare.setFamilycost(BigDecimal.valueOf(nTemp));
nTemp = serviceFund.getAftercarecost();
- if(nTemp == null) nTemp = 0.0;
+ if (nTemp == null) nTemp = 0.0;
remShare.setAftercarecost(BigDecimal.valueOf(nTemp));
nTemp = serviceFund.getAmountrequested();
- if(nTemp == null) nTemp = 0.0;
+ if (nTemp == null) nTemp = 0.0;
remShare.setAmountrequested(BigDecimal.valueOf(nTemp));
remShare.setApplytype(serviceFund.getApplytype());
nTemp = serviceFund.getPrepaidamount();
- if(nTemp == null) nTemp = 0.0;
+ if (nTemp == null) nTemp = 0.0;
remShare.setPrepaidamount(BigDecimal.valueOf(nTemp));
remShare.setInvoicecount(serviceFund.getInvoicecount());
@@ -310,12 +300,9 @@
//remShare.setDonorno(serviceReimbursement.getDonorno());
boolean bRet = false;
- if(nType==1)
- {
+ if (nType == 1) {
bRet = fundServiceShare.save(remShare);
- }
- else
- {
+ } else {
//remShare.setId(serviceReimbursement.);
bRet = fundServiceShare.updateById(remShare);
}
@@ -323,27 +310,23 @@
//if(!bRet) return -1;
String strMutfileUrl = remShare.getAnnexbankcard();
//鏈夐檮浠舵椂鎵嶈皟鐢ㄧ涓夋柟杩涜涓婁紶
- if(strMutfileUrl == null) return 0;
- if(strMutfileUrl.isEmpty()) return 0;
+ if (strMutfileUrl == null) return 0;
+ if (strMutfileUrl.isEmpty()) return 0;
- try
- {
+ try {
uploadOAFileAndUpdateDb(remShare);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
logger.error("璋冪敤绗笁鏂规帴鍙ｅ嚭閿�!");
e.printStackTrace();
}
//姝ゅ淇濆瓨鎴愬姛鍚庤涓婁紶OA锛屼繚瀛樿繑鍥炲��
- return 0;
+ return 0;
}
- int uploadOAFileAndUpdateDb(ServiceFundShared remShare)
- {
+ 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";
@@ -352,14 +335,14 @@
Map<String, Object> map = new HashMap<String, Object>();
- map.put("userName","opo");
- map.put("password","4126407a-9821-4874-be41-6568abd6dbe5");
- map.put("loginName","demo3");
+ map.put("userName", "opo");
+ map.put("password", "4126407a-9821-4874-be41-6568abd6dbe5");
+ map.put("loginName", "demo3");
- JSONObject jsonObj = new JSONObject(map);
+ JSONObject jsonObj = new JSONObject(map);
- System.out.println("uploadOAFileAndUpdateDb + jsonObject"+jsonObj.toString() + "\r\n" + jsonObj.toJSONString());
- String strRes = HttpClientKit.postOpr(strUrl,jsonObj.toString());//
+ 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);
@@ -372,7 +355,7 @@
String filePath = RuoYiConfig.getUploadPath();
String strMutfileUrl = remShare.getAnnexbankcard();//鍙兘瀛樺湪澶氫釜鍦板潃锛屼互,鍒嗗紑
- String strFUrl = "http://129.88.242.39:8899/seeyon/rest/attachment?token="+strRes;
+ 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);
@@ -390,42 +373,36 @@
String fileid = "";
String[] urlArray = strMutfileUrl.split(",");
- for (int i = 0; i < urlArray.length; i++)
- {
+ for (int i = 0; i < urlArray.length; i++) {
String strOneFileName = urlArray[i];
String strTemp = strOneFileName.substring(15);
- String strFile = filePath + strTemp ;
+ String strFile = filePath + strTemp;
//FileUploadUtils.getAbsoluteFile(filePath,strOneFileName);
String struploadResult = "";
File filetest = new File(strFile);
- try
- {
- struploadResult = HttpClientKit.sendPostWithFile(filetest,strFUrl);
- }
- catch (Exception e)
- {
+ 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;
+ 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++)
- {
+ for (int j = 0; j < jsonArr.size(); j++) {
JSONObject jsonRet = jsonArr.getJSONObject(j);
- String name1= jsonRet.get("filename").toString();
+ String name1 = jsonRet.get("filename").toString();
String id1 = jsonRet.get("fileUrl").toString();
- filename+=name1;
- fileid+=id1;
- if(i!=urlArray.length-1)
- {
- filename+=",";
- fileid+=",";
+ filename += name1;
+ fileid += id1;
+ if (i != urlArray.length - 1) {
+ filename += ",";
+ fileid += ",";
}
}
@@ -436,7 +413,7 @@
remShare.setFilename(filename);
remShare.setFileid(fileid);
boolean bRet = fundServiceShare.updateById(remShare);
- if(!bRet) return -1;
+ if (!bRet) return -1;
return 0;
}
@@ -449,16 +426,14 @@
@PostMapping("/addnew")
@RepeatSubmit
@Options(useGeneratedKeys = true, keyProperty = "id")
- public AjaxResult addnew(@RequestBody ServiceFundVO serviceFundVO)
- {
+ public AjaxResult addnew(@RequestBody ServiceFundVO serviceFundVO) {
boolean b = serviceFundService.save(serviceFundVO);
Long id = serviceFundVO.getId();
- if(b)
- {
- addReiSharedDatd(serviceFundVO,1);
+ if (b) {
+ addReiSharedDatd(serviceFundVO, 1);
}
- List<ServiceFunddetail> serviceFunddetails=serviceFundVO.getServiceFunddetails();
- serviceFunddetails.forEach(item->item.setFundid(id));
+ List<ServiceFunddetail> serviceFunddetails = serviceFundVO.getServiceFunddetails();
+ serviceFunddetails.forEach(item -> item.setFundid(id));
serviceFunddetailService.saveBatch(serviceFunddetails);
return AjaxResult.success(id);
}
@@ -469,116 +444,128 @@
@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) {
+ 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);
- if(serviceFundflowrules==null || serviceFundflowrules.stream().count()==0)
- {
- return AjaxResult.error(HttpStatus.ERROR,"褰撳墠浜哄憳鏃犳璁板綍瀹℃牳鏉冮檺");
- }
-
- if(serviceFundflowrules.get(0).getFlowlevel()-1!=serviceFund.getFlowlevel())
- {
- return AjaxResult.error(HttpStatus.ERROR,"褰撳墠浜哄憳涓庢璁板綍鐨勫鏍哥骇鍒笉绗�");
- }
-
- 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;
- }
- else
- {
- CheckFlag=2;
- RecordStatus = (FlowLevel+1)*2 - 1;
- FlowLevel=(FlowLevel-1);
- if(FlowLevel<0)
- {
- FlowLevel=0;
- }
- }
-
- serviceFund.setRecordstatus(RecordStatus);
- serviceFund.setFlowlevel(FlowLevel);
-
- 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.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();
+ if (serviceFundflowrules == null || serviceFundflowrules.stream().count() == 0) {
+ return AjaxResult.error(HttpStatus.ERROR, "褰撳墠浜哄憳鏃犳璁板綍瀹℃牳鏉冮檺");
}
- else
- {
- return AjaxResult.error(HttpStatus.NO_CONTENT,"璐圭敤缂栧彿涓嶆纭�");
+
+ if (serviceFundflowrules.get(0).getFlowlevel() - 1 != serviceFund.getFlowlevel()) {
+ return AjaxResult.error(HttpStatus.ERROR, "褰撳墠浜哄憳涓庢璁板綍鐨勫鏍哥骇鍒笉绗�");
}
+
+ 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;
+ } else {
+ CheckFlag = 2;
+ RecordStatus = (FlowLevel + 1) * 2 - 1;
+ FlowLevel = (FlowLevel - 1);
+ if (FlowLevel < 0) {
+ FlowLevel = 0;
+ }
+ }
+
+ serviceFund.setRecordstatus(RecordStatus);
+ serviceFund.setFlowlevel(FlowLevel);
+
+ 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.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) + "绾у鏍�");
+ if (TotalLevel == OriginalFlowLevel + 1) {
+ ServiceFundShared serviceFundShared = DtoConversionUtils.sourceToTarget(serviceFund, ServiceFundShared.class);
+ serviceFundShared.setId(null);
+ 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);
+ List<ServiceFunddetailShared> serviceFunddetailShareds = DtoConversionUtils.sourceToTarget(serviceFunddetails, ServiceFunddetailShared.class);
+ for (int i = 0; i < serviceFunddetails.size(); i++) {
+ serviceFunddetailShareds.get(i).setFundid(serviceFunddetails.get(i).getFundid());
+ 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()));
+ }
+ funddetailSharedService.saveBatch(serviceFunddetailShareds);
+
+ }
+
+ } 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, "璐圭敤缂栧彿涓嶆纭�");
}
+ }
/**
@@ -588,13 +575,11 @@
//@PreAuthorize("@ss.hasPermi('project:fund:edit')")
@Log(title = "璐圭敤鐢宠涓�", businessType = BusinessType.UPDATE)
@PutMapping
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceFund serviceFund)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceFund serviceFund) {
boolean bret = serviceFundService.updateById(serviceFund);
- if(bret)
- {
- addReiSharedDatd(serviceFund,2);
+ if (bret) {
+ addReiSharedDatd(serviceFund, 2);
}
return toAjax(bret);
}
@@ -606,8 +591,7 @@
//@PreAuthorize("@ss.hasPermi('project:fund:remove')")
@Log(title = "璐圭敤鐢宠涓�", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceFundService.removeByIds(Arrays.asList(ids)));
}
@@ -618,13 +602,13 @@
@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");
@@ -632,14 +616,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();
@@ -649,8 +633,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;
}
@@ -664,7 +648,7 @@
String date = formatter.format(dt);
String time = date.substring(0, 10);
- dataMap.put("TBYYMMDD",time);
+ 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());
@@ -685,14 +669,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>();
map.put("XH", f.getItemcode() == null ? "" : f.getItemcode());
String itemName = f.getItemname() == null ? "" : f.getItemname();
@@ -715,11 +699,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);
}
@@ -731,13 +715,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");
@@ -745,14 +729,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();
@@ -762,8 +746,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;
}
@@ -786,14 +770,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());
@@ -813,11 +797,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);
}
@@ -828,13 +812,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");
@@ -842,14 +826,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();
@@ -859,8 +843,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;
}
@@ -883,12 +867,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());
@@ -902,8 +886,8 @@
newsList.add(map);
}
- dataMap.put("list",newsList);
- dataMap.put("JEHJ",hj);
+ dataMap.put("list", newsList);
+ dataMap.put("JEHJ", hj);
}
@@ -914,13 +898,13 @@
@GetMapping(value = "/downloadYX/{id}")
public Map downloadInfoYX(@PathVariable("id") Long id) throws IOException {
Map dataMap = new HashMap();
- getDataYX(dataMap,id);
+ 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");
@@ -928,14 +912,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();
@@ -945,8 +929,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;
}
@@ -966,17 +950,17 @@
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("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());
- for(ServiceFunddetail f : fd) {
+ 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();
@@ -1001,12 +985,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());
@@ -1033,13 +1017,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");
@@ -1047,14 +1031,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();
@@ -1064,8 +1048,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;
}
@@ -1107,7 +1091,7 @@
//璁剧疆妯℃湰瑁呯疆鏂规硶鍜岃矾寰�,FreeMarker鏀寔澶氱妯℃澘瑁呰浇鏂规硶銆傚彲浠ラ噸servlet锛宑lasspath锛屾暟鎹簱鏁欑▼瑁呰浇锛�
configuration.setDirectoryForTemplateLoading(new File(filePath));
- Template t=null;
+ Template t = null;
try {
//鎹愮尞琛�.ftl涓鸿瑁呰浇鐨勬ā鏉�
t = configuration.getTemplate("鑾峰彇璐圭敤鏀嚭姹囨�昏〃.ftl");
@@ -1115,14 +1099,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();
@@ -1132,8 +1116,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;
}
@@ -1145,9 +1129,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);
}
}
@@ -1263,226 +1247,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);
@@ -1536,7 +1518,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);
@@ -1602,13 +1584,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");
@@ -1616,14 +1598,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();
@@ -1633,8 +1615,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;
}
@@ -1658,12 +1640,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());
@@ -1671,12 +1653,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);
@@ -1689,13 +1671,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");
@@ -1703,14 +1685,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();
@@ -1720,8 +1702,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;
}
@@ -1735,7 +1717,7 @@
String date = formatter.format(dt);
String time = date.substring(0, 10);
- dataMap.put("TBYYMMDD",time);
+ 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());
@@ -1756,14 +1738,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());
@@ -1775,7 +1757,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();
@@ -1783,7 +1765,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() + "");
@@ -1800,7 +1782,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));
}
@@ -1810,7 +1792,7 @@
*/
@ApiOperation("灞曠ず璐圭敤缁嗚妭")
@GetMapping(value = "/showFundDetailTwo/{infoid}")
- public AjaxResult showFundDetailTwo(@PathVariable Long infoid){
+ public AjaxResult showFundDetailTwo(@PathVariable Long infoid) {
return AjaxResult.success(serviceFundService.showFundDetailTwo(infoid));
@@ -1821,12 +1803,11 @@
*/
@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));
}
-
}
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 3011ecc..f486e1c 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
@@ -595,7 +595,7 @@
serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceReimbursement.getCreateTime()) + "鎻愪氦鐨勫叧浜庢崘鐚渚嬨��" + serviceReimbursement.getDonorname() + "銆戠殑宸梾璐圭敵璇峰凡閫氳繃" + (OriginalFlowLevel + 1) + "绾у鏍�");
if (totalLevel == OriginalFlowLevel + 1) {
//鎵�鏈夋暟鎹柊澧炲埌澶囦唤琛�
- this.addSharedData(checkFundVO.getFundid());
+ serviceReimbursementService.addSharedData(checkFundVO.getFundid());
}
} else {
//椹冲洖
--
Gitblit v1.9.3