abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ryoeiken 2021-01-22 11:14:50 +08:00
commit ee16073f02
4 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);
}
}

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

@ -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);
}

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

@ -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));
}
}

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

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