Merge remote-tracking branch 'origin/dev' into dev

ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientPatientController.java

@@ -10,6 +10,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.fantang.domain.*;
 import com.ruoyi.system.fantang.service.*;
 import com.ruoyi.system.fantang.vo.FtPatientVo;
+import com.ruoyi.system.fantang.vo.FtReportMealVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -204,4 +205,16 @@ public class ClientPatientController extends BaseController {
 
         return AjaxResult.success(list);
     }
+
+    /**
+     * 按照用餐类型统计指定日期的各菜品数量
+     * @author 陈智兴
+     * @param day:查询日期
+     * @return
+     */
+    @GetMapping("/getStatisticsFoods")
+    public AjaxResult getStatisticsFoods(@RequestParam("departId") Integer departId,  @RequestParam("date") Date day) {
+        List<FtReportMealVo> list = iFtReportMealsDaoService.getStatisticsFoods(departId, day);
+        return AjaxResult.success(list);
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtReportMealsDaoService.java

@@ -38,5 +38,7 @@ public interface IFtReportMealsDaoService extends IService<FtReportMealsDao> {
     List<FtReportMealsDao> listNutrition(FtReportMealsDao ftReportMealsDao);
 
     List<FtReportMealsDao> listAllNutrition(FtReportMealsDao ftReportMealsDao);
+
+    List<FtReportMealVo> getStatisticsFoods(Integer departId, Date day);
 }
 

ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtReportMealsDaoServiceImpl.java

@@ -134,4 +134,10 @@ public class FtReportMealsDaoServiceImpl extends ServiceImpl<FtReportMealsDaoMap
     public List<FtReportMealsDao> listAllNutrition(FtReportMealsDao ftReportMealsDao) {
         return this.baseMapper.listAllNutrition(ftReportMealsDao);
     }
+
+    @Override
+    public List<FtReportMealVo> getStatisticsFoods(Integer departId, Date day) {
+        return this.baseMapper.getStatisticsFoods(departId, DateUtil.beginOfDay(day), DateUtil.endOfDay(day));
+
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtReportMealVo.java

@@ -37,19 +37,6 @@ public class FtReportMealVo extends FtReportMealsDao {
 
     private String departCode;
 
-//    private Date createAt;
+    private Integer count;
-//
-//    private Integer type;
-//
-//    private Long patientId;
-//
-//    private String createBy;
-//
-//    private String foods;
-//
-//    private float price;
-//
-//    private Integer settlementFlag;
-//
 
 }