From 0bb9f6c3e894e56ff58d335110fbe4cfa87b64b2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 28 一月 2026 14:17:19 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
index 67a9217..9750a90 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
@@ -11,12 +11,15 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.config.ServerConfig;
import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.ServiceDonationwitness;
+import com.ruoyi.project.domain.dto.DonatebaseinfoProgressDTO;
+import com.ruoyi.project.domain.dto.ReviewInitiateBaseInfoDTO;
+import com.ruoyi.project.domain.vo.DonatebaseinfoProgressVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.service.IServiceDonatebaseinfoService;
import com.ruoyi.project.service.IServiceDonationwitnessService;
@@ -37,6 +40,7 @@
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.*;
+import java.util.stream.Collectors;
/**
@@ -46,7 +50,7 @@
* @date 2021-11-10
*/
@Slf4j
-@Api("娼滃湪鎹愮尞淇℃伅绠＄悊")
+@Api(description = "娼滃湪鎹愮尞淇℃伅绠＄悊")
@RestController
@RequestMapping("/project/donatebaseinfo")
public class ServiceDonatebaseinfoController extends BaseController {
@@ -58,9 +62,6 @@
@Autowired
private IServiceExternalpersonService serviceExternalpersonService;
-
- @Autowired
- private ServerConfig serverConfig;
@Autowired
private SysDeptMapper sysDeptMapper;
@@ -77,12 +78,10 @@
* 鏌ヨ鎹愮尞鍩虹鍒楄〃
*/
@ApiOperation("娼滃湪鎹愮尞淇℃伅鍒楄〃")
- //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonatebaseinfo serviceDonatebaseinfo) {
log.info("娼滃湪鎹愮尞淇℃伅鍒楄〃锛歿}", serviceDonatebaseinfo);
startPage();
- //List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
return getDataTable(list);
}
@@ -96,6 +95,32 @@
return getDataTable(list);
}
+ @ApiOperation("鎹愮尞杩涘害鍩烘湰淇℃伅鍒楄〃")
+ @PostMapping("/donateBaseInfoProgressList")
+ public Map<String, Object> donateBaseInfoProgressList(@RequestBody DonatebaseinfoProgressVO donatebaseinfoProgressVO) {
+ log.info("灏忕▼搴忕娼滃湪鎹愮尞淇℃伅鍒楄〃锛歿}", donatebaseinfoProgressVO);
+ Integer offset = PageUtils.getOffset(donatebaseinfoProgressVO.getPageNum(), donatebaseinfoProgressVO.getPageSize());
+ donatebaseinfoProgressVO.setPageNum(offset);
+ List<DonatebaseinfoProgressDTO> donatebaseinfoProgressDTOS = serviceDonatebaseinfoService.donateBaseInfoProgressList(donatebaseinfoProgressVO);
+
+ //鑾峰彇鎬绘暟
+ donatebaseinfoProgressVO.setPageNum(null);
+ donatebaseinfoProgressVO.setPageSize(null);
+ Integer totalCount = 0;
+ List<DonatebaseinfoProgressDTO> total = serviceDonatebaseinfoService.donateBaseInfoProgressList(donatebaseinfoProgressVO);
+
+ //鑾峰彇鎹愮尞杩涚▼杩涘害
+ Map<Integer, Long> terminationCase = total.stream().filter(Objects::nonNull).map(DonatebaseinfoProgressDTO::getTerminationCase).filter(Objects::nonNull).collect(Collectors.groupingBy(type -> type, Collectors.counting()));
+
+ //鏁版嵁灏佽
+ Map<String, Object> map = new HashMap<>();
+ map.put("terminationCase", terminationCase);
+ map.put("donatebaseinfoProgressDTOS", donatebaseinfoProgressDTOS);
+
+ if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
+ return getDataTable(map, totalCount);
+ }
+
/**
* 瀵煎嚭鎹愮尞鍩虹鍒楄〃
*/
--
Gitblit v1.9.3