xielianghe

whepi-ui/templates/home/home.ftl

@@ -61,6 +61,10 @@
         ribao_add();
         ribao_cancel();
         ribao_commit();
+
+        var msReport = ${msReport};
+        $('#ribao_safety_num').val(msReport.safetyNum);
+        ribaoInitialization(msReport.reportId);
         /*submit_back();*/
         familyClick();
 

whepi-ui/templates/home/ribao.js

@@ -163,14 +163,18 @@ $("#my-input-ribao").calendar({
       },
       type: 'GET',
       success: function (data) {
-        console.log(data);
-        if (data.data.length > 0) {
-          hasData = true;
-          data.data.forEach(function (v) {
-            helpValue1(v);
-          });
-        } else {
-
+        if(data.data==undefined){
+          $('#ribao_famliy').empty();
+        }
+        else {
+          if (data.data.length > 0) {
+            hasData = true;
+            data.data.forEach(function (v) {
+              helpValue1(v);
+            });
+          } else {
+
+          }
         }
       },
       error: function () {

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

@@ -41,13 +41,22 @@ public class HomeController {
   @Autowired
   private QzTaskReplyService qzTaskReplyService;
 
+  @Autowired
+  private MsReportService msReportService;
+
+
   @GetMapping("/home/home.html")
-  public ModelAndView home(ModelMap model) {
+  public ModelAndView home(ModelMap model)throws JsonProcessingException {
     //UserOpen userOpen = homeService.getUserOpen();
     model.put("user", new JsonWapper("{\"www\": \"er\"}"));
+    //初始化今日日报
+    Long userId=0L;
+    MsReport msReport =msReportService.getReportByDateNow(userId);
+    model.put("msReport", new JsonWapper(msReport));
     return new ModelAndView("/home/home.ftl", model);
   }
 
+
   //家庭求助
   @GetMapping("/home/home/addFimaly")
   public ModelOps family(@Pd(name = "taskTitle") String taskTitle,