上报02042

whepi-ui/templates/yeweihui/home.ftl

@@ -39,7 +39,10 @@
 <script>
     <#include "/yeweihui/ribao.js" />
     <#include "/yeweihui/qiuzhu.js" />
+var statisticsOrderList =${rbList!'[]'};
 (function ($) {
+
+
     $(function(){
         $(function(){
             $('.weui-navbar__item').on('click', function () {
@@ -54,24 +57,15 @@
         });
 
     });
-
-    $.ajax({
-        url: '/home/saveUser.json',
-        type: "post",
-        data: {
-            "userId": userId,
-            "userType": userType,
-            "linkman": linkman,
-            "phone": phone,
-        },
-    });
-
+    $('#btnRB').empty();
+    for (var i = 0; i < statisticsOrderList.length; i++) {
+        var v = statisticsOrderList[i];//value="'+v.ridgepole+'&'+v.unit+'"
+        $('#btnRB').append('<button class="weui-btn weui-btn_primary" style="display: grid;" value="'+v.ridgepole+'&'+v.unit+'" onclick="ribao_init(this.value)" >'+v.ridgepole+'栋'+v.unit+'单元'+'</button>');
+    }
     <#--console.log('ssssss');-->
     <#--var tasks = ${taskList!'[]'};-->
     // console.log('ssssss', tasks);
     console.log('asdsfdgfhjghfgdf');
-
-    ribao_init();
     qiuzhu_init();
 })(jQuery);
 </script>

whepi-ui/templates/yeweihui/ribao.ftl

@@ -21,56 +21,20 @@
     <div class="weui-tab" style="height: 400px">
         <div class="weui-navbar">
             <table border="1" cellspacing="0" cellpadding="0" style="width: 100%">
-                <tbody>
-                <list list as li>
-                    <tr><#--//colspan="2"-->
-                        <td <#--rowspan="4"--> style="border-top-color: #75859f" bgcolor="greenyellow" bordercolor =“＃007eff”>101</td>
-                        <td <#--rowspan="2"--> style="border-top-color: #75859f" bordercolor =“＃007eff”>102</td>
-                        <td style="border-top-color: #75859f" ><a href="javascript:void(0);">101</a></td>
-                        <td style="border-top-color: #75859f"> 102</td>
-                        <td style="border-top-color: #75859f"> 103</td>
-                        <td style="border-top-color: #75859f"> 104</td>
-                        <td style="border-top-color: #75859f"> 201</td>
-                        <td style="border-top-color: #75859f"> 302</td>
-                        <td style="border-top-color: #75859f"> 303</td>
-                        <td style="border-top-color: #75859f"> 304</td>
-                        <td style="border-top-color: #75859f"> 201</td>
+                <tbody id="tableId">
+                    <tr id="btnRBmp"><#--//colspan="2"-->
+                        <#--<td &lt;#&ndash;rowspan="4"&ndash;&gt; style="border-top-color: #75859f" bgcolor="greenyellow" bordercolor =“＃007eff”>101</td>-->
+                        <#--<td &lt;#&ndash;rowspan="2"&ndash;&gt; style="border-top-color: #75859f" bordercolor =“＃007eff”>102</td>-->
+                        <#--<td style="border-top-color: #75859f" ><a href="javascript:void(0);">101</a></td>-->
+                        <#--<td style="border-top-color: #75859f"> 102</td>-->
+                        <#--<td style="border-top-color: #75859f"> 103</td>-->
+                        <#--<td style="border-top-color: #75859f"> 104</td>-->
+                        <#--<td style="border-top-color: #75859f"> 201</td>-->
+                        <#--<td style="border-top-color: #75859f"> 302</td>-->
+                        <#--<td style="border-top-color: #75859f"> 303</td>-->
+                        <#--<td style="border-top-color: #75859f"> 304</td>-->
+                        <#--<td style="border-top-color: #75859f"> 201</td>-->
                     </tr>
-                    <tr>
-                        <td style="border-top-color: #75859f"> 201</td>
-                        <td style="border-top-color: #75859f"> 302</td>
-                        <td style="border-top-color: #75859f"> 303</td>
-                        <td style="border-top-color: #75859f"> 304</td>
-                        <td style="border-top-color: #75859f"> 201</td>
-                        <td style="border-top-color: #75859f"> 302</td>
-                        <td style="border-top-color: #75859f"> 303</td>
-                        <td style="border-top-color: #75859f"> 304</td>
-                        <td style="border-top-color: #75859f"> 201</td
-                    </tr>
-                    <tr>
-                        <td <#--rowspan="2" -->style="border-top-color: #75859f"> 202</td>
-                        <td style="border-top-color: #75859f"> 101</td>
-                        <td style="border-top-color: #75859f"> 102</td>
-                        <td style="border-top-color: #75859f"> 103</td>
-                        <td style="border-top-color: #75859f"> 104</td>
-                        <td style="border-top-color: #75859f"> 104</td>
-                        <td style="border-top-color: #75859f"> 304</td>
-                        <td style="border-top-color: #75859f"> 201</td>
-                        <td style="border-top-color: #75859f"> 302</td>
-                        <td style="border-top-color: #75859f"> 303</td>
-                    </tr>
-                    <tr>
-                        <td style="border-top-color: #75859f"> 101</td>
-                        <td style="border-top-color: #75859f"> 102</td>
-                        <td style="border-top-color: #75859f"> 103</td>
-                        <td style="border-top-color: #75859f"> 104</td>
-                        <td style="border-top-color: #75859f"> 104</td>
-                        <td style="border-top-color: #75859f"> 304</td>
-                        <td style="border-top-color: #75859f"> 201</td>
-                        <td style="border-top-color: #75859f"> 302</td>
-                        <td style="border-top-color: #75859f"> 303</td>
-                    </tr>
-                </list>
                 </tbody>
             </table>
         </div>
@@ -84,6 +48,32 @@
 </div>
 <#include "/home/frag.foot.ftl" />
 <script>
+    (function ($) {
+        $(function(){
+            var search = location.search
+            var s;
+            if(search.indexOf("?")!=-1){
+                s = search.substr(1);
+            }
+        $.ajax({
+            url: '/yeweihui/ribaoDy',
+            type: "get",
+            data: {
+                str:s
+            },success: function(data){
+                console.log(data.data);
+                for (var i = 0; i < data.data.length; i++) {
+
+                    var v = data.data[i];
+                        $('#btnRBmp').append('<td>'+v.doorplate+'</td>');
+
+                }
+
+            }
+        });
+        });
+    })(jQuery);
+
     $('#return').on('click', function () {
         window.location.href = "/yeweihui/home.html#tab2"
         // alert("日报");

whepi-ui/templates/yeweihui/ribao.js

@@ -1,5 +1,6 @@
-function ribao_init() {
+function ribao_init(tt) {
   $('#btnRB').on('click', function () {
-      window.location.href = "/yeweihui/ribao.html"
+      console.log(tt);
+      window.location.href = "/yeweihui/ribao.html?"+tt
   });
 }

whepi-ui/templates/yeweihui/ribaoDy.ftl

@@ -5,36 +5,22 @@
         <h1 class="demos-title">每日上报</h1>
     </header>
 
-    <div class="weui-btn-area"  style="display: grid;">
-        <section style="display: grid;">
-            <a id="btnRB" class="weui-btn weui-btn_primary" >1栋6单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋5单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋5单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋5单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
-            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋9单元</a>
-        </section>
+       <div id="btnRB" style="display: grid;" class="weui-btn-area">
+          <#--<section id="btnRB" style="display: grid;">-->
+            <#--<c:forEach items="${rbList}" var="rb">-->
+            <#--<a id="btnRB" class="weui-btn weui-btn_primary" >${rb.ridgepole}栋${rb.unit}单元</a>-->
+            <#--</c:forEach>-->
+            <#--<#list rbList as rb>-->
+            <#--<li id="btnRB" class="weui-btn weui-btn_primary" >${rb.ridgepole}栋${rb.unit}单元</li>-->
+            <#--</#list>-->
+            <#--<a id="btnRB" class="weui-btn weui-btn_primary" >1栋1单元</a>-->
+           <#--</section>-->
+           <br/>
+           <br/>
+       </div>
+           <br/>
+           <br/>
 
-    </div>
 
 </div>
 

whepi-web/src/main/java/com/bofeng/dao/RbMapper.java

@@ -0,0 +1,16 @@
+package com.bofeng.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.bofeng.entity.QzTask;
+import com.bofeng.entity.SysUptownHouse;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface RbMapper extends BaseMapper<SysUptownHouse> {
+    List<SysUptownHouse> selectAll();
+}

whepi-web/src/main/java/com/bofeng/entity/SysUptownHouse.java

@@ -0,0 +1,37 @@
+package com.bofeng.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+import org.joda.time.DateTime;
+
+import java.io.Serializable;
+@Data
+@TableName("sys_uptown_house")
+public class SysUptownHouse implements Serializable {
+    @TableId("house_id")
+    private Long houseId;
+    @TableField("uptown_id")
+    private Long uptownId;
+    @TableField("ridgepole")
+    private String ridgepole;
+    @TableField("unit")
+    private String unit;
+    @TableField("doorplate")
+    private String doorplate;
+    @TableField("status")
+    private int status;
+    @TableField("time_create")
+    private DateTime timeCreate;
+    @TableField("time_update")
+    private DateTime timeUpdate;
+
+
+
+
+
+
+
+
+}

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

@@ -0,0 +1,29 @@
+package com.bofeng.service;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.bofeng.dao.QzTaskDao;
+import com.bofeng.dao.RbMapper;
+import com.bofeng.entity.QzTask;
+import com.bofeng.entity.SysUptownHouse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+public class RbService {
+
+    @Autowired
+    private RbMapper rbMapper;
+
+    public List<SysUptownHouse> selectAll () {
+        List<SysUptownHouse> sysUptownHouses = rbMapper.selectList(new EntityWrapper<>());
+        return sysUptownHouses;
+    }
+
+    public List<SysUptownHouse> selectXq (String ridgepole,String unit) {
+        List<SysUptownHouse> sysUptownHouses = rbMapper.selectList(new EntityWrapper<SysUptownHouse>().eq("ridgepole",ridgepole).eq("unit",unit));
+        return sysUptownHouses;
+    }
+}

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

@@ -1,8 +1,11 @@
 package com.bofeng.wx.controller;
 
 import com.bofeng.entity.QzTask;
+import com.bofeng.entity.SysUptownHouse;
 import com.bofeng.service.QzTaskService;
+import com.bofeng.service.RbService;
 import com.google.common.collect.Maps;
+import com.yvan.Model;
 import com.yvan.platform.YvanUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
@@ -18,6 +21,8 @@ public class YeWeiHuiController {
 
     @Autowired
     private QzTaskService qzTaskService;
+    @Autowired
+    private RbService rbService;
 
     @GetMapping("/yeweihui/home.html")
     public ModelAndView yeweihui(ModelMap model) {
@@ -27,8 +32,9 @@ public class YeWeiHuiController {
         queryParam.put("statistics", "M");
 
         List<QzTask> taskList = qzTaskService.selectAll();
-
+        List<SysUptownHouse> rbList = rbService.selectAll();
         model.put("taskList", YvanUtil.toJsonPretty(taskList));
+        model.put("rbList", YvanUtil.toJsonPretty(rbList));
 
         return new ModelAndView("/yeweihui/home.ftl", model);
     }
@@ -36,10 +42,6 @@ public class YeWeiHuiController {
     @GetMapping("/yeweihui/ribao.html")
     public ModelAndView yeweihuiRibao(ModelMap model) {
 
-        Map<String, Object> queryParam = Maps.newLinkedHashMap();
-        queryParam.put("userId", "12345677");
-        queryParam.put("statistics", "M");
-
         List<QzTask> taskList = qzTaskService.selectAll();
 
         model.put("taskList", YvanUtil.toJsonPretty(taskList));
@@ -47,17 +49,11 @@ public class YeWeiHuiController {
         return new ModelAndView("/yeweihui/ribao.ftl", model);
     }
 
-    @GetMapping("/yeweihui/ribaoDy.html")
-    public ModelAndView yeweihuiRibaoDy(ModelMap model) {
+    @GetMapping("/yeweihui/ribaoDy")
+    public Model<List<SysUptownHouse>> yeweihuiRibaoDy(String str) {
+        String[] split = str.split("&");
+        List<SysUptownHouse> rbList = rbService.selectXq(split[0],split[1]);
 
-        Map<String, Object> queryParam = Maps.newLinkedHashMap();
-        queryParam.put("userId", "12345677");
-        queryParam.put("statistics", "M");
-
-        List<QzTask> taskList = qzTaskService.selectAll();
-
-        model.put("taskList", YvanUtil.toJsonPretty(taskList));
-
-        return new ModelAndView("/yeweihui/ribao.ftl", model);
+        return Model.newSuccess(rbList);
     }
 }