接口调整，canntenName参数替换为canteenName

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

@@ -214,8 +214,8 @@ public class PlatGreenSmartOtherServiceImpl extends ServiceImpl<PlatGreenSmartOt
             iPlatGreenSmartSafetyService.addPlatGreenSmartSafety(appOrg, mapField);
             // 热销菜品排行
             iPlatGreenSmartRankService.addPlatGreenSmartRank(appOrg, mapField);
-            // 处理食堂能源数据
-            iPlatGreenSmartEnergyService.addEnergyData(appOrg, mapField);
+            // 处理食堂能源数据不需要了
+            // iPlatGreenSmartEnergyService.addEnergyData(appOrg, mapField);
             // 处理食堂每周菜品信息
             iPlatGreenFoodsService.addPlatGreenFoods(appOrg, mapField);
         } catch (Exception e) {
@@ -363,10 +363,10 @@ public class PlatGreenSmartOtherServiceImpl extends ServiceImpl<PlatGreenSmartOt
         PlatGreenSmartOther platGreenSmartOther = this.getPlatGreenSmartOtherByField("app_org", appOrg,fieldString);
         Map<String, Object> tempMap = new HashMap<>();
         if (StringUtils.isNull(platGreenSmartOther)) {
-            StringUtils.getMapData("每日菜谱", "dailyMenu", 0, tempMap);
+            //StringUtils.getMapData("每日菜谱", "dailyMenu", 0, tempMap);
             StringUtils.getMapData("周菜食谱", "weeklyCuisine", 0, tempMap);
         }else{
-            StringUtils.getMapData("每日菜谱", "dailyMenu", platGreenSmartOther.getDailyMenuNum(), tempMap);
+            //StringUtils.getMapData("每日菜谱", "dailyMenu", platGreenSmartOther.getDailyMenuNum(), tempMap);
             StringUtils.getMapData("周菜食谱", "weeklyCuisine", platGreenSmartOther.getWeeklyCuisineNum(), tempMap);
         }
         return tempMap;

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

@@ -200,7 +200,7 @@ public class PlatGreenSmartServiceImpl extends ServiceImpl<PlatGreenSmartMapper,
     @Transactional
     public void addPlatGreenSmart(String appOrg, Map<String, Object> mapField){
         // 食堂名称 食堂类型（自建、外包） 食堂面积 座位数量 管理人员 厨师人数 服务人员 健康证数量 许可证数量 菜品卫生 菜品口味 服务态度 餐具卫生 菜品种类 就餐体验 其它人员 服务就餐人数
-        List<String> keyList = Arrays.asList("canntenName","cannteenType","area","seats","management","chefs","service","firstHealth","firstLicence","dishHygiene","tasteDishes","attitude","tableware","typesDishes","dining","personnel","serviceDiners");
+        List<String> keyList = Arrays.asList("canteenName","cannteenType","area","seats","management","chefs","service","firstHealth","firstLicence","dishHygiene","tasteDishes","attitude","tableware","typesDishes","dining","personnel","serviceDiners");
         // 先删除所有食堂信息数据
         LambdaQueryWrapper<PlatGreenSmart> lqw = new LambdaQueryWrapper<>();
         lqw.eq(PlatGreenSmart::getAppOrg, appOrg);
@@ -262,8 +262,8 @@ public class PlatGreenSmartServiceImpl extends ServiceImpl<PlatGreenSmartMapper,
             StringUtils.getMapData("外包食堂数量", "outsourceCanteenNumber", 0, tempMap);
             StringUtils.getMapData("座位数量", "seatsNum", 0, tempMap);
             StringUtils.getMapData("食堂面积", "areaNum", 0, tempMap);
-            StringUtils.getMapData("食堂证件上传数", "licenceNum", 0, tempMap);
-            StringUtils.getMapData("健康证上传人数", "healthNum", 0, tempMap);
+            StringUtils.getMapData("许可证数量", "licenceNum", 0, tempMap);
+            StringUtils.getMapData("健康证数量", "healthNum", 0, tempMap);
             StringUtils.getMapData("服务就餐人数", "serviceDinersNum", 0, tempMap);
             StringUtils.getMapData("管理人员", "managementNum", 0, tempMap);
             StringUtils.getMapData("厨师人数", "chefsNum", 0, tempMap);
@@ -275,8 +275,8 @@ public class PlatGreenSmartServiceImpl extends ServiceImpl<PlatGreenSmartMapper,
             StringUtils.getMapData("外包食堂数量", "outsourceCanteenNumber", smartInfo.getOutsourceCanteenNumber(), tempMap);
             StringUtils.getMapData("座位数量", "seatsNum", smartInfo.getSeatsNum(), tempMap);
             StringUtils.getMapData("食堂面积", "areaNum", smartInfo.getAreaNum(), tempMap);
-            StringUtils.getMapData("食堂证件上传数", "licenceNum", smartInfo.getLicenceNum(), tempMap);
-            StringUtils.getMapData("健康证上传人数", "healthNum", smartInfo.getHealthNum(), tempMap);
+            StringUtils.getMapData("许可证数量", "licenceNum", smartInfo.getLicenceNum(), tempMap);
+            StringUtils.getMapData("健康证数量", "healthNum", smartInfo.getHealthNum(), tempMap);
             StringUtils.getMapData("服务就餐人数", "serviceDinersNum", smartInfo.getServiceDinersNum(), tempMap);
             StringUtils.getMapData("管理人员", "managementNum", smartInfo.getManagementNum(), tempMap);
             StringUtils.getMapData("厨师人数", "chefsNum", smartInfo.getChefsNum(), tempMap);