绿植食堂 员工概况 各字段录入修改

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

@@ -206,7 +206,7 @@ public class PlatEmployeeTypeServiceImpl extends ServiceImpl<PlatEmployeeTypeMap
      * 设置数据
      */
     private void setPlatEmployeeType(Map<String, Object> mapField, PlatEmployeeType platEmployeeType) {
-        List<String> fieldList = Arrays.asList("inside", "loan", "association", "property", "entryInternal", "entryToLoan", "entryAssist", "entryProperty", "visitor", "gross", "Between2030", "Between3040","Between4050","exceed50","man","women");
+        List<String> fieldList = Arrays.asList("inside", "loan", "association", "property", "entryInternal", "entryToLoan", "entryAssist", "entryProperty", "visitor", "gross", "man","women");
 
         // 员工类型
         StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 0, PlatEmployeeType::setInsideNum, Long.class);
@@ -222,15 +222,9 @@ public class PlatEmployeeTypeServiceImpl extends ServiceImpl<PlatEmployeeTypeMap
         StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 8, PlatEmployeeType::setVisitorNum, Long.class);
         StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 9, PlatEmployeeType::setGrossNum, Long.class);
 
-        // 员工年龄分布情况
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 10, PlatEmployeeType::setBetween2030Num, Long.class);
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 11, PlatEmployeeType::setBetween3040Num, Long.class);
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 12, PlatEmployeeType::setBetween4050Num, Long.class);
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 13, PlatEmployeeType::setExceed50Num, Long.class);
-
         // 员工性别情况
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 14, PlatEmployeeType::setManNum, Long.class);
-        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 15, PlatEmployeeType::setWomenNum, Long.class);
+        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 10, PlatEmployeeType::setManNum, Long.class);
+        StringUtils.setFieldValue(platEmployeeType, mapField, fieldList, 11, PlatEmployeeType::setWomenNum, Long.class);
 
     }
 

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

@@ -230,7 +230,7 @@ public class PlatGreenSmartOtherServiceImpl extends ServiceImpl<PlatGreenSmartOt
      */
     private void setPlatGreenSmartOther(Map<String, Object> mapField, PlatGreenSmartOther platGreenSmartOther) {
         //绿智食堂参评食堂情况
-        List<String> keyList = Arrays.asList("participate", "completed","breakfast","lunch","dinner","morning","noon","night","dailyMenu","weeklyCuisine","foodVoting","clearPlate","culinaryExchange","takeOutFood","selfFood","holidaySpecial","breakService","laundryService","barberService");
+        List<String> keyList = Arrays.asList("participate", "completed","breakfast","lunch","dinner","morning","noon","night","foodVoting","clearPlate","culinaryExchange","takeOutFood","selfFood","holidaySpecial","breakService","laundryService","barberService");
         StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,0, PlatGreenSmartOther::setParticipateNum,Long.class);
         StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,1, PlatGreenSmartOther::setCompletedNum,Long.class);
         StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,2, PlatGreenSmartOther::setActualDiningNum,Long.class);
@@ -239,17 +239,23 @@ public class PlatGreenSmartOtherServiceImpl extends ServiceImpl<PlatGreenSmartOt
         StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,5, PlatGreenSmartOther::setMorningNum,Long.class);
         StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,6, PlatGreenSmartOther::setNoonNum,Long.class);
         StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,7, PlatGreenSmartOther::setNightNum,Long.class);
-        StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,8, PlatGreenSmartOther::setDailyMenuNum,Long.class);
-        StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,9, PlatGreenSmartOther::setWeeklyCuisineNum,Long.class);
-        StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,10, PlatGreenSmartOther::setFoodVotingNum,Long.class);
-        StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,11, PlatGreenSmartOther::setClearPlateNum,Long.class);
-        StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,12, PlatGreenSmartOther::setCulinaryExchangeNum,Long.class);
-        StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,13, PlatGreenSmartOther::setTakeOutFoodNum,Long.class);
-        StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,14, PlatGreenSmartOther::setSelfFoodNum,Long.class);
-        StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,15, PlatGreenSmartOther::setHolidaySpecialNum,Long.class);
-        StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,16, PlatGreenSmartOther::setBreakServiceNum,Long.class);
-        StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,17, PlatGreenSmartOther::setLaundryServiceNum,Long.class);
-        StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,18, PlatGreenSmartOther::setBarberServiceNum,Long.class);
+        StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,8, PlatGreenSmartOther::setFoodVotingNum,Long.class);
+        StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,9, PlatGreenSmartOther::setClearPlateNum,Long.class);
+        StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,10, PlatGreenSmartOther::setCulinaryExchangeNum,Long.class);
+        StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,11, PlatGreenSmartOther::setTakeOutFoodNum,Long.class);
+        StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,12, PlatGreenSmartOther::setSelfFoodNum,Long.class);
+        StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,13, PlatGreenSmartOther::setHolidaySpecialNum,Long.class);
+        StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,14, PlatGreenSmartOther::setBreakServiceNum,Long.class);
+        StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,15, PlatGreenSmartOther::setLaundryServiceNum,Long.class);
+        StringUtils.setFieldValue(platGreenSmartOther,mapField,keyList,16, PlatGreenSmartOther::setBarberServiceNum,Long.class);
+        Pattern pattern = Pattern.compile("\\bname\\b", Pattern.CASE_INSENSITIVE);  // 单词边界，忽略大小写
+        Matcher matcher = pattern.matcher(mapField.get("week").toString());
+        int count = 0;
+        // 遍历匹配到的结果
+        while (matcher.find()) {
+            count++;
+        }
+        platGreenSmartOther.setWeeklyCuisineNum(Long.valueOf(count));
     }
 
     /**

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

@@ -414,7 +414,7 @@ public class PlatGreenSmartServiceImpl extends ServiceImpl<PlatGreenSmartMapper,
             queryWrapper.ne("app_org","10001");
         }
         queryWrapper.select("sum(chefs_num + service_num) as total_person_num,chefs_num,service_num,canteen_num");
-        queryWrapper.groupBy("canteen_num");
+        queryWrapper.groupBy("canteen_num", "chefs_num", "service_num");
         queryWrapper.orderByDesc("total_person_num");
         queryWrapper.last("limit "+ limit);
         List<PlatGreenSmart> smartList = this.list(queryWrapper);