业委会求助合并代码修改

whepi-ui/templates/yeweihui/home.ftl

@@ -37,10 +37,13 @@
 
 <#include "/home/frag.foot.ftl" />
 <script>
-    <#include "/yeweihui/ribao.js" />
-    <#include "/yeweihui/qiuzhu.js" />
-(function ($) {
+<#include "/yeweihui/ribao.js" />
+<#include "/yeweihui/qiuzhu.js" />
+
+var taskList = ${taskList!'[]'};
+var statisticsOrderList =${rbList!'[]'};
 
+(function ($) {
 
     $(function(){
         $('.weui-navbar__item').on('click', function () {
@@ -62,7 +65,7 @@
     <#--console.log('ssssss');-->
     <#--var tasks = ${taskList!'[]'};-->
     // console.log('ssssss', tasks);
-    console.log('asdsfdgfhjghfgdf');
+    // console.log('asdsfdgfhjghfgdf');
 
     ribao_init();
     qiuzhu_init();

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

@@ -1,12 +1,22 @@
 package com.bofeng.wx.controller;
 
 import com.bofeng.entity.QzTask;
+import com.bofeng.entity.QzTaskReply;
+import com.bofeng.entity.SysUptownHouse;
+import com.bofeng.service.QzTaskReplyService;
 import com.bofeng.service.QzTaskService;
+import com.bofeng.service.RbService;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.collect.Maps;
+import com.yvan.Model;
+import com.yvan.ModelOps;
+import com.yvan.mvc.Pd;
+import com.yvan.platform.JsonWapper;
 import com.yvan.platform.YvanUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;