From 29f287cf6e4869d7bbc283991458e09a03b59c52 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 21 一月 2026 14:29:55 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java
index 6589c33..7796d1d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java
@@ -5,17 +5,24 @@
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.common.IdGeneratorUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfoReport;
import com.ruoyi.project.domain.ServiceDonatebaseinfoReportFile;
+import com.ruoyi.project.domain.VUserOrg;
import com.ruoyi.project.service.IServiceDonatebaseinfoReportFileService;
import com.ruoyi.project.service.IServiceDonatebaseinfoReportService;
+import com.ruoyi.project.service.IVUserOrgService;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -30,7 +37,7 @@
*/
@Api(description = "鎹愮尞涓婃姤鍩虹")
@RestController
-@RequestMapping("/system/donatebaseinforeport")
+@RequestMapping("/project/donatebaseinforeport")
public class ServiceDonatebaseinfoReportController extends BaseController {
@Autowired
private IServiceDonatebaseinfoReportService serviceDonatebaseinfoReportService;
@@ -38,13 +45,15 @@
private IServiceDonatebaseinfoReportFileService serviceDonatebaseinfoReportFileService;
@Autowired
private ISysConfigService sysConfigService;
+ @Autowired
+ private IVUserOrgService vUserOrgService;
/**
* 鏌ヨ鎹愮尞涓婃姤鍩虹鍒楄〃
*/
@ApiOperation("鏌ヨ鎹愮尞涓婃姤鍩虹鍒楄〃")
@PostMapping("/list")
- public Map<String, Object> list(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
+ public Map<String, Object> list(@RequestBody ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
Page<ServiceDonatebaseinfoReport> serviceDonatebaseinfoReportPage = serviceDonatebaseinfoReportService.queryList(serviceDonatebaseinfoReport);
return getDataTable(serviceDonatebaseinfoReportPage.getRecords(), (int) serviceDonatebaseinfoReportPage.getTotal());
}
@@ -54,7 +63,7 @@
*/
@ApiOperation("鑾峰彇鍚勭被鍨嬬殑鎬绘暟")
@PostMapping("/getTotal")
- public Map<String, Object> getTotal(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
+ public Map<String, Object> getTotal(@RequestBody ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
//鍘婚厤缃枃浠朵腑锛岃幏鍙栦笂鎶ョ被鍨�
SysConfig config = new SysConfig();
config.setConfigKey("sys.report.type");
@@ -108,6 +117,18 @@
//鐢熸垚妗堜緥涓婃姤ID
String caseNo = String.valueOf(IdGeneratorUtils.nextId());
serviceDonatebaseinfoReport.setCaseNo(caseNo);
+
+ //鑾峰彇鍗忚皟鍛樹俊鎭�
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ String userName = loginUser.getUser().getUserName();
+ VUserOrg vUserOrg= new VUserOrg();
+ vUserOrg.setUserName(userName);
+ List<VUserOrg> vUserOrgs = vUserOrgService.queryList(vUserOrg);
+ if(CollectionUtils.isNotEmpty(vUserOrgs)){
+ serviceDonatebaseinfoReport.setCoordinatorNo(vUserOrgs.get(0).getCoordinatorNo());
+ serviceDonatebaseinfoReport.setCoordinatorName(vUserOrgs.get(0).getCoordinatorName());
+ }
+
boolean save = serviceDonatebaseinfoReportService.save(serviceDonatebaseinfoReport);
//灏嗙敓鎴愮殑鏂囦欢鍦板潃瀛樺偍鍒版暟鎹簱涓�
if (save)
@@ -123,10 +144,18 @@
@PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
+ if (StringUtils.isEmpty(serviceDonatebaseinfoReport.getCaseNo())) {
+ throw new BaseException("妗堜緥缂栧彿涓虹┖锛岃妫�鏌ュ悗鍐嶄慨鏀�");
+ }
boolean b = serviceDonatebaseinfoReportService.updateById(serviceDonatebaseinfoReport);
if (b) {
serviceDonatebaseinfoReportFileService.updateList(serviceDonatebaseinfoReport.getAnnexfilesList(), serviceDonatebaseinfoReport.getId(), serviceDonatebaseinfoReport.getCaseNo(), getNickName());
+ if (serviceDonatebaseinfoReport.getReportStatus().equals("3")) {
+ //濡傛灉鍚屾剰涓婃姤锛岄偅灏卞彲浠ュ缓妗ｄ簡锛堝線 ServiceDonatebaseinfo鏂板锛�
+ serviceDonatebaseinfoReportService.createDocument(serviceDonatebaseinfoReport);
+ }
}
+
return toAjax(b);
}
--
Gitblit v1.9.3