yangbq il y a 1 mois
Parent
commit
cb9555d74d

+ 5 - 0
src/main/java/com/project/zcustom/controller/service/PlatEmployeeController.java

@@ -39,6 +39,11 @@ public class PlatEmployeeController extends BaseController {
     }
 
 
+    /**
+     * 近一周人流量统计
+     * @param appOrg
+     * @return
+     */
     @RequestMapping("/getPastWeekFlowData" )
     public AjaxResult getPastWeekFlowData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platEmployeeTypeService.getChartsFlowData(appOrg));

+ 5 - 0
src/main/java/com/project/zcustom/controller/service/PlatGreenSmartController.java

@@ -98,6 +98,11 @@ public class PlatGreenSmartController extends BaseController {
         return AjaxResult.success("查询成功", platGreenSmartService.getCanteenStaff(appOrg));
     }
 
+    /**
+     * 食堂满意度排名
+     * @param appOrg
+     * @return
+     */
     @RequestMapping("/getCanteenDegreeData")
     public AjaxResult getCanteenDegreeData(@RequestParam String appOrg) {
         return AjaxResult.success("查询成功", platGreenSmartService.getCanteenDegreeData(appOrg));

+ 1 - 1
src/main/java/com/project/zcustom/service/service/employee/impl/PlatEmployeeTypeServiceImpl.java

@@ -286,7 +286,7 @@ public class PlatEmployeeTypeServiceImpl extends ServiceImpl<PlatEmployeeTypeMap
      */
     @Override
     public Map<String, Object> getChartsFlowData(String appOrg) {
-        List<String> nameList = Arrays.asList("内部人员", "借调人员", "外协", "物业","访客");
+        List<String> nameList = Arrays.asList("内部人员", "借调人员", "外协人员", "物业人员","访客");
         // 获取7天前的日期
         List<String> dateList = DateUtils.generateDateList(7);
         List<String> colorList = Arrays.asList("#0084ff", "#ffd296", "#7565ef", "#00ffff","#ffcd3e");

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

@@ -385,6 +385,14 @@ public class PlatGreenSmartServiceImpl extends ServiceImpl<PlatGreenSmartMapper,
         }
         List<PlatGreenSmart> smartInfo = this.list(queryWrapper);
         List<Map<String, Object>> list = new ArrayList<>();
+        if (smartInfo.isEmpty()) {
+            Map<String, Object> tempMap = new HashMap<>();
+            tempMap.put("canteenName", "");
+            tempMap.put("service", 0);
+            tempMap.put("chefs", 0);
+            list.add(tempMap);
+            return list;
+        }
         for (PlatGreenSmart it : smartInfo){
             Map<String, Object> tempMap = new HashMap<>();
             if (StringUtils.isNull(it)) {