执法端-统计分析

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppComprehensiveAnalysisController.java

@@ -1,9 +1,11 @@
 package com.zdxt.enforcementcode.controller.app.enforcement;
 
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import com.zdxt.enforcementcode.common.util.StringUtils;
 import com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo;
 import com.zdxt.enforcementcode.service.ComprehensiveAnalysisService;
+import org.dromara.common.core.domain.R;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.system.domain.vo.SysDeptVo;
@@ -32,9 +34,9 @@ public class AppComprehensiveAnalysisController extends BaseController {
 
     @GetMapping("/whole")
     @ResponseBody
-    public ComprehensiveAnalysisBo whole(ComprehensiveAnalysisBo comprehensiveAnalysis){
+    public R<ComprehensiveAnalysisBo> whole(ComprehensiveAnalysisBo comprehensiveAnalysis){
         if("user".equals(comprehensiveAnalysis.getSearchType())){
-            return comprehensiveAnalysisService.whole(comprehensiveAnalysis);
+            return R.ok(comprehensiveAnalysisService.whole(comprehensiveAnalysis));
         } else if ("bureauDept".equals(comprehensiveAnalysis.getSearchType())) {
             String deptId = LoginHelper.getDeptId();
             SysDeptVo sysDeptVo = sysDeptService.iterationDeptParentToBureau(deptId);
@@ -42,9 +44,9 @@ public class AppComprehensiveAnalysisController extends BaseController {
             if(StringUtils.isNotBlank(bureauDeptId)){
                 comprehensiveAnalysis.setUserId(null);
                 comprehensiveAnalysis.setBureauDeptId(bureauDeptId);
-                return comprehensiveAnalysisService.whole(comprehensiveAnalysis);
+                return R.ok(comprehensiveAnalysisService.whole(comprehensiveAnalysis));
             }
         }
-        return new ComprehensiveAnalysisBo();
+        return R.ok(new ComprehensiveAnalysisBo());
     }
 }