fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/AppVersionController.java

@@ -0,0 +1,37 @@
+package com.management.platform.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.management.platform.entity.AppVersion;
+import com.management.platform.service.AppVersionService;
+import com.management.platform.util.HttpRespMsg;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2025-11-17
+ */
+@RestController
+@RequestMapping("/app-version")
+public class AppVersionController {
+    @Resource
+    private AppVersionService appVersionService;
+
+    @RequestMapping("/getVersion")
+    public HttpRespMsg getVersion(){
+        HttpRespMsg msg = new HttpRespMsg();
+        AppVersion appVersion = appVersionService.getOne(new QueryWrapper<AppVersion>().orderByDesc("id").last("limit 1"));
+        msg.setData(appVersion);
+        return msg;
+    }
+
+}
+

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/entity/AppVersion.java

@@ -0,0 +1,58 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2025-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class AppVersion extends Model<AppVersion> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 最新版本号
+     */
+    @TableField("version_code")
+    private Integer versionCode;
+
+    /**
+     * 更新内容
+     */
+    @TableField("update_content")
+    private String updateContent;
+
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * apk下载地址
+     */
+    @TableField("download_url")
+    private String downloadUrl;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/mapper/AppVersionMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.AppVersion;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2025-11-17
+ */
+public interface AppVersionMapper extends BaseMapper<AppVersion> {
+
+}

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/AppVersionService.java

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.AppVersion;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2025-11-17
+ */
+public interface AppVersionService extends IService<AppVersion> {
+
+}

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/AppVersionServiceImpl.java

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.AppVersion;
+import com.management.platform.mapper.AppVersionMapper;
+import com.management.platform.service.AppVersionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2025-11-17
+ */
+@Service
+public class AppVersionServiceImpl extends ServiceImpl<AppVersionMapper, AppVersion> implements AppVersionService {
+
+}

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/MealApplicationsServiceImpl.java

@@ -166,7 +166,7 @@ public class MealApplicationsServiceImpl extends ServiceImpl<MealApplicationsMap
         QueryWrapper<MealApplications> queryWrapper = new QueryWrapper<MealApplications>().eq("factory_id", factoryItem.getId()).eq("application_date", date).ne("status", 2);
         List<MealApplications> mealApplicationsList = mealApplicationsMapper.selectList(queryWrapper);
         //按用餐类型统计人数
-        List<MealTypes> mealTypesList = mealTypesMapper.selectList(new QueryWrapper<MealTypes>());
+        List<MealTypes> mealTypesList = mealTypesMapper.selectList(new QueryWrapper<MealTypes>().eq("is_active", 1));
         for (MealTypes mealTypes : mealTypesList) {
             int count = 0;
             for (MealApplications mealApplications : mealApplicationsList) {
@@ -244,6 +244,7 @@ public class MealApplicationsServiceImpl extends ServiceImpl<MealApplicationsMap
                 switch (status) {
                     case 0 :
                         mealMap.put("statusString","已报餐");
+                        break;
                     case  3:
                         mealMap.put("statusString","缺餐");
                         break;
@@ -282,6 +283,7 @@ public class MealApplicationsServiceImpl extends ServiceImpl<MealApplicationsMap
                             break;
                         case 2:
                             cancel += 1;
+                            break;
                         case  3:
                             ApplyAmount += 1;
                             overLine += 1;
@@ -331,7 +333,7 @@ public class MealApplicationsServiceImpl extends ServiceImpl<MealApplicationsMap
                 //非小计合计
                 //已申请
                 map.put("totalApplication",personList.stream().filter(p ->
-                        new Integer(0).equals(p.get("status"))).count());
+                        !new Integer(2).equals(p.get("status"))).count());
                 //已用餐
                 map.put("totalGetMeal",personList.stream().filter(p ->
                         new Integer(1).equals(p.get("status"))).count());

fhKeeper/formulahousekeeper/management-workshop/src/main/resources/mapper/AppVersionMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.AppVersionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.AppVersion">
+        <id column="id" property="id" />
+        <result column="version_code" property="versionCode" />
+        <result column="update_content" property="updateContent" />
+        <result column="update_time" property="updateTime" />
+        <result column="download_url" property="downloadUrl" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, version_code, update_content, update_time, download_url
+    </sql>
+
+</mapper>