wangming 10 місяців тому
батько
коміт
17cc1eb3bf

+ 2 - 1
business-common/src/main/java/com/rongwei/bscommon/sys/service/LuckysheetService.java

@@ -1,5 +1,6 @@
 package com.rongwei.bscommon.sys.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.rongwei.bsentity.domain.LuckysheetDo;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.dto.luckysheet.UpdateFilterSelectRequest;
@@ -28,7 +29,7 @@ public interface LuckysheetService extends IService<LuckysheetDo> {
      *
      * @param req
      */
-    void updateDataVerification(UpdateDataVerificationRequest req);
+    JSONObject updateDataVerification(UpdateDataVerificationRequest req);
 
     /**
      * 修改筛选

+ 3 - 1
business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/LuckysheetServiceImpl.java

@@ -74,7 +74,7 @@ public class LuckysheetServiceImpl extends ServiceImpl<LuckysheetDao, Luckysheet
      * @param req
      */
     @Override
-    public void updateDataVerification(UpdateDataVerificationRequest req) {
+    public JSONObject updateDataVerification(UpdateDataVerificationRequest req) {
 
         //项目相关信息
         ZhcxProjectManageRectifyBatchDo batchDo = projectManageRectifyBatchService.getById(req.getBatchId());//项目信息
@@ -94,6 +94,8 @@ public class LuckysheetServiceImpl extends ServiceImpl<LuckysheetDao, Luckysheet
                 .andWhereObj(whereObj)
                 .build();
         luckySheetService.updateJsonData(updateReq);
+
+        return dropdownJson;
     }
 
     /**

+ 3 - 2
business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxProjectManageController.java

@@ -1,6 +1,7 @@
 package com.rongwei.bsserver.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.rongwei.bscommon.sys.service.LuckysheetService;
 import com.rongwei.bscommon.sys.service.ZhcxProjectManageRectifyBatchService;
 import com.rongwei.bscommon.sys.service.ZhcxProjectManageService;
@@ -106,8 +107,8 @@ public class ZhcxProjectManageController {
     @PostMapping("/updateDataVerification")
     @ApiOperation("更新excel下拉框")
     public R updateDataVerification(@RequestBody UpdateDataVerificationRequest req) {
-        luckysheetService.updateDataVerification(req);
-        return R.ok();
+        final JSONObject verifyData = luckysheetService.updateDataVerification(req);
+        return R.ok(verifyData);
     }
 
     /**