From 2f13f59f023fba63aa993172d48c14bcaaafb233 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 16 五月 2024 13:53:34 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 391 ++++++++++++++++++-------------------------------------
1 files changed, 131 insertions(+), 260 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 bea9174..3f4fe47 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,8 +1,6 @@
package com.ruoyi.web.controller.project;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.common.annotation.RepeatSubmit;
@@ -16,7 +14,6 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException;
-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;
@@ -26,6 +23,7 @@
import com.ruoyi.project.mapper.ServiceFunddetailMapper;
import com.ruoyi.project.service.*;
import com.ruoyi.system.service.ISysPostService;
+import com.ruoyi.system.service.ISysUserService;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
@@ -33,12 +31,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Options;
-import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -47,6 +40,7 @@
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import static com.ruoyi.web.controller.project.ServiceReimbursementController.convert;
@@ -87,19 +81,17 @@
private IServiceSystemmessageService ServiceSystemmessage;
@Autowired
- private IBaseOnlyvalueService baseOnlyvalueService;
-
- @Autowired
private IServiceExternalpersonService externalpersonService;
@Autowired
private ISysPostService postService;
- @Autowired
- private DataSourceTransactionManager transactionManager;
@Autowired
- private TransactionDefinition transactionDefinition;
+ private DingTalkService dingTalkService;
+
+ @Autowired
+ private ISysUserService sysUserService;
public ServiceFundController() {
configuration = new Configuration();
@@ -110,7 +102,7 @@
* 鏌ヨ璐圭敤鐢宠涓诲垪琛�
*/
@ApiOperation("鏌ヨ璐圭敤鐢宠涓诲垪琛�")
- //@PreAuthorize("@ss.hasPermi('project:fund:list')")
+ //// @PreAuthorize("@ss.hasPermi('project:fund:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceFund serviceFund) {
startPage();
@@ -186,14 +178,25 @@
Collections.sort(list, new Comparator<SpFinancialExpensesFundOut>() {
@Override
public int compare(SpFinancialExpensesFundOut o1, SpFinancialExpensesFundOut o2) {
- return o1.getCreateTime().compareTo(o2.getCreateTime());
+ return o1.getApplyTime().compareTo(o2.getApplyTime());
}
});
return getCustomDataTable(list, pageNum, pageSize);
}
+ /**
+ * 鏍规嵁鏉冮檺鏄剧ず瀹℃牳鍒楄〃
+ */
+ @ApiOperation("鏍规嵁鏉冮檺鏄剧ず瀹℃牳鍒楄〃")
+ @Log(title = "鏍规嵁鏉冮檺鏄剧ず瀹℃牳鍒楄〃", businessType = BusinessType.OTHER)
+ @PostMapping("/getExpertfeeList")
+ public TableDataInfo getExpertfeeList(@RequestBody SpSelectExpertfee spSelectExpertfee) {
+ List<SpFinancialExpensesFundOut> expertfeeList = serviceFundService.getExpertfeeList(spSelectExpertfee);
+ return getCustomDataTable(expertfeeList, spSelectExpertfee.getPageNum(), spSelectExpertfee.getPageSize());
+ }
+
@ApiOperation("鏌ヨ璐圭敤鐢宠涓诲垪琛�")
- //@PreAuthorize("@ss.hasPermi('project:fund:list')")
+ //// @PreAuthorize("@ss.hasPermi('project:fund:list')")
@GetMapping(value = "/getInfo/{infoid}")
public AjaxResult getInfoByInfoId(@PathVariable("infoid") Long infoid) {
return AjaxResult.success(serviceFundService.getInfoByInfoId(infoid));
@@ -215,7 +218,7 @@
* 瀵煎嚭璐圭敤鐢宠涓诲垪琛�
*/
@ApiOperation("瀵煎嚭璐圭敤鐢宠涓诲垪琛�")
- //@PreAuthorize("@ss.hasPermi('project:fund:export')")
+ //// @PreAuthorize("@ss.hasPermi('project:fund:export')")
@Log(title = "璐圭敤鐢宠涓�", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceFund serviceFund) {
@@ -229,7 +232,7 @@
* 鑾峰彇璐圭敤鐢宠涓昏缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇璐圭敤鐢宠涓昏缁嗕俊鎭�")
- //@PreAuthorize("@ss.hasPermi('project:fund:query')")
+ //// @PreAuthorize("@ss.hasPermi('project:fund:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceFundService.getById(id));
@@ -239,9 +242,9 @@
* 鏂板璐圭敤鐢宠涓�
*/
@ApiOperation("鏂板璐圭敤鐢宠涓�")
- //@PreAuthorize("@ss.hasPermi('project:fund:add')")
+ //// @PreAuthorize("@ss.hasPermi('project:fund:add')")
@Log(title = "璐圭敤鐢宠涓�", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
@Options(useGeneratedKeys = true, keyProperty = "id")
public AjaxResult add(@RequestBody ServiceFund serviceFund) {
@@ -253,216 +256,15 @@
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));
-//
-//
-// 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;
-// }
+ /**
+ * fund琛ㄤ腑锛屼慨鏀筬undTaxId
+ */
+ @ApiOperation("fund琛ㄤ腑锛屼慨鏀筬undTaxId")
+ @PostMapping("/editFundTaxId")
+ public AjaxResult editFundTaxId(@RequestBody ServiceFund serviceFund) {
+ boolean b = serviceFundService.updateFundTaxIdById(serviceFund.getId(), serviceFund.getFundTaxId());
+ return AjaxResult.success(b);
+ }
/**
* 鏂板璐圭敤姹囨��
@@ -527,12 +329,13 @@
}
FlowLevel = FlowLevel + 1;
- if (serviceFund.getFlowlevel() == 1 && serviceFund.getBackflowlevel() == 100) {
+ if (serviceFund.getFlowlevel() == Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1) && serviceFund.getBackflowlevel() == 100) {
log.info("璐㈠姟閫�鍥炲啀鎻愪氦锛屽嚭绾冲啀娆″鎵癸紝涔嬪悗鎻愪氦鍒拌储鍔�");
//璇存槑鏄储鍔￠��鍥炲啀鎻愪氦鐨�.闇�瑕佸嚭绾冲啀鐪嬩竴閬嶏紝娌￠棶棰樹箣鍚庯紝寰�鍒嗕韩琛ㄩ噷鏂板
- serviceFundService.addFundSharedInfo(serviceFund.getId());
- serviceFund.setFlowlevel(100L);
+// serviceFundService.addFundSharedInfo(serviceFund.getId());
+ serviceFund.setFlowlevel(serviceFundflowrules.get(0).getTotallevel().longValue());
serviceFund.setRecordstatus(99);
+ serviceFund.setUploadStates(1);
serviceFundService.updateById(serviceFund);
//淇濆瓨瀹℃壒娴佺▼琛�
@@ -565,6 +368,20 @@
FlowLevel = 0;
}
}
+
+ SysUser sysUser = sysUserService.selectUserByUserName(serviceFund.getUserno());
+ ArrayList<ConcurrentHashMap<String, Object>> contentList = new ArrayList<>();
+ ConcurrentHashMap map = new ConcurrentHashMap();
+ map.put("瀹℃壒浜猴細", loginUser.getUser().getUserName());
+ map.put("瀹℃壒鏃堕棿锛�", new Date());
+ map.put("鎰忚锛�", "涓嶉�氳繃");
+ if (StringUtils.isNotBlank(checkFundVO.getFlowcontent())) map.put("鎰忚锛�", checkFundVO.getFlowcontent());
+ contentList.add(map);
+ DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
+ dingTalkReqVo.setTitle("璐㈠姟绯荤粺椹冲洖淇℃伅");
+ dingTalkReqVo.setNumber(sysUser.getPhonenumber());
+ dingTalkReqVo.setContents(contentList);
+ dingTalkService.sendNotification(dingTalkReqVo);
}
serviceFund.setRecordstatus(RecordStatus);
@@ -592,12 +409,13 @@
//001瀹℃壒閫氳繃涔嬪悗锛屽氨闇�瑕佹妸鈥滃姙鍏涓讳换鈥濈殑鍚嶅瓧濉笂
if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) {
serviceFund.setOfficedirector(user.getNickName());
+ serviceFund.setUploadStates(1);
}
System.out.println("serviceFund鐨勫�兼槸--------:" + serviceFund);
log.info("寮�濮嬫洿鏂扮殑鐨勫�兼槸--------");
- ServiceFund updateServiceFund = new ServiceFund();
- updateServiceFund.setRecordstatus(serviceFund.getRecordstatus());
- updateServiceFund.setFlowlevel(serviceFund.getFlowlevel());
+// ServiceFund updateServiceFund = new ServiceFund();
+// updateServiceFund.setRecordstatus(serviceFund.getRecordstatus());
+// updateServiceFund.setFlowlevel(serviceFund.getFlowlevel());
Boolean aBoolean1 = serviceFundService.updateById(serviceFund);
log.info("integer鏇存柊鐨勭殑鍊兼槸-------- :{}", aBoolean1);
@@ -608,22 +426,49 @@
serviceSystemmessage.setSendusername(user.getNickName());
serviceSystemmessage.setReceiveuserno(serviceFund.getUserno());
serviceSystemmessage.setReceiveusername(serviceFund.getUsername());
+ serviceSystemmessage.setUpdateTime(new Date());
+ serviceSystemmessage.setUpdateBy(user.getNickName());
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());
- }
+ //閫氳繃
+ if (serviceFund.getApplytype().equals("1")) {
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁�氳繃");
+ serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勪笓瀹跺姵鍔¤垂鎹愮尞妗堜緥銆�" + serviceFund.getDonorname() + "銆戠殑璐圭敤鐢宠宸查�氳繃");
+ } else if (serviceFund.getApplytype().equals("2")) {
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁�氳繃");
+ serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勪鸡鐞嗕笓瀹跺姵鍔¤垂鎹愮尞妗堜緥銆�" + serviceFund.getDonorname() + "銆戠殑璐圭敤鐢宠宸查�氳繃");
+ } else if (serviceFund.getApplytype().equals("3")) {
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁�氳繃");
+ serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勫尰瀛︽垚鏈崘鐚渚嬨��" + serviceFund.getDonorname() + "銆戠殑璐圭敤鐢宠宸查�氳繃");
+ } else if (serviceFund.getApplytype().equals("4")) {
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁�氳繃");
+ serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勫姙鍏垂鐢ㄧ敵璇峰凡閫氳繃");
+ } else if (serviceFund.getApplytype().equals("5")) {
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁�氳繃");
+ serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勭哗鏁堢敵璇峰凡閫氳繃");
+ }
} else {
//椹冲洖
- serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁┏鍥�");
- serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勫叧浜庢崘鐚渚嬨��" + serviceFund.getDonorname() + "銆戠殑璐圭敤鐢宠宸茶" + (OriginalFlowLevel + 1) + "绾у鏍搁┏鍥烇紝鍘熷洜涓�" + checkFundVO.getFlowcontent() + "");
+ if (serviceFund.getApplytype().equals("1")) {
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁┏鍥�");
+ serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勪笓瀹跺姵鍔¤垂鎹愮尞妗堜緥銆�" + serviceFund.getDonorname() + "銆戠殑璐圭敤鐢宠宸茶椹冲洖锛屽師鍥�: " + checkFundVO.getFlowcontent() + "");
+ } else if (serviceFund.getApplytype().equals("2")) {
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁┏鍥�");
+ serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勪鸡鐞嗕笓瀹跺姵鍔¤垂鎹愮尞妗堜緥銆�" + serviceFund.getDonorname() + "銆戠殑璐圭敤鐢宠宸茶椹冲洖锛屽師鍥�: " + checkFundVO.getFlowcontent() + "");
+ } else if (serviceFund.getApplytype().equals("3")) {
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁┏鍥�");
+ serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勫尰瀛︽垚鏈崘鐚渚嬨��" + serviceFund.getDonorname() + "銆戠殑璐圭敤鐢宠宸茶椹冲洖锛屽師鍥�: " + checkFundVO.getFlowcontent() + "");
+ } else if (serviceFund.getApplytype().equals("4")) {
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁┏鍥�");
+ serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勫姙鍏垂鐢ㄧ敵璇峰凡椹冲洖锛屽師鍥�: " + checkFundVO.getFlowcontent() + "");
+ } else if (serviceFund.getApplytype().equals("5")) {
+ serviceSystemmessage.setMessagetitle("" + (OriginalFlowLevel + 1) + "绾у鏍搁┏鍥�");
+ serviceSystemmessage.setMessagecontent("鎮�" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(serviceFund.getCreateTime()) + "鎻愪氦鐨勭哗鏁堢敵璇峰凡椹冲洖锛屽師鍥�: " + checkFundVO.getFlowcontent() + "");
+ }
}
ServiceSystemmessage.save(serviceSystemmessage);
return AjaxResult.success();
@@ -640,13 +485,27 @@
@Log(title = "璐圭敤涓婃姤", businessType = BusinessType.UPDATE)
@PostMapping("/fundEdit")
@RepeatSubmit
- public AjaxResult fundEdit(@RequestBody ServiceFund serviceFund) {
+ public AjaxResult fundEdit(@RequestBody ServiceFundVO serviceFundVO) {
+ ServiceFund serviceFund = DtoConversionUtils.sourceToTarget(serviceFundVO, ServiceFund.class);
log.info("淇敼璐圭敤鐢宠鍏ュ弬:{}", serviceFund);
List<ServiceFund> infoByInfoIdList = serviceFundService.queryInfoById(serviceFund);
log.info("淇敼璐圭敤鐢宠锛岄�氳繃鍏ュ弬鏌ヨ serviceFundService.queryInfoById鏁版嵁涓虹┖,鍏ュ弬:{}", infoByInfoIdList.size());
if (CollectionUtils.isEmpty(infoByInfoIdList)) {
- return toAjax(false);
+ Long id = serviceFundService.addOrUpdateNew(serviceFundVO);
+ serviceFund.setId(id);
}
+
+ Long flowLavel = null;
+
+ LoginUser loginUser = getLoginUser();
+
+ //鏌ヨ蹇呭浜�
+ ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
+ serviceFundflowrule.setApplytype(serviceFund.getApplytype());
+ serviceFundflowrule.setMustAudite(1);
+ List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
+ log.info("fund蹇呭浜虹殑绛夌骇涓猴細{}", serviceFundflowrules.get(0).getFlowlevel());
+
for (ServiceFund sf : infoByInfoIdList) {
sf.setApplyTime(new Date());
//濡傛灉绛変簬100锛岃鏄庡凡缁忚蛋鍒板尰闄㈣储鍔￠偅杈逛簡锛涜储鍔￠偅杈瑰彇鏁版嵁鏄粠鍒嗕韩琛ㄥ彇锛屾墍浠ワ紝杩欓噷鐩存帴寰�鍒嗕韩琛ㄩ噷娣诲姞鏁版嵁灏辫浜�
@@ -655,7 +514,7 @@
sf.setBackflowlevel(100);
//閫�鍥炲啀鎻愪氦锛岄渶瑕佸啀鍒板嚭绾抽偅閲�
- sf.setFlowlevel(1L);
+ sf.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
sf.setRecordstatus(0);
serviceFundService.updateById(sf);
@@ -666,27 +525,25 @@
} else if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 100) {
//璐㈠姟閫�鍥炵殑鏁版嵁鍐嶆彁浜わ紝鍒板嚭绾抽偅閲屾病鏈夎繃锛屽啀閫�鍥烇紝瀵艰嚧backflowlevel鏄�100,
//閫�鍥炲啀鎻愪氦锛岄渶瑕佸啀鍒板嚭绾抽偅閲�
- sf.setFlowlevel(1L);
+ sf.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
sf.setRecordstatus(2);
serviceFundService.updateById(sf);
- } else if (sf.getBackflowlevel() != null && sf.getBackflowlevel() == 2) {
+ } else if (sf.getBackflowlevel() != null && sf.getBackflowlevel() >= serviceFundflowrules.get(0).getFlowlevel()) {
//鑱傜閫�鍥炵殑锛屼篃闇�瑕佸厛鍒板嚭绾抽偅閲�
- sf.setFlowlevel(1L);
+ sf.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
sf.setRecordstatus(2);
serviceFundService.updateById(sf);
} 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().longValue());
} else {
- serviceFund.setBackflowlevel(1);
- serviceFund.setFlowlevel(1L);
+ serviceFund.setBackflowlevel(serviceFundflowrules.get(0).getFlowlevel() - 1);
+ serviceFund.setFlowlevel(Long.valueOf(serviceFundflowrules.get(0).getFlowlevel() - 1));
}
} else {
serviceFund.setRecordstatus(0);
@@ -714,7 +571,7 @@
* 鍒犻櫎璐圭敤鐢宠涓�
*/
@ApiOperation("鍒犻櫎璐圭敤鐢宠涓�")
- //@PreAuthorize("@ss.hasPermi('project:fund:remove')")
+ //// @PreAuthorize("@ss.hasPermi('project:fund:remove')")
@Log(title = "璐圭敤鐢宠涓�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
@@ -728,7 +585,7 @@
@GetMapping(value = "/downloadLW/{id}")
public Map downloadInfoLW(@PathVariable("id") Long id) throws IOException {
Map dataMap = new HashMap();
- getDataLW(dataMap, id);
+ String dataLW = getDataLW(dataMap, id);
String filePath = getClass().getResource("/template/").getPath();
System.out.println(filePath);
//璁剧疆妯℃湰瑁呯疆鏂规硶鍜岃矾寰�,FreeMarker鏀寔澶氱妯℃澘瑁呰浇鏂规硶銆傚彲浠ラ噸servlet锛宑lasspath锛屾暟鎹簱鏁欑▼瑁呰浇锛�
@@ -742,7 +599,11 @@
e.printStackTrace();
}
String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis());
+
String name = "涓撳鍔冲姟璐瑰彂鏀剧敵璇峰崟_" + dataMap.get("XM") + "_" + newTime;
+ if (dataLW.equals("4")) {
+ name = "鍔炲叕璐圭敤鐢宠鍗昣" + dataMap.get("XM") + "_" + newTime;
+ }
//杈撳嚭鏂囨。璺緞鍙婂悕绉�
File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc");
@@ -765,7 +626,7 @@
return map;
}
- private void getDataLW(Map dataMap, Long id) {
+ private String getDataLW(Map dataMap, Long id) {
ServiceFund serviceFund = serviceFundService.getById(id);
if (serviceFund == null) {
throw new ServiceException("涓嬭浇澶辫触锛岀敤鎴蜂俊鎭嚭閿�", HttpStatus.NO_CONTENT);
@@ -897,6 +758,7 @@
dataMap.put("KSLJ", kslj);
dataMap.put("SHLJ", shlj);
+ return serviceFund.getApplytype();
}
@@ -1150,7 +1012,7 @@
throw new ServiceException("涓嬭浇澶辫触锛岀敤鎴蜂俊鎭嚭閿�", HttpStatus.NO_CONTENT);
}
ServiceExternalperson infoByUserNo = null;
- if (StringUtils.isNotBlank(serviceFund.getUserno())) {
+ if (StringUtils.isNotBlank(serviceFund.getUserno()) && serviceFund.getApplytype().equals("5")) {
infoByUserNo = externalpersonService.getInfoByUserNo(serviceFund.getUserno());
}
@@ -2168,8 +2030,17 @@
dataMap.put("downloadName", msg);
return AjaxResult.success(dataMap);
+ }
-
+ /**
+ * 瀵煎嚭涓撳鎶ラ攢璐圭敤姹囨��
+ */
+ @ApiOperation("瀵煎嚭涓撳鎶ラ攢璐圭敤姹囨��")
+ @Log(title = "璐圭敤鐢宠涓�", businessType = BusinessType.EXPORT)
+ @GetMapping("/exportFeeSum/{faxId}")
+ public Map<String, Object> exportFeeSum(@PathVariable Integer faxId) {
+ Map<String, Object> map = serviceFundService.exportFeeSum(faxId);
+ return map;
}
}
--
Gitblit v1.9.3