FengChaoYu 9 ヶ月 前
コミット
436579ed61

+ 7 - 7
mall-server-api/src/main/java/com/gree/mall/manager/controller/settle/repair/DailyImportSummaryController.java

@@ -124,7 +124,7 @@ public class DailyImportSummaryController {
     @PostMapping("/repair/item/delete")
     @ApiOperation(value = "结算数据导入明细-删除/批量删除")
     public ResponseHelper repairItemDelete(
-            @ApiParam(required = true, value = "id") @RequestParam List<Integer> ids
+            @ApiParam(required = true, value = "id") @RequestParam List<String> ids
     ) {
         dailyImportSummaryLogic.repairItemDelete(ids);
         return ResponseHelper.success();
@@ -133,7 +133,7 @@ public class DailyImportSummaryController {
     @PostMapping("/repair/item/wait")
     @ApiOperation(value = "结算数据导入明细-暂不结算/批量暂结算/不结算")
     public ResponseHelper batchWaitSummary(
-            @ApiParam(required = true, value = "id") @RequestParam List<Integer> ids
+            @ApiParam(required = true, value = "id") @RequestParam List<String> ids
     ) {
         dailyImportSummaryLogic.batchWaitSummary(ids);
         return ResponseHelper.success();
@@ -142,7 +142,7 @@ public class DailyImportSummaryController {
     @PostMapping("/repair/item/resummary")
     @ApiOperation(value = "结算数据导入明细-恢复结算(批量)")
     public ResponseHelper batchSummary(
-            @ApiParam(required = true, value = "id") @RequestParam List<Integer> ids
+            @ApiParam(required = true, value = "id") @RequestParam List<String> ids
     ) {
         dailyImportSummaryLogic.batchSummary(ids);
         return ResponseHelper.success();
@@ -181,7 +181,7 @@ public class DailyImportSummaryController {
     @PostMapping("/reduce/batchDo")
     @ApiOperation(value = "增减费用明细-批量执行")
     public ResponseHelper reduceBatchDo(
-            @ApiParam(required = true, value = "id") @RequestParam List<Integer> ids
+            @ApiParam(required = true, value = "id") @RequestParam List<String> ids
     ) {
         dailyImportSummaryLogic.reduceBatchDo(ids);
         return ResponseHelper.success();
@@ -190,7 +190,7 @@ public class DailyImportSummaryController {
     @PostMapping("/reduce/batchDel")
     @ApiOperation(value = "增减费用明细-删除")
     public ResponseHelper reduceBatchDel(
-            @ApiParam(required = true, value = "id") @RequestParam List<Integer> ids
+            @ApiParam(required = true, value = "id") @RequestParam List<String> ids
     ) {
         dailyImportSummaryLogic.reduceBatchDel(ids);
         return ResponseHelper.success();
@@ -299,7 +299,7 @@ public class DailyImportSummaryController {
     @PostMapping("/reduce/item/delete")
     @ApiOperation(value = "需扣回工单费用详情-删除")
     public ResponseHelper reduceItemDelete(
-            @ApiParam(required = true, value = "ids") @RequestParam List<Integer> ids
+            @ApiParam(required = true, value = "ids") @RequestParam List<String> ids
     ) {
         dailyImportSummaryLogic.reduceItemDelete(ids);
         return ResponseHelper.success();
@@ -308,7 +308,7 @@ public class DailyImportSummaryController {
     @PostMapping("/reduce/item/do")
     @ApiOperation(value = "需扣回工单费用详情-执行扣回")
     public ResponseHelper reduceItemDo(
-            @ApiParam(required = true, value = "ids") @RequestParam List<Integer> ids
+            @ApiParam(required = true, value = "ids") @RequestParam List<String> ids
     ) {
         dailyImportSummaryLogic.reduceItemDo(ids);
         return ResponseHelper.success();

+ 9 - 8
mall-server-api/src/main/java/com/gree/mall/manager/logic/settle/repair/DailyImportSummaryLogic.java

@@ -693,9 +693,10 @@ public class DailyImportSummaryLogic {
 
     /**
      * 删除结算导入明细
+     * @param ids
      */
     @Transactional
-    public void repairItemDelete(List<Integer> ids) {
+    public void repairItemDelete(List<String> ids) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         if (adminUser.getType() == 2) {
@@ -718,7 +719,7 @@ public class DailyImportSummaryLogic {
                 .remove();
     }
 
-    public void batchWaitSummary(List<Integer> ids) {
+    public void batchWaitSummary(List<String> ids) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         if (adminUser.getType() == 2) {
@@ -732,7 +733,7 @@ public class DailyImportSummaryLogic {
                 .update();
     }
 
-    public void batchSummary(List<Integer> ids) {
+    public void batchSummary(List<String> ids) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         if (adminUser.getType() == 2) {
@@ -874,7 +875,7 @@ public class DailyImportSummaryLogic {
         bean.insert();
     }
 
-    public void reduceBatchDo(List<Integer> ids) {
+    public void reduceBatchDo(List<String> ids) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         if (adminUser.getType() == 2) {
@@ -901,7 +902,7 @@ public class DailyImportSummaryLogic {
     }
 
     @Transactional
-    public void reduceBatchDel(List<Integer> ids) {
+    public void reduceBatchDel(List<String> ids) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         if (adminUser.getType() == 2) {
@@ -1042,7 +1043,7 @@ public class DailyImportSummaryLogic {
     }
 
     @Transactional
-    public void reduceItemDelete(List<Integer> ids) {
+    public void reduceItemDelete(List<String> ids) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         if (adminUser.getType() == 2) {
@@ -1087,7 +1088,7 @@ public class DailyImportSummaryLogic {
     }
 
     @Transactional
-    public void summaryReduce(List<SettleDailyReduceCost> reduceList, String opName, String importBatchNo, List<Integer> ids, AdminUserCom adminUser) {
+    public void summaryReduce(List<SettleDailyReduceCost> reduceList, String opName, String importBatchNo, List<String> ids, AdminUserCom adminUser) {
         String doBatchNo = commonLogic.generateNo("ZX", "dailyDoBatch", 13);
         List<SettleDailyIssueSummaryRecord> records = new ArrayList<>();
 //        List<String> serviceNumberList = new ArrayList<>();
@@ -1160,7 +1161,7 @@ public class DailyImportSummaryLogic {
     }
 
     @Transactional
-    public void reduceItemDo(List<Integer> ids) {
+    public void reduceItemDo(List<String> ids) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         if (adminUser.getType() == 2) {