Merge remote-tracking branch 'origin/master'

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

whepi-ui/templates/home/home.ftl

@@ -62,9 +62,9 @@
         ribao_cancel();
         ribao_commit();
 
-        var msReport = ${msReport};
-        $('#ribao_safety_num').val(msReport.safetyNum);
-        ribaoInitialization(msReport.reportId);
+        <#--var msReport = ${msReport};-->
+        <#--$('#ribao_safety_num').val(msReport.safetyNum);-->
+        <#--ribaoInitialization(msReport.reportId);-->
         /*submit_back();*/
         familyClick();
 

whepi-ui/templates/home/qiuzhu.ftl

@@ -121,7 +121,7 @@
                                 <label class="weui-cell weui-cell_active weui-check__label" for="qzf2">
                                     <div class="weui-cell__hd">
                                         <input type="checkbox" name="checkbox2" class="weui-check" id="qzf2"
-                                               value="业委会">
+                                               value="A" checked="checked">
                                         <i class="weui-icon-checked"></i>
                                     </div>
                                     <div class="weui-cell__bd">
@@ -191,6 +191,9 @@
                             <div class="weui-btn-area">
                                 <a class="weui-btn weui-btn_primary" onclick="HomeStatus();" id="isHiddenStyle12"
                                    style="display: none">完成</a>
+                                <br>
+                                <br>
+                                <br>
                             </div>
                         </div>
                     </div>
@@ -408,7 +411,7 @@
         /*展示*/
         $('#play')[0].style.display = '';
         $('#Qzinput').val("")
-        $("#qzf2").removeAttr('checked', false)
+       // $("#qzf2").removeAttr('checked', false)
         $('#remarks').val("")
     }
 

whepi-ui/templates/user/changeRole.ftl

@@ -0,0 +1,65 @@
+<#assign title="选择角色"/>
+<#include "/home/frag.head.ftl" />
+
+<div class="weui-tab">
+    <div class="weui-tab__bd">
+        <input id="userId" type="text" hidden="hidden" value=${user_id!}/>
+            <div class="weui-tab__bd-item weui-tab__bd-item--active">
+                <div class="page__bd">
+                    <header class="user-header">
+                        <br/>
+                        <br/>
+                        <br/>
+                        <br/>
+                        <h1 class="user-title">家园抗击疫情公共服务平台</h1>
+                        <br/>
+                        <h1 class="user-title"><#if user ??>${user.nickName!''}</#if>登陆</h1>
+                        <br/>
+                        <br/>
+                        <br/>
+                        <br/>
+                    </header>
+                    <div class="weui-form" id="fromMsg">
+                        <div class="weui-cells weui-cells_checkbox">
+                            <label class="weui-cell weui-cell_active weui-check__label" for="s11">
+                                <div class="weui-cell__hd">
+                                    <input type="radio" name="radio" value="1" class="weui-check" id="s11">
+                                    <i class="weui-icon-checked"></i>
+                                </div>
+                                <div class="weui-cell__bd">
+                                    <p>家庭用户</p>
+                                </div>
+                            </label>
+                            <label class="weui-cell weui-cell_active weui-check__label" for="s12">
+                                <div class="weui-cell__hd">
+                                    <input type="radio" name="radio" value="2" class="weui-check" id="s12">
+                                    <i class="weui-icon-checked"></i>
+                                </div>
+                                <div class="weui-cell__bd">
+                                    <p>业委会人员</p>
+                                </div>
+                            </label>
+                        </div>
+                        <br/>
+                        <div class="weui-form__opr-area">
+                            <a class="weui-btn weui-btn_primary" href="javascript:;" onclick="login();"
+                               id="login">登陆</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+    </div>
+</div>
+</div>
+</body>
+<#include "/home/frag.foot.ftl" />
+<script>
+    function login() {
+        var userType = $('input:radio:checked').val();
+        if (!userType) {
+            alert("请选择用户角色！")
+            return false;
+        }
+        window.location.href = "/user/homeIndex.html?userId=" + $("#userId").val() + "&userType=" + userType;
+    }
+</script>

whepi-ui/templates/user/home.ftl

@@ -266,72 +266,50 @@
         }
         var unitId = $("#unitId").val();
         var doorplate = $("#doorplate").val().trim();
-        if(userType == 1) {
-            if (!unitId) {
-                alert("栋/单元！")
-                return false;
-            }
-            if (!doorplate) {
-                alert("请选择门牌信息！")
-                return false;
-            }
+        if (!unitId) {
+            alert("栋/单元！")
+            return false;
+        }
+        if (!doorplate) {
+            alert("请选择门牌信息！")
+            return false;
         }
         console.log(city)
         console.log(area)
         console.log(uptownId)
         console.log(unitId)
         console.log(doorplate)
-        if (userType == 1) {
-            $.ajax({
-                url: '/home/checkHouseId.json',
-                type: "post",
-                data: {
-                    "unitId": unitId,
-                    "doorplate": doorplate,
-                },success: function (data) {
-                    if (!data.success) {
-                        alert(data.msg);
-                        return false;
-                    } else {
-                        $.ajax({
-                            url: '/home/saveUser.json',
-                            type: "post",
-                            data: {
-                                "userId": userId,
-                                "userType": $('input:radio:checked').val(),
-                                "linkman": $("#linkman").val(),
-                                "phone": $("#phone").val(),
-                                "city": city,
-                                "area": area,
-                                "unitId": unitId,
-                                "uptownId": uptownId,
-                                "doorplate": doorplate,
-                            },success: function (date) {
-                                window.location.href = "/user/home.html?userId=" + userId;
-                            }
-                        });
-                    }
-                }
-            });
-        } else {
-            $.ajax({
-                url: '/home/saveUser.json',
-                type: "post",
-                data: {
-                    "userId": userId,
-                    "userType": $('input:radio:checked').val(),
-                    "linkman": $("#linkman").val(),
-                    "phone": $("#phone").val(),
-                    "city": city,
-                    "area": area,
-                    "unitId": unitId,
-                    "uptownId": uptownId,
-                    "doorplate": doorplate,
-                },success: function (date) {
-                    window.location.href = "/user/home.html?userId=" + userId;
+        $.ajax({
+            url: '/home/checkHouseId.json',
+            type: "post",
+            data: {
+                "unitId": unitId,
+                "doorplate": doorplate,
+            },success: function (data) {
+                if (!data.success) {
+                    alert(data.msg);
+                    return false;
+                } else {
+                    $.ajax({
+                        url: '/home/saveUser.json',
+                        type: "post",
+                        data: {
+                            "userId": userId,
+                            "userType": $('input:radio:checked').val(),
+                            "linkman": $("#linkman").val(),
+                            "phone": $("#phone").val(),
+                            "city": city,
+                            "area": area,
+                            "unitId": unitId,
+                            "uptownId": uptownId,
+                            "doorplate": doorplate,
+                        },success: function (date) {
+                            window.location.href = "/user/home.html?userId=" + userId + "&userType=" + $('input:radio:checked').val();
+                        }
+                    });
                 }
-            });
-        }
+            }
+        });
     }
 
     function goOn() {
@@ -367,10 +345,6 @@
         console.log(userType)
         console.log(linkman)
         console.log(phone)
-        if (userType == 2) {
-            $("#unitMsg").hide();
-            $("#doorplateMsg").hide();
-        }
     }
 
     function back() {

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

@@ -51,7 +51,7 @@ public class QzTaskService {
     qzTak.setTimeCreate(new DateTime());
     qzTak.setUserUpdate(userId);
     qzTak.setTimeUpdate(new DateTime());
-    return 1;
+    return qzTaskDao.insert(qzTak);
   }
 
   public List<QzTask> queryQzTaskByStatus(Integer taskStatus) {

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

@@ -62,28 +62,27 @@ public class UserOpenService {
         UserRole userRole = new UserRole();
         userRole.setUrId(IdWorker.getId());
         userRole.setUserId(userId);
-        userRole.setRoleId(userType);
+        userRole.setRoleId(1);
         userRole.setUserCreate(userId);
         userRole.setUserUpdate(userId);
-        if (userType == 1) {
-            UptownHouse uptownHouse = new UptownHouse();
-            uptownHouse.setHouseId(IdWorker.getId());
-            uptownHouse.setUnitId(unitId);
-            uptownHouse.setDoorplate(doorplate);
-            uptownHouse.setStatus(1);
-            uptownHouseMapper.insert(uptownHouse);
-            UptownHome uptownHome = new UptownHome();
-            uptownHome.setHouseId(uptownHouse.getHouseId());
-            uptownHome.setLinkman(linkman);
-            uptownHome.setPhone(phone);
-            uptownHome.setYoung(0);
-            uptownHome.setMiddle(0);
-            uptownHome.setOld(0);
-            uptownHome.setRemark("");
-            uptownHome.setStatus(1);
-            uptownHomeMapper.insert(uptownHome);
-            userRole.setPropertyId(uptownHome.getHouseId());
-        } else if (userType == 2) {
+        UptownHouse uptownHouse = new UptownHouse();
+        uptownHouse.setHouseId(IdWorker.getId());
+        uptownHouse.setUnitId(unitId);
+        uptownHouse.setDoorplate(doorplate);
+        uptownHouse.setStatus(1);
+        uptownHouseMapper.insert(uptownHouse);
+        UptownHome uptownHome = new UptownHome();
+        uptownHome.setHouseId(uptownHouse.getHouseId());
+        uptownHome.setLinkman(linkman);
+        uptownHome.setPhone(phone);
+        uptownHome.setYoung(0);
+        uptownHome.setMiddle(0);
+        uptownHome.setOld(0);
+        uptownHome.setRemark("");
+        uptownHome.setStatus(1);
+        uptownHomeMapper.insert(uptownHome);
+        userRole.setPropertyId(uptownHome.getHouseId());
+        if (userType == 2) {
             Owner owner = new Owner();
             owner.setOwnerId(IdWorker.getId());
             owner.setUptownId(uptownId);
@@ -92,7 +91,14 @@ public class UserOpenService {
             owner.setUserCreate(userId);
             owner.setUserUpdate(userId);
             ownerMapper.insert(owner);
-            userRole.setPropertyId(owner.getOwnerId());
+            UserRole userRole1 = new UserRole();
+            userRole1.setUrId(IdWorker.getId());
+            userRole1.setUserId(userId);
+            userRole1.setRoleId(userType);
+            userRole1.setUserCreate(userId);
+            userRole1.setUserUpdate(userId);
+            userRole1.setPropertyId(owner.getOwnerId());
+            userRoleMapper.insert(userRole1);
         }
         userRoleMapper.insert(userRole);
     }

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

@@ -46,31 +46,52 @@ public class UserOpenController {
     private MsReportService msReportService;
 
     @GetMapping("/user/home.html")
-    public ModelAndView home(ModelMap model, @RequestParam(value = "userId", required = false,defaultValue = "0") Long userId) throws JsonProcessingException {
+    public ModelAndView home(ModelMap model, @RequestParam(value = "userId", required = false,defaultValue = "0") Long userId,
+                             @RequestParam(value = "userType", required = false,defaultValue = "0") Integer userType) throws JsonProcessingException {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
             UserOpen userOpen = homeService.getUserOpen();
             list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-//            list = userRoleMapper.getUserRoleByUserId(1224706869998772226L);
-//            UserOpen userOpen = userOpenMapper.selectByUserId(1224706869998772226L);
-//            userId = userOpen.getUserId();
-//            userId = 1224706869998772226L;
+//            list = userRoleMapper.getUserRoleByUserId(123L);
+//            UserOpen userOpen = userOpenMapper.selectByUserId(123L);
+            userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\""+userOpen.getUserId()+"\"");
-//            model.put("user_id", "\""+userId+"\"");
+            if (list.size() == 0) {
+                return new ModelAndView("/user/home.ftl", model);
+            }
+            if (list.size() == 1) {
+                MsReport msReport =msReportService.getReportByDateNow(userId);
+                model.put("msReport", new JsonWapper(msReport));
+                return new ModelAndView("/home/home.ftl", model);
+            }
+            if (list.size() == 2) {
+                return new ModelAndView("/user/changeRole.ftl", model);
+            }
         } else {
             model.put("user", userOpenMapper.selectByUserId(userId));
-            list = userRoleMapper.getUserRoleByUserId(userId);
             model.put("user_id", "\""+userId+"\"");
-        }
-        if (list.size() == 0) {
-            return new ModelAndView("/user/home.ftl", model);
-        } else if (list.size()>0) {
-            if (list.get(0).getRoleId() == 1) {
+            if (userType == 1) {
                 MsReport msReport =msReportService.getReportByDateNow(userId);
                 model.put("msReport", new JsonWapper(msReport));
                 return new ModelAndView("/home/home.ftl", model);
-            } else if(list.get(0).getRoleId() == 2) {
+            } else if (userType == 2) {
+                return new ModelAndView("/user/changeRole.ftl", model);
+            }
+        }
+        return null;
+    }
+
+    @GetMapping("/user/homeIndex.html")
+    public ModelAndView homeIndex(ModelMap model, @RequestParam(value = "userId", required = false,defaultValue = "0") Long userId,
+                             @RequestParam(value = "userType", required = false,defaultValue = "0") Integer userType) throws JsonProcessingException {
+        if (userId != 0 && userType != 0) {
+            model.put("user_id", "\"" + userId + "\"");
+            if (userType == 1) {
+                MsReport msReport = msReportService.getReportByDateNow(userId);
+                model.put("msReport", new JsonWapper(msReport));
+                return new ModelAndView("/home/home.ftl", model);
+            } else if (userType == 2) {
                 List<QzTask> taskList = qzTaskService.selectAll();
                 model.put("taskList", YvanUtil.toJsonPretty(taskList));
                 List<sysUptownUnit> rbList = rbService.selectAll(userId);
@@ -115,24 +136,8 @@ public class UserOpenController {
         String phone = request.getParameter("phone");
         Integer area = Integer.parseInt(request.getParameter("area"));
         Long uptownId = Long.parseLong(request.getParameter("uptownId"));
-        Long unitId = 0L;
-        String doorplate = "";
-        if (userType == 1) {
-            unitId = Long.parseLong(request.getParameter("unitId"));
-            doorplate = request.getParameter("doorplate");
-        }
+        Long unitId = Long.parseLong(request.getParameter("unitId"));
+        String 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("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/resources/mapper/QzTaskDao.xml

@@ -45,7 +45,7 @@
         SELECT b.house_id ,b.doorplate as houseNumber
         from sys_user_role a
         INNER JOIN sys_uptown_house b on a.property_id=b.house_id
-        where a.user_id=#{userId}
+        where a.user_id=#{userId} limit 1
     </select>
 
 </mapper>