shop

whepi-web/src/main/java/com/bofeng/service/RiBaoService.java

@@ -153,6 +153,19 @@ public class RiBaoService {
         return msReport;
     }
 
+    public MsReport getRibaoWithDate(Long userCreate, String reportDate) {
+        List<MsReport> msReportList = msReportMapper.selectByReportDate(reportDate, userCreate);
+        if (CollectionUtils.isEmpty(msReportList)) {
+            return null;
+        }
+
+        MsReport msReport = msReportList.get(0);
+        String houseStr = this.getHouseStr(msReport.getHouseId());
+        msReport.setHouseIdStr(houseStr);
+
+        return msReport;
+    }
+
     //获取今天数据
     public String getHouseStr(Long houseId) {
         UptownHouse house = uptownHouseMapper.selectById(houseId);

whepi-web/src/main/java/com/bofeng/wx/controller/RiBaoController.java

@@ -49,6 +49,20 @@ public class RiBaoController {
 //    private String user_update;
 //    private String time_update;
 
+    //查询日历日报
+    @GetMapping("/riBao/getRibaoWithDate")
+    public Model<MsReport> getRibaoWithDate(@Pd(name = "userCreate") Long userCreate, @Pd(name = "reportDate") String reportDate) {
+        MsReport msReport = riBaoService.getRibaoWithDate(userCreate, reportDate);
+        return Model.newSuccess(msReport);
+    }
+
+    // 查询日历日报关联的家人列表
+    @GetMapping("/riBao/queryRibaoDetailListWithDate")
+    public Model<List<MsSuspected>> queryRibaoDetailListWithDate(@Pd(name = "reportId") Long reportId) {
+        List<MsSuspected> listSuspected = riBaoService.queryRibaoDetailList(reportId);
+        return Model.newSuccess(listSuspected);
+    }
+
 
     //查询日报
     @GetMapping("/riBao/getRibao")