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/ServiceRelativesconfirmationController.java | 89 ++++++++++++++++++++++++--------------------
1 files changed, 49 insertions(+), 40 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
index 72938a7..a2a4ae2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
@@ -1,45 +1,38 @@
package com.ruoyi.web.controller.project;
-import java.io.*;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.Education;
import com.ruoyi.common.enums.NationalityEnum;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.domain.ServiceRelativesconfirmation;
+import com.ruoyi.project.domain.dto.RelativeConfirmationBaseInfoDTO;
+import com.ruoyi.project.domain.vo.RelativeConfirmationBaseInfoVO;
import com.ruoyi.project.domain.vo.RelativeConfirmationVO;
import com.ruoyi.project.mapper.ServiceDonatebaseinfoMapper;
import com.ruoyi.project.mapper.ServiceRelativesconfirmationMapper;
-import com.ruoyi.project.service.IServiceDonatebaseinfoService;
+import com.ruoyi.project.service.IServiceRelativesconfirmationService;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.annotation.RepeatSubmit;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.project.domain.ServiceRelativesconfirmation;
-import com.ruoyi.project.service.IServiceRelativesconfirmationService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* 鎹愮尞浜插睘纭Controller
@@ -48,7 +41,7 @@
* @date 2021-11-15
*/
@Slf4j
-@Api("浜插睘纭绠＄悊")
+@Api(description = "浜插睘纭绠＄悊")
@RestController
@RequestMapping("/project/relativesconfirmation")
public class ServiceRelativesconfirmationController extends BaseController {
@@ -69,23 +62,39 @@
configuration.setDefaultEncoding("utf-8");
}
- /**
- * 鏌ヨ鎹愮尞浜插睘纭鍒楄〃
- */
- @ApiOperation("鑾峰彇浜插睘纭鍒楄〃")
- //// @PreAuthorize("@ss.hasPermi('project:relativesconfirmation:list')")
- @GetMapping("/list")
- public TableDataInfo list(ServiceRelativesconfirmation serviceRelativesconfirmation) {
- startPage();
- List<ServiceRelativesconfirmation> list = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation);
- return getDataTable(list);
- }
+// /**
+// * 鏌ヨ鎹愮尞浜插睘纭鍒楄〃
+// */
+// @ApiOperation("鑾峰彇浜插睘纭鍒楄〃")
+// //// @PreAuthorize("@ss.hasPermi('project:relativesconfirmation:list')")
+// @GetMapping("/list")
+// public TableDataInfo list(ServiceRelativesconfirmation serviceRelativesconfirmation) {
+// startPage();
+// List<ServiceRelativesconfirmation> list = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation);
+// return getDataTable(list);
+// }
+//
+// @GetMapping("/listnew")
+// public TableDataInfo listnew(RelativeConfirmationVO relativeConfirmationVO) {
+// startPage();
+// List<RelativeConfirmationVO> list = serviceRelativesconfirmationService.selectVOList(relativeConfirmationVO);
+// return getDataTable(list);
+// }
- @GetMapping("/listnew")
- public TableDataInfo listnew(RelativeConfirmationVO relativeConfirmationVO) {
- startPage();
- List<RelativeConfirmationVO> list = serviceRelativesconfirmationService.selectVOList(relativeConfirmationVO);
- return getDataTable(list);
+ @ApiOperation("鎹愮尞纭鍩烘湰淇℃伅闆嗗悎")
+ @PostMapping("/confirmationBaseInfoList")
+ public Map<String, Object> confirmationBaseInfoList(@RequestBody RelativeConfirmationBaseInfoVO relativeConfirmationBaseInfoVO) {
+ Integer offset = PageUtils.getOffset(relativeConfirmationBaseInfoVO.getPageNum(), relativeConfirmationBaseInfoVO.getPageSize());
+ relativeConfirmationBaseInfoVO.setPageNum(offset);
+ List<RelativeConfirmationBaseInfoDTO> list = serviceRelativesconfirmationService.confirmationBaseInfoList(relativeConfirmationBaseInfoVO);
+
+ //鑾峰彇鎬绘暟
+ relativeConfirmationBaseInfoVO.setPageNum(null);
+ relativeConfirmationBaseInfoVO.setPageSize(null);
+ Integer totalCount = 0;
+ List<RelativeConfirmationBaseInfoDTO> total = serviceRelativesconfirmationService.confirmationBaseInfoList(relativeConfirmationBaseInfoVO);
+ if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
+ return getDataTable(list, totalCount);
}
--
Gitblit v1.9.3