From dcd1aab9b5bec2556161c16bd1bc4fe71fef476d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 08 六月 2026 17:17:47 +0800
Subject: [PATCH] 关于社保补缴的计算,如果社保保险设置有多条数据,根据创建时间来判断,当月即以后得参考标准用对应的配置,并且需要统计当年从1月到现在缴纳的所有社保金额,和最新的社保比列得出的金额进行比较,计算需要补缴的金额,只有社会保险设置新增一条数据的当月会计算,其余月份对应的都是0
---
src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java
index 453986e..917bda6 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java
@@ -14,8 +14,8 @@
import com.ruoyi.collaborativeApproval.vo.SearchMeetingUseVo;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -32,7 +32,7 @@
@RestController
@RequestMapping("/meeting")
@RequiredArgsConstructor
-@Api(tags = "浼氳")
+@Tag(name = "浼氳")
public class MeetingController {
private final MeetingService meetingService;
@@ -126,7 +126,7 @@
return R.ok(meetingService.getMeetSummaryItems());
}
- @ApiOperation(value = "浼氳瀹よ缃鍑�")
+ @Operation(summary = "浼氳瀹よ缃鍑�")
@PostMapping("/export")
public void export(HttpServletResponse response) {
List<MeetingRoom> accountExpenses = meetingService.list();
@@ -136,7 +136,7 @@
private final MeetDraftMapper meetDraftMapper;
- @ApiOperation(value = "浼氳鑽夌瀵煎嚭")
+ @Operation(summary = "浼氳鑽夌瀵煎嚭")
@PostMapping("/exportOne")
public void exportOne(HttpServletResponse response) {
List<MeetDraft> accountExpenses = meetDraftMapper.selectList(new LambdaQueryWrapper<MeetDraft>());
--
Gitblit v1.9.3