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/aftersalesservice/controller/AfterSalesServiceFileController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java
index 2290e5b..9032852 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -34,24 +34,24 @@
@PostMapping("/upload")
@Operation(summary = "鍞悗鏈嶅姟-鏂囦欢涓婁紶")
@Log(title = "鍞悗鏈嶅姟-鏂囦欢涓婁紶", businessType = BusinessType.INSERT)
- public R<?> fileUpload(@RequestParam("file") MultipartFile file,
+ public AjaxResult fileUpload(@RequestParam("file") MultipartFile file,
@RequestParam("id") Long afterSalesServiceId) {
afterSalesServiceFileService.fileUpload(file, afterSalesServiceId);
- return R.ok(null, "涓婁紶鎴愬姛");
+ return AjaxResult.success("涓婁紶鎴愬姛");
}
@GetMapping("/listPage")
@Operation(summary = "鍞悗澶勭悊-鍞悗闄勪欢鍒楄〃")
@Log(title = "鍞悗澶勭悊-鍞悗闄勪欢鍒楄〃", businessType = BusinessType.OTHER)
- public R<?> fileList(Page<AfterSalesServiceFile> page, Long afterSalesServiceId) {
- return R.ok(afterSalesServiceFileService.fileList(page, afterSalesServiceId));
+ public AjaxResult fileList(Page<AfterSalesServiceFile> page, Long afterSalesServiceId) {
+ return AjaxResult.success(afterSalesServiceFileService.fileList(page, afterSalesServiceId));
}
@DeleteMapping("/del/{fileId}")
@Operation(summary = "鍞悗澶勭悊-鍒犻櫎闄勪欢")
@Log(title = "鍞悗澶勭悊-鍒犻櫎闄勪欢", businessType = BusinessType.DELETE)
- public R<?> delFile(@PathVariable Long fileId) {
+ public AjaxResult delFile(@PathVariable Long fileId) {
afterSalesServiceFileService.delFile(fileId);
- return R.ok(null, "鍒犻櫎鎴愬姛!");
+ return AjaxResult.success("鍒犻櫎鎴愬姛!");
}
}
--
Gitblit v1.9.3