Browse Source

新增订单详情允许董事长审核查看

anderx 7 months ago
parent
commit
539a819493

+ 2 - 10
src/main/java/com/goafanti/admin/controller/AdminStatisticsController.java

@@ -19,6 +19,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 @Controller
 @RequestMapping(value = "/api/admin/statistics")
@@ -34,7 +35,6 @@ public class AdminStatisticsController extends CertifyApiController {
      * 营销首页信息
      * @param startTime  开始时间
      * @param endTime  结束时间
-     * @return
      */
     @RequestMapping(value = "/info", method = RequestMethod.GET)
     public Result info(String startTime,String endTime) {
@@ -47,7 +47,6 @@ public class AdminStatisticsController extends CertifyApiController {
 
     /**
      * 营销首页折线图
-     * @return
      */
     @RequestMapping(value = "/lists", method = RequestMethod.GET)
     public Result lists() {
@@ -61,7 +60,6 @@ public class AdminStatisticsController extends CertifyApiController {
      * 咨询师首页信息
      * @param startTime  开始时间
      * @param endTime  结束时间
-     * @return
      */
     @RequestMapping(value = "/consultant/info", method = RequestMethod.GET)
     public Result consultantInfo(String startTime,String endTime) {
@@ -73,7 +71,6 @@ public class AdminStatisticsController extends CertifyApiController {
 
     /**
      * 咨询首页折线图
-     * @return
      */
     @RequestMapping(value = "/consultant/lists", method = RequestMethod.GET)
     public Result consultantLists() {
@@ -87,7 +84,6 @@ public class AdminStatisticsController extends CertifyApiController {
      * 财务首页信息
      * @param startTime  开始时间
      * @param endTime  结束时间
-     * @return
      */
     @RequestMapping(value = "/finance/info", method = RequestMethod.GET)
     public Result financeInfo(String startTime,String endTime) {
@@ -99,7 +95,6 @@ public class AdminStatisticsController extends CertifyApiController {
 
     /**
      * 咨询首页折线图
-     * @return
      */
     @RequestMapping(value = "/finance/lists", method = RequestMethod.GET)
     public Result financeLists() {
@@ -111,7 +106,6 @@ public class AdminStatisticsController extends CertifyApiController {
 
     /**
      * 营销团队外呼统计
-     * @return
      */
     @RequestMapping(value = "/salesTeam", method = RequestMethod.GET)
     public Result salesTeam(String startTime,String endTime) {
@@ -123,12 +117,10 @@ public class AdminStatisticsController extends CertifyApiController {
 
     /**
      * 营销团队外呼统计缓存清理
-     * @return
      */
     @RequestMapping(value = "/salesTeam/clean", method = RequestMethod.GET)
     public Result salesTeamClean() {
         Result res =new Result();
-        String aid = TokenManager.getAdminId();
         res.data(adminStatisticsService.salesTeamClean());
         return res;
     }
@@ -184,7 +176,7 @@ public class AdminStatisticsController extends CertifyApiController {
     @RequestMapping(value = "/AllDataExport", method = RequestMethod.GET)
     public Result AllDataExport( HttpServletResponse response) {
         //管理员与曾妹涵账号有权限导出
-        if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.getAdminId().equals("a7661bcf-bdca-484e-baef-6f52b305aeae")){
+        if (TokenManager.hasRole(AFTConstants.SUPERADMIN)|| Objects.equals(TokenManager.getAdminId(), "a7661bcf-bdca-484e-baef-6f52b305aeae")){
             List<selectAllUserDataBo> list = adminStatisticsService.AllDataExport();
             NewExcelUtil<selectAllUserDataBo> newExcelUtil=new NewExcelUtil<>(selectAllUserDataBo.class);
             return newExcelUtil.exportExcel(list,"统计所有用户数据",response);