From 55aac55195dc2bd404042ec099045fee8ac73e81 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 02 七月 2025 21:48:53 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
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 49727dd..c1cdcf1 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
@@ -20,7 +20,6 @@
import com.ruoyi.project.domain.vo.SpFinancialExpensesIn;
import com.ruoyi.project.domain.vo.SpFinancialExpensesReimbursementOut;
import com.ruoyi.project.service.*;
-import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.web.controller.enums.PersonType;
@@ -104,7 +103,7 @@
* 鏌ヨ鎶ラ攢鐢宠鍒楄〃
*/
@ApiOperation("鏌ヨ鎶ラ攢鐢宠鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:reimbursement:list')")
+ //// @PreAuthorize("@ss.hasPermi('project:reimbursement:list')")
@Log(title = "鏌ヨ鎶ラ攢鐢宠鍒楄〃", businessType = BusinessType.OTHER)
@GetMapping("/list")
public TableDataInfo list(ServiceReimbursement serviceReimbursement) {
@@ -165,6 +164,7 @@
if (APPLICATIONENDTIME == null) {
APPLICATIONENDTIME = "";
}
+
//startPage();
List<SpFinancialExpensesReimbursementOut> list = serviceReimbursementService.getListBypower(loginUser.getUsername(), 1, APPLICANT, APPLICATIONBEGTIME, APPLICATIONENDTIME, loginUser.getDeptId().toString(), CHECKFLAG, APPLYTYPE, checkstatus, donorname);
//鏍规嵁缁忓姙浜虹瓫閫�
@@ -175,6 +175,10 @@
if (spFinancialExpensesIn.getMoney() != null) {
list = list.stream().filter(reimbursementOut -> new BigDecimal(reimbursementOut.getAmountrequested()).compareTo(new BigDecimal(spFinancialExpensesIn.getMoney())) == 0).collect(Collectors.toList());
+ }
+ //鏍规嵁涓氬姟缁勭瓫閫�
+ if (StringUtils.isNotBlank(spFinancialExpensesIn.getDeptnos())) {
+ list = list.stream().filter(reimbursementOut -> reimbursementOut.getDeptmentno().contains(spFinancialExpensesIn.getDeptnos())).collect(Collectors.toList()); // 鎸塶ame瀛楁杩囨护
}
//鏍规嵁鍒涘缓鏃堕棿鎺掑簭
Collections.sort(list, new Comparator<SpFinancialExpensesReimbursementOut>() {
@@ -190,7 +194,7 @@
* 瀵煎嚭鎶ラ攢鐢宠鍒楄〃
*/
@ApiOperation("瀵煎嚭鎶ラ攢鐢宠鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:reimbursement:export')")
+ //// @PreAuthorize("@ss.hasPermi('project:reimbursement:export')")
@Log(title = "鎶ラ攢鐢宠", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceReimbursement serviceReimbursement) {
@@ -203,7 +207,7 @@
* 鑾峰彇鎶ラ攢鐢宠璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇鎶ラ攢鐢宠璇︾粏淇℃伅")
- //@PreAuthorize("@ss.hasPermi('project:reimbursement:query')")
+ //// @PreAuthorize("@ss.hasPermi('project:reimbursement:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceReimbursementService.getById(id));
@@ -223,7 +227,7 @@
* 鏂板鎶ラ攢鐢宠
*/
@ApiOperation("鏂板鎶ラ攢鐢宠")
- //@PreAuthorize("@ss.hasPermi('project:reimbursement:add')")
+ //// @PreAuthorize("@ss.hasPermi('project:reimbursement:add')")
@Log(title = "鎶ラ攢鐢宠", businessType = BusinessType.INSERT)
@PostMapping("/add")
@RepeatSubmit
@@ -489,8 +493,8 @@
}
}
- //001瀹℃壒閫氳繃涔嬪悗锛屽氨闇�瑕佹妸鈥滃姙鍏涓讳换鈥濈殑鍚嶅瓧濉笂
- if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("001")) {
+ //053瀹℃壒閫氳繃涔嬪悗锛屽氨闇�瑕佹妸鈥滃姙鍏涓讳换鈥濈殑鍚嶅瓧濉笂
+ if (checkFundVO.getFlowconclusion() == 1 && user.getUserName().equals("053")) {
serviceReimbursement.setOfficedirector(user.getNickName());
serviceReimbursement.setUploadStates(1);
}
@@ -539,7 +543,7 @@
* 淇敼鎶ラ攢鐢宠
*/
@ApiOperation("淇敼鎶ラ攢鐢宠")
- //@PreAuthorize("@ss.hasPermi('project:reimbursement:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:reimbursement:edit')")
@Log(title = "鎶ラ攢鐢宠", businessType = BusinessType.UPDATE)
@PostMapping("/reimbursementEdit")
@RepeatSubmit
@@ -555,7 +559,7 @@
* 淇敼鎶ラ攢鐢宠
*/
@ApiOperation("淇敼鎶ラ攢鐢宠")
- //@PreAuthorize("@ss.hasPermi('project:reimbursement:edit')")
+ //// @PreAuthorize("@ss.hasPermi('project:reimbursement:edit')")
@Log(title = "瀹℃牳璐圭敤", businessType = BusinessType.OTHER)
@PostMapping("/editMoney")
public AjaxResult editMoney(@RequestBody List<ReimbursementService> serviceReimbursement) {
@@ -570,7 +574,7 @@
* 鍒犻櫎鎶ラ攢鐢宠
*/
@ApiOperation("鍒犻櫎鎶ラ攢鐢宠")
- //@PreAuthorize("@ss.hasPermi('project:reimbursement:remove')")
+ //// @PreAuthorize("@ss.hasPermi('project:reimbursement:remove')")
@Log(title = "鎶ラ攢鐢宠")
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
@@ -762,7 +766,7 @@
throw new ServiceException("涓嬭浇澶辫触锛岀敤鎴蜂俊鎭嚭閿�", HttpStatus.NO_CONTENT);
}
- Date dt = rdInfoByItem.get(0).getCreateTime();
+ Date dt = rdInfoByItem.get(0).getApplyTime();
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String date = formatter.format(dt);
String time = date.substring(0, 10);
--
Gitblit v1.9.3