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/production/controller/ProductionOrderRoutingController.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionOrderRoutingController.java b/src/main/java/com/ruoyi/production/controller/ProductionOrderRoutingController.java
index cb79e85..833e737 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionOrderRoutingController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionOrderRoutingController.java
@@ -4,14 +4,14 @@
import com.ruoyi.production.pojo.ProductionOrderRoutingOperation;
import com.ruoyi.production.service.ProductionOrderRoutingOperationService;
import com.ruoyi.production.service.ProductionOrderRoutingService;
-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.*;
@RestController
@RequestMapping("/productionOrderRouting")
-@Api(tags = "鐢熶骇璁㈠崟宸ヨ壓璺嚎")
+@Tag(name = "鐢熶骇璁㈠崟宸ヨ壓璺嚎")
@RequiredArgsConstructor
public class ProductionOrderRoutingController {
@@ -19,37 +19,37 @@
private final ProductionOrderRoutingOperationService productionOrderRoutingOperationService;
@GetMapping("list")
- @ApiOperation("鏍规嵁Id鏌ヨ宸ヨ壓璺嚎瀛愯〃")
+ @Operation(summary = "鏍规嵁Id鏌ヨ宸ヨ壓璺嚎瀛愯〃")
public R list(Long orderId) {
return R.ok(productionOrderRoutingService.listItem(orderId));
}
@GetMapping("listMain")
- @ApiOperation("鏍规嵁Id鏌ヨ宸ヨ壓璺嚎涓昏〃")
+ @Operation(summary = "鏍规嵁Id鏌ヨ宸ヨ壓璺嚎涓昏〃")
public R listMain(Long orderId) {
return R.ok(productionOrderRoutingService.listMain(orderId));
}
@PostMapping("/addRouteItem")
- @ApiOperation("鏂板鐢熶骇璁㈠崟鐨勫伐鑹鸿矾绾胯鎯�")
+ @Operation(summary = "鏂板鐢熶骇璁㈠崟鐨勫伐鑹鸿矾绾胯鎯�")
public R addRouteItem(@RequestBody ProductionOrderRoutingOperation productionOrderRoutingOperation) {
return productionOrderRoutingOperationService.addRouteItem(productionOrderRoutingOperation);
}
@PostMapping("/updateRouteItem")
- @ApiOperation("淇敼鐢熶骇璁㈠崟鐨勫伐鑹鸿矾绾胯鎯�")
+ @Operation(summary = "淇敼鐢熶骇璁㈠崟鐨勫伐鑹鸿矾绾胯鎯�")
public R updateRouteItem(@RequestBody ProductionOrderRoutingOperation productionOrderRoutingOperation) {
- return R.ok(productionOrderRoutingOperationService.updateById(productionOrderRoutingOperation));
+ return productionOrderRoutingOperationService.updateRouteItem(productionOrderRoutingOperation);
}
@DeleteMapping("/deleteRouteItem/{id}")
- @ApiOperation("鍒犻櫎鐢熶骇宸ヨ壓璺嚎")
+ @Operation(summary = "鍒犻櫎鐢熶骇宸ヨ壓璺嚎")
public R deleteRouteItem(@PathVariable("id") Long id) {
return productionOrderRoutingOperationService.deleteRouteItem(id);
}
@PostMapping("/sortRouteItem")
- @ApiOperation("鎺掑簭")
+ @Operation(summary = "鎺掑簭")
public R sortRouteItem(@RequestBody ProductionOrderRoutingOperation productionOrderRoutingOperation) {
return R.ok(productionOrderRoutingOperationService.sortRouteItem(productionOrderRoutingOperation));
}
--
Gitblit v1.9.3