服务保障中心调整---

project-zcustom/src/main/java/com/project/zcustom/controller/basics/PlatBasicsController.java → project-zcustom/src/main/java/com/project/zcustom/controller/service/basics/PlatBasicsController.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.controller.basics;
+package com.project.zcustom.controller.service.basics;
 
 import com.project.common.core.controller.BaseController;
 import com.project.common.core.domain.AjaxResult;

project-zcustom/src/main/java/com/project/zcustom/controller/employee/PlatEmployeeController.java → project-zcustom/src/main/java/com/project/zcustom/controller/service/employee/PlatEmployeeController.java

@@ -44,11 +44,11 @@ public class PlatEmployeeController extends BaseController {
         return AjaxResult.success("查询成功", platEmployeeTypeService.getChartsFlowData(appOrg));
     }
 
-    @ApiOperation("员工年龄分布情况 饼图")
-    @RequestMapping("/getAgePieData")
-    public AjaxResult getAgePieData(@RequestParam String appOrg) {
-        return AjaxResult.success("查询成功", platEmployeeTypeService.getAgePieData(appOrg));
-    }
+//    @ApiOperation("员工年龄分布情况 饼图")
+//    @RequestMapping("/getAgePieData")
+//    public AjaxResult getAgePieData(@RequestParam String appOrg) {
+//        return AjaxResult.success("查询成功", platEmployeeTypeService.getAgePieData(appOrg));
+//    }
 
     @ApiOperation("员工性别情况 柱形图")
     @RequestMapping("/getSexChartData")

project-zcustom/src/main/java/com/project/zcustom/controller/post/PlatPostStationController.java → project-zcustom/src/main/java/com/project/zcustom/controller/service/post/PlatPostStationController.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.controller.post;
+package com.project.zcustom.controller.service.post;
 
 import com.project.common.annotation.Log;
 import com.project.common.core.controller.BaseController;

project-zcustom/src/main/java/com/project/zcustom/controller/property/PlatPropertyController.java → project-zcustom/src/main/java/com/project/zcustom/controller/service/property/PlatPropertyController.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.controller.property;
+package com.project.zcustom.controller.service.property;
 
 import com.project.common.annotation.Log;
 import com.project.common.core.controller.BaseController;

project-zcustom/src/main/java/com/project/zcustom/controller/smart/PlatGreenSmartController.java → project-zcustom/src/main/java/com/project/zcustom/controller/service/smart/PlatGreenSmartController.java

@@ -1,4 +1,4 @@
-package com.project.zcustom.controller.smart;
+package com.project.zcustom.controller.service.smart;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.project.common.annotation.Log;
@@ -71,21 +71,21 @@ public class PlatGreenSmartController extends BaseController {
 
     @ApiOperation("食堂服务满意度")
     @RequestMapping("/getCanteenScoreData")
-    public AjaxResult getCanteenScoreData(@RequestParam String appOrg,@RequestParam String canteenName) {
-        return AjaxResult.success("查询成功", platGreenSmartService.getCanteenScoreData(appOrg, canteenName));
+    public AjaxResult getCanteenScoreData(@RequestParam String appOrg) {
+        return AjaxResult.success("查询成功", platGreenSmartService.getCanteenScoreData(appOrg));
     }
 
-    @ApiOperation("能耗信息")
-    @RequestMapping("/getPowerData")
-    public AjaxResult getPowerData(@RequestParam String appOrg) {
-        return AjaxResult.success("查询成功", iPlatGreenSmartEnergyService.getPowerData(appOrg));
-    }
+//    @ApiOperation("能耗信息")
+//    @RequestMapping("/getPowerData")
+//    public AjaxResult getPowerData(@RequestParam String appOrg) {
+//        return AjaxResult.success("查询成功", iPlatGreenSmartEnergyService.getPowerData(appOrg));
+//    }
 
-    @ApiOperation("热销菜品排行")
-    @RequestMapping("/getFoodRankData")
-    public AjaxResult getFoodRankData(@RequestParam String appOrg) {
-        return AjaxResult.success("查询成功", iPlatGreenSmartRankService.getRankData(appOrg));
-    }
+//    @ApiOperation("热销菜品排行")
+//    @RequestMapping("/getFoodRankData")
+//    public AjaxResult getFoodRankData(@RequestParam String appOrg) {
+//        return AjaxResult.success("查询成功", iPlatGreenSmartRankService.getRankData(appOrg));
+//    }
 
     @ApiOperation("各食堂满意度排名")
     @RequestMapping("/getCanteenDegreeData")
@@ -93,11 +93,11 @@ public class PlatGreenSmartController extends BaseController {
         return AjaxResult.success("查询成功", platGreenSmartService.getCanteenDegreeData(appOrg));
     }
 
-    @ApiOperation("各单位统计排行")
-    @RequestMapping("/getCanteenTotalRank")
-    public AjaxResult getCanteenTotalRank(@RequestParam String appOrg) {
-        return AjaxResult.success("查询成功", platGreenSmartService.getCanteenTotalRank(appOrg));
-    }
+//    @ApiOperation("各单位统计排行")
+//    @RequestMapping("/getCanteenTotalRank")
+//    public AjaxResult getCanteenTotalRank(@RequestParam String appOrg) {
+//        return AjaxResult.success("查询成功", platGreenSmartService.getCanteenTotalRank(appOrg));
+//    }
 
     @ApiOperation("绿智食堂参评食堂情况")
     @RequestMapping("/geParticipateData")

project-zcustom/src/main/java/com/project/zcustom/service/smart/IPlatGreenSmartService.java

@@ -113,10 +113,9 @@ public interface IPlatGreenSmartService extends IService<PlatGreenSmart> {
     /**
      * 食堂服务满意度
      * @param appOrg
-     * @param canteenName 食堂名称
      * @return
      */
-    public Map<String, Object> getCanteenScoreData(String appOrg,String canteenName);
+    public Map<String, Object> getCanteenScoreData(String appOrg);
 
     /**
      * 食堂服务满意度排行

project-zcustom/src/main/java/com/project/zcustom/service/smart/impl/PlatGreenSmartServiceImpl.java

@@ -292,13 +292,12 @@ public class PlatGreenSmartServiceImpl extends ServiceImpl<PlatGreenSmartMapper,
      * @return
      */
     @Override
-    public Map<String, Object> getCanteenScoreData(String appOrg,String canteenName){
+    public Map<String, Object> getCanteenScoreData(String appOrg){
 //        List<String> nameList = Arrays.asList("菜品卫生", "菜品口味", "服务态度", "餐具卫生","菜品种类","就餐体验");
         QueryWrapper<PlatGreenSmart> queryWrapper = new QueryWrapper<>();
         if(!Objects.equals(appOrg,"0000")){
             queryWrapper.eq("app_org",appOrg);
         }
-        queryWrapper.eq("canteen_num", canteenName);
         queryWrapper.last("limit 1");
         PlatGreenSmart smartInfo = this.getOne(queryWrapper);
         Map<String, Object> tempMap = new HashMap<>();