Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/home.ftl

@@ -39,7 +39,6 @@
 <script>
     <#include "/home/ribao.js" />
     <#include "/home/qiuzhu.js" />
-    var userid = ${user};
     (function ($) {
 
         $(function () {

whepi-ui/templates/user/home.ftl

@@ -264,7 +264,7 @@
             return false;
         }
         var unitId = $("#unitId").val();
-        var doorplate = $("#doorplate").val();
+        var doorplate = $("#doorplate").val().trim();
         if(userType == 1) {
             if (!unitId) {
                 alert("栋/单元！")
@@ -296,7 +296,7 @@
                             url: '/home/saveUser.json',
                             type: "post",
                             data: {
-                                "userId": 111,
+                                "userId": userId,
                                 "userType": $('input:radio:checked').val(),
                                 "linkman": $("#linkman").val(),
                                 "phone": $("#phone").val(),
@@ -305,7 +305,9 @@
                                 "unitId": unitId,
                                 "uptownId": uptownId,
                                 "doorplate": doorplate,
-                            },
+                            },success: function (date) {
+                                window.location.href = "/user/home.html?userId=" + userId;
+                            }
                         });
                     }
                 }
@@ -315,7 +317,7 @@
                 url: '/home/saveUser.json',
                 type: "post",
                 data: {
-                    "userId": 111,
+                    "userId": userId,
                     "userType": $('input:radio:checked').val(),
                     "linkman": $("#linkman").val(),
                     "phone": $("#phone").val(),
@@ -324,7 +326,9 @@
                     "unitId": unitId,
                     "uptownId": uptownId,
                     "doorplate": doorplate,
-                },
+                },success: function (date) {
+                    window.location.href = "/user/home.html?userId=" + userId;
+                }
             });
         }
     }

whepi-ui/templates/yeweihui/ribao.ftl

@@ -8,10 +8,10 @@
     <div class="weui-tab">
         <div class="weui-navbar">
         <div class="weui-navbar__item weui-bar__item_on">
-            小区最新填报情况(02/03)<br/>
+            <a id="mrDate"></a><br/>
             <span style="background-color: #75859f">&nbsp;&nbsp;&nbsp</span>待报&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp
             <span style="background-color: yellow">&nbsp;&nbsp;&nbsp</span>异常&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp
-            <span style="background-color: #0bb20c">&nbsp;&nbsp;&nbsp</span>异常
+            <span style="background-color: #0bb20c">&nbsp;&nbsp;&nbsp</span>已报
         </div>
         </div>
     </div>
@@ -50,11 +50,18 @@
 <script>
     (function ($) {
         $(function(){
-            var search = location.search
+            var date2 = new Date();
+            date2.setTime(date2.getTime());
+            var month = date2.getMonth()+1;
+            var day = date2.getDate();
+            $("#mrDate").text('小区最新填报情况('+month+'/'+day+')');
+            // $("#mrDate").text(month);
+            var search = location.search;
             var s;
             if(search.indexOf("?")!=-1){
                 s = search.substr(1);
             }
+            var ii =0;
         $.ajax({
             url: '/yeweihui/ribaoDy',
             type: "get",
@@ -62,11 +69,23 @@
                 str:s
             },success: function(data){
                 console.log(data.data);
+                var tr = $("<tr></tr>");
                 for (var i = 0; i < data.data.length; i++) {
-
                     var v = data.data[i];
-                        $('#btnRBmp').append('<td >'+v.doorplate+'</td>');
-
+                    if(ii%10==0 && ii !=0){
+                        tr = $("<tr></tr>");
+                    }
+                    var td;
+                    if(v.msStatus == 2){//异常
+                        td = '<td style="background-color: yellow">'+v.doorplate+'</td>';
+                    }else if(v.msStatus != 2 && v.reportId != 0 && v.msStatus != null && v.reportId !=null){//已报
+                        td = '<td style="background-color: #0bb20c">'+v.doorplate+'</td>';
+                    }else if(v.reportId == null){//待报
+                        td = '<td style="background-color: #75859f">'+v.doorplate+'</td>';
+                    }
+                    tr.append(td);
+                    $("#tableId").append(tr);
+                    ii++;
                 }
 
             }

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

@@ -4,13 +4,23 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.bofeng.entity.QzTask;
 import com.bofeng.entity.SysUptownHouse;
+import com.bofeng.entity.sysUptownUnit;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
 import java.util.List;
 
 @Mapper
 @Repository
-public interface RbMapper extends BaseMapper<SysUptownHouse> {
-    List<SysUptownHouse> selectAll();
+public interface RbMapper extends BaseMapper<sysUptownUnit> {
+
+    @Select("select a.doorplate as doorplate,c.report_id as reportId,c.ms_status as msStatus,a.time_update as time from sys_uptown_house a " +
+            "inner join sys_uptown_unit b on a.unit_id = b.unit_id " +
+            "left join ms_report c on c.house_id = a.house_id " +
+            "where b.ridgepole = #{ridgepole} and b.unit = #{unit}")
+    List<SysUptownHouse> selectDY(@Param("ridgepole") String ridgepole,@Param("unit") String unit,@Param("date") Date date);
+    // and c.time_update = #{date}
 }

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

@@ -12,18 +12,34 @@ import java.io.Serializable;
 public class SysUptownHouse implements Serializable {
     @TableId("house_id")
     private Long houseId;
-    @TableField("uptown_id")
+
+    @TableField(exist = false)
     private Long uptownId;
-    @TableField("ridgepole")
+
+    @TableField(exist = false)
     private String ridgepole;
-    @TableField("unit")
+
+    @TableField(exist = false)
     private String unit;
+
+    @TableField(exist = false)
+    private String reportId;
+
+    @TableField(exist = false)
+    private String msStatus;
+
+    @TableField(exist = false)
+    private String time;
+
     @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/entity/sysUptownUnit.java

@@ -0,0 +1,26 @@
+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;
+
+@Data
+@TableName("sys_uptown_unit")
+public class sysUptownUnit {
+    @TableId("unit_id")
+    private Long unitId;
+    @TableField("uptown_id")
+    private Long uptownId;
+    @TableField("ridgepole")
+    private String ridgepole;
+    @TableField("unit")
+    private String unit;
+    @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/MsSuspectedService.java

@@ -6,7 +6,6 @@ import com.bofeng.dao.MsReportMapper;
 import com.bofeng.dao.MsSuspectedMapper;
 import com.bofeng.entity.MsReport;
 import com.bofeng.entity.MsSuspected;
-import com.sun.org.apache.bcel.internal.generic.NEW;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -5,9 +5,11 @@ import com.bofeng.dao.QzTaskDao;
 import com.bofeng.dao.RbMapper;
 import com.bofeng.entity.QzTask;
 import com.bofeng.entity.SysUptownHouse;
+import com.bofeng.entity.sysUptownUnit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 
@@ -17,13 +19,15 @@ public class RbService {
     @Autowired
     private RbMapper rbMapper;
 
-    public List<SysUptownHouse> selectAll () {
-        List<SysUptownHouse> sysUptownHouses = rbMapper.selectList(new EntityWrapper<>());
+    public List<sysUptownUnit> selectAll () {
+        List<sysUptownUnit> 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));
+//        List<SysUptownHouse> sysUptownHouses = rbMapper.selectList(new EntityWrapper<SysUptownHouse>().eq("ridgepole",ridgepole).eq("unit",unit));
+        Date date = new Date();
+        List<SysUptownHouse> sysUptownHouses = rbMapper.selectDY(ridgepole,unit,date);
         return sysUptownHouses;
     }
 }

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

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
 
 @RestController
@@ -42,11 +43,16 @@ public class UserOpenController {
     private QzTaskService qzTaskService;
 
     @GetMapping("/user/home.html")
-    public ModelAndView home(ModelMap model) {
-        UserOpen userOpen = homeService.getUserOpen();
-        List<UserRole> list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-        model.put("user", userOpen);
-//        List<UserRole> list = userRoleMapper.getUserRoleByUserId(1224239062748065800L);
+    public ModelAndView home(ModelMap model, @RequestParam(value = "userId", required = false,defaultValue = "0") Long userId) {
+        List<UserRole> list = new ArrayList<>();
+        if (userId == 0) {
+            UserOpen userOpen = homeService.getUserOpen();
+            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+            model.put("user", userOpen);
+        } else {
+            model.put("user", userOpenMapper.selectByUserId(userId));
+            list = userRoleMapper.getUserRoleByUserId(userId);
+        }
         if (list.size() == 0) {
             return new ModelAndView("/user/home.ftl", model);
         } else if (list.size()>0) {
@@ -88,7 +94,7 @@ public class UserOpenController {
     }
 
     @PostMapping("/home/saveUser.json")
-    public ModelAndView saveUser(ModelMap model, HttpServletRequest request) {
+    public void saveUser(ModelMap model, HttpServletRequest request) {
         Long userId = Long.parseLong(request.getParameter("userId"));
         Integer userType = Integer.parseInt(request.getParameter("userType"));
         String linkman = request.getParameter("linkman");
@@ -102,17 +108,17 @@ public class UserOpenController {
             doorplate = request.getParameter("doorplate");
         }
         userOpenService.saveUserInfo(userId,userType,linkman,phone,area,uptownId,unitId,doorplate);
-        UserOpen userOpen = userOpenMapper.selectByUserId(userId);
-        model.put("user", userOpen);
-        if (userType == 1) {
-            return new ModelAndView("/home/home.ftl", model);
-        } else if (userType == 2) {
-            List<QzTask> taskList = qzTaskService.selectAll();
-            model.put("taskList", YvanUtil.toJsonPretty(taskList));
-            return new ModelAndView("/yeweihui/home.ftl", model);
-        } else {
-            return null;
-        }
+//        UserOpen userOpen = userOpenMapper.selectByUserId(userId);
+//        model.put("user", userOpen);
+//        if (userType == 1) {
+//            return new ModelAndView("redirect:/home/home.html");
+//        } else if (userType == 2) {
+//            List<QzTask> taskList = qzTaskService.selectAll();
+//            model.put("taskList", YvanUtil.toJsonPretty(taskList));
+//            return new ModelAndView("redirect:/yeweihui/home.html");
+//        } else {
+//            return null;
+//        }
 
     }
 }

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

@@ -3,6 +3,7 @@ package com.bofeng.wx.controller;
 import com.bofeng.entity.QzTask;
 import com.bofeng.entity.QzTaskReply;
 import com.bofeng.entity.SysUptownHouse;
+import com.bofeng.entity.sysUptownUnit;
 import com.bofeng.service.QzTaskReplyService;
 import com.bofeng.service.QzTaskService;
 import com.bofeng.service.RbService;
@@ -42,7 +43,7 @@ public class YeWeiHuiController {
         queryParam.put("statistics", "M");
 
         List<QzTask> taskList = qzTaskService.selectAll();
-        List<SysUptownHouse> rbList = rbService.selectAll();
+        List<sysUptownUnit> rbList = rbService.selectAll();
         model.put("taskList", YvanUtil.toJsonPretty(taskList));
         model.put("rbList", YvanUtil.toJsonPretty(rbList));