应急保障上传

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupport/modular/es/controller/EsDeliveryEnterpriseController.java

@@ -150,13 +150,13 @@ public class EsDeliveryEnterpriseController {
             @ApiImplicitParam(name = "file", value = "文件对象集合")
     })
     @PostMapping(value= "/emergencySupport/esDeliveryEnterprise/importByEntity", headers= "content-type= multipart/form-data", consumes= "multipart/*")
-    public Map<String,Object> importByEntity(@RequestParam(value= "file", required = true) MultipartFile file) throws IOException {
+    public CommonResult<Map<String,Object>> importByEntity(@RequestParam(value= "file", required = true) MultipartFile file) throws IOException {
 
         Map<String,Object> map = new HashMap<String,Object>();
         if(file== null){
             map.put("massage","无文件数据");
             map.put("status","500");
-            return map;
+            return CommonResult.data(map);
         }
         //获得文件名
         String fileName = file.getOriginalFilename();
@@ -164,10 +164,10 @@ public class EsDeliveryEnterpriseController {
         if (!fileName.endsWith("xls") && !fileName.endsWith("xlsx")) {
             map.put("massage","请使用正确的导入模板");
             map.put("status","500");
-            return map;
+            return CommonResult.data(map);
         }
 
-        return esDeliveryEnterpriseService.importByEntityResult(file,map);
+        return CommonResult.data(esDeliveryEnterpriseService.importByEntityResult(file,map));
 
     }
 

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupport/modular/es/controller/EsNetworkEntryController.java

@@ -150,7 +150,7 @@ public class EsNetworkEntryController {
             @ApiImplicitParam(name = "file", value = "文件对象集合")
     })
     @PostMapping(value= "/emergencySupport/esNetworkEntry/importByEntity", headers= "content-type= multipart/form-data", consumes= "multipart/*")
-    public Map<String,Object> importByEntity(@RequestParam(value= "file", required = true) MultipartFile file) throws Exception {
+    public CommonResult<Map<String,Object>> importByEntity(@RequestParam(value= "file", required = true) MultipartFile file) throws Exception {
         Map<String, Object> map = new HashMap<>();
 
         try {
@@ -158,7 +158,7 @@ public class EsNetworkEntryController {
             if (file == null) {
                 map.put("message", "无文件数据"); // Note: corrected the typo from "massage" to "message"
                 map.put("status", "500");
-                return map;
+                return CommonResult.data(map);
             }
 
             // Get the file name
@@ -168,16 +168,16 @@ public class EsNetworkEntryController {
             if (fileName == null || (!fileName.endsWith("xls") && !fileName.endsWith("xlsx"))) {
                 map.put("message", "请使用正确的导入模板"); // Note: corrected the typo from "massage" to "message"
                 map.put("status", "500");
-                return map;
+                return CommonResult.data(map);
             }
 
             // Process the file using the service
-            return esNetworkEntryService.importByEntityResult(file, map);
+            return CommonResult.data(esNetworkEntryService.importByEntityResult(file, map));
         } catch (Exception e) {
             // Handle exceptions
             map.put("message", "文件处理失败: " + e.getMessage());
             map.put("status", "500");
-            return map;
+            return CommonResult.data(map);
         }
     }
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupport/modular/es/controller/EsProcessEnterpriseController.java

@@ -167,13 +167,13 @@ public class EsProcessEnterpriseController {
             @ApiImplicitParam(name = "file", value = "文件对象集合")
     })
     @PostMapping(value= "/emergencySupport/esProcessEnterprise/importByEntity", headers= "content-type= multipart/form-data", consumes= "multipart/*")
-    public Map<String,Object> importByEntity(@RequestParam(value= "file", required = true) MultipartFile file) throws IOException {
+    public CommonResult<Map<String,Object>> importByEntity(@RequestParam(value= "file", required = true) MultipartFile file) throws IOException {
         Map<String, Object> map = new HashMap<>();
         try {
             if (file == null || file.isEmpty()) {
                 map.put("message", "无文件数据");
                 map.put("status", "500");
-                return map;
+                return CommonResult.data(map);
             }
             // 获得文件名
             String fileName = file.getOriginalFilename();
@@ -181,18 +181,18 @@ public class EsProcessEnterpriseController {
             if (!fileName.endsWith("xls") && !fileName.endsWith("xlsx")) {
                 map.put("message", "请使用正确的导入模板");
                 map.put("status", "500");
-                return map;
+                return CommonResult.data(map);
             }
 
-            return esProcessEnterpriseService.importByEntityResult(file, map);
+            return CommonResult.data(esProcessEnterpriseService.importByEntityResult(file, map));
         } catch (IOException e) {
             map.put("message", "文件处理异常: " + e.getMessage());
             map.put("status", "500");
-            return map;
+            return CommonResult.data(map);
         } catch (Exception e) {
             map.put("message", "发生异常: " + e.getMessage());
             map.put("status", "500");
-            return map;
+            return CommonResult.data(map);
         }
 
     }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/financialSupervision/modular/fsinterestsubsidysettle/service/impl/FsInterestSubsidySettleServiceImpl.java

@@ -65,7 +65,6 @@ public class FsInterestSubsidySettleServiceImpl extends ServiceImpl<FsInterestSu
 
         return fsInterestSubsidySettleList;
     }
-
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(List<FsInterestSubsidySettleAddParam> fsInterestSubsidySettleAddParamList) {