yuliang 5 år sedan
förälder
incheckning
7071754740

+ 35 - 24
whepi-ui/templates/home/buy.ftl

@@ -11,35 +11,24 @@
         <div class="weui-tab__panel"><#--团购信息的列表-->
             <div id="buy_nav1" style="text-align: center ">
                 团购信息
-            </div>
 
+                <div class="container">
+                    <div class="weui-form-preview"
+                         id="buyListGroup">
+
+                        <div style="display: flex; flex-direction: row; color: grey; font-size: medium;">
+                            <div style="width: 30%; text-align: center;color: #0a001f">标题</div>
+                            <div style="width: 20%; text-align: center;color: #0a001f">已团</div>
+                            <div style="width: 35%; text-align: center;color: #0a001f">截止时间</div>
+                            <div style="width: 15%; text-align: center;color: #0a001f">状态</div>
+                        </div>
 
-            <div id="buy_nav2" style="display: none"><#--我的团购信息-->
-                <div class="weui-form-preview">
-                    <div style="display: flex; flex-direction: row; color: grey; font-size: medium;">
-                        <div style="width: 33%; text-align: center;color: #0a001f">我的订单</div>
-                        <div style="width: 33%; text-align: center;color: #0a001f">提交时间</div>
-                        <div style="width: 33%; text-align: center;color: #0a001f">订单状态</div>
                     </div>
+
                 </div>
                 <div class="container">
-                    <div id="MyBuyAll">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="weui-form-preview"
-             id="buyListGroup">
-            <div style="display: flex; flex-direction: row; color: grey; font-size: medium;">
-                <div style="width: 30%; text-align: center;color: #0a001f">标题</div>
-                <div style="width: 20%; text-align: center;color: #0a001f">已团</div>
-                <div style="width: 35%; text-align: center;color: #0a001f">截止时间</div>
-                <div style="width: 15%; text-align: center;color: #0a001f">状态</div>
-            </div>
-        </div>
-        <div class="container">
-            <div id="buyAll" class="weui-panel__bd">
-            <#--   <a href="javascript:void(0);" style="color: grey;font-size: large">
+                    <div id="buyAll" class="weui-panel__bd">
+                    <#--   <a href="javascript:void(0);" style="color: grey;font-size: large">
                 <div style="display: flex; flex-direction: row; text-align: center; font-size: x-small; line-height: 5vh;"
                      onclick=" myBuyClick()">
                     <div style="width: 40%; overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size: 12px">
@@ -56,8 +45,30 @@
                     </div>
                 </div>
             </a>-->
+                    </div>
+                    <div style="height: 20vh"></div>
+                </div>
+
+            </div>
+
+
+            <div id="buy_nav2" style="display: none"><#--我的团购信息-->
+                <div class="weui-form-preview">
+                    <div style="display: flex; flex-direction: row; color: grey; font-size: medium;">
+                        <div style="width: 33%; text-align: center;color: #0a001f">我的订单</div>
+                        <div style="width: 33%; text-align: center;color: #0a001f">提交时间</div>
+                        <div style="width: 33%; text-align: center;color: #0a001f">订单状态</div>
+                    </div>
+                </div>
+                <div class="container">
+                    <div id="MyBuyAll">
+
+                    </div>
+                    <div style="height: 20vh"></div>
+                </div>
             </div>
         </div>
+
     </div>
 
     <script>

+ 6 - 6
whepi-ui/templates/home/home.ftl

@@ -8,8 +8,8 @@
             <#include "/home/ribao.ftl" /></div>
         <div id="tab2" class="weui-tab__bd-item">
             <#include "/home/qiuzhu.ftl" /></div>
-        <div id="tab3" class="weui-tab__bd-item">
-           <#include "/home/buy.ftl" /></div>
+        <#--<div id="tab3" class="weui-tab__bd-item">-->
+           <#--<#include "/home/buy.ftl" /></div>-->
     <#--<div id="tab4" class="weui-tab__bd-item">-->
     <#--<h1>页面四</h1> </div>-->
     </div>
@@ -22,10 +22,10 @@
             <div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>
             <p class="weui-tabbar__label">家庭求助</p>
         </a>
-        <a id="jt3" href="#tab3" class="weui-tabbar__item" onclick="buyGroup()">
-            <div class="weui-tabbar__icon"><img src="/static/images/wx/upload.png" alt=""></div>
-            <p class="weui-tabbar__label">商品团购</p>
-        </a>
+        <#--<a id="jt3" href="#tab3" class="weui-tabbar__item" onclick="buyGroup()">-->
+            <#--<div class="weui-tabbar__icon"><img src="/static/images/wx/upload.png" alt=""></div>-->
+            <#--<p class="weui-tabbar__label">商品团购</p>-->
+        <#--</a>-->
     <#--<a href="#tab4" class="weui-tabbar__item">-->
     <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_cell.png" alt=""> </div>-->
     <#--<p class="weui-tabbar__label">我</p>-->

+ 8 - 8
whepi-ui/templates/yeweihui/home.ftl

@@ -1,4 +1,4 @@
-<#assign title="管理员"/>
+<#assign title="业委会"/>
 <#include "/home/frag.head.ftl" />
 
 <div class="weui-tab">
@@ -13,9 +13,9 @@
         </div>
         <div id="tab2" class="weui-tab__bd-item">
             <#include "/yeweihui/qiuzhu.ftl" /></div>
-        <div id="tab3" class="weui-tab__bd-item">
-            <#include "/yeweihui/tuangou.ftl" />
-        </div>
+        <#--<div id="tab3" class="weui-tab__bd-item">-->
+            <#--<#include "/yeweihui/tuangou.ftl" />-->
+        <#--</div>-->
     <#--<div id="tab3" class="weui-tab__bd-item">-->
     <#--<h1>页面三</h1> </div>-->
     <#--<div id="tab4" class="weui-tab__bd-item">-->
@@ -30,10 +30,10 @@
             <div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>
             <p class="weui-tabbar__label">求助</p>
         </a>
-        <a id="tab3a" href="#tab3" class="weui-tabbar__item">
-            <div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>
-            <p class="weui-tabbar__label">团购</p>
-        </a>
+        <#--<a id="tab3a" href="#tab3" class="weui-tabbar__item">-->
+            <#--<div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>-->
+            <#--<p class="weui-tabbar__label">团购</p>-->
+        <#--</a>-->
     <#--<a href="#tab3" class="weui-tabbar__item">-->
     <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_article.png" alt=""> </div>-->
     <#--<p class="weui-tabbar__label">发现</p>-->

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

@@ -30,165 +30,165 @@ import java.util.List;
 @RestController
 public class UserOpenController {
 
-  @Autowired
-  private HomeService homeService;
-  @Autowired
-  private UserOpenService userOpenService;
-  @Autowired
-  private UserOpenMapper userOpenMapper;
-  @Autowired
-  private UptownMapper uptownMapper;
-  @Autowired
-  private UptownHouseMapper uptownHouseMapper;
-  @Autowired
-  private UptownHomeMapper uptownHomeMapper;
-  @Autowired
-  private UserRoleMapper userRoleMapper;
-  @Autowired
-  private UptownUnitMapper uptownUnitMapper;
-  @Autowired
-  private QzTaskService qzTaskService;
-  @Autowired
-  private RbService rbService;
-  @Autowired
-  private MsReportService msReportService;
-  @Autowired
-  private RbMapper rbMapper;
-
-  @ApiOperation("登陆首页")
-  @ApiImplicitParams({@ApiImplicitParam(name = "userId", value = "用户ID", required = false, dataType = "Long", paramType = "query"),
-    @ApiImplicitParam(name = "userType", value = "用户类型", required = false, dataType = "Integer", paramType = "query")
-  })
-  @GetMapping("/user/home.html")
-  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(1225321682867105793L);
-            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
-      userId = userOpen.getUserId();
-      model.put("user", userOpen);
-      model.put("user_id", "\"" + userOpen.getUserId() + "\"");
-
-      List<Uptown> uptowns = rbMapper.selectUptown(userId);
-      if (uptowns != null && uptowns.size() > 0) {
-        Long uptown_id = uptowns.get(0).getUptownId();
-        String uptown_name = uptowns.get(0).getUptownName();
-        model.put("uptown_id", "\"" + uptown_id + "\"");
-        model.put("uptown_name", uptown_name);
-      }
-
-
-      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));
-      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) {
-        return new ModelAndView("/user/changeRole.ftl", model);
-      }
+    @Autowired
+    private HomeService homeService;
+    @Autowired
+    private UserOpenService userOpenService;
+    @Autowired
+    private UserOpenMapper userOpenMapper;
+    @Autowired
+    private UptownMapper uptownMapper;
+    @Autowired
+    private UptownHouseMapper uptownHouseMapper;
+    @Autowired
+    private UptownHomeMapper uptownHomeMapper;
+    @Autowired
+    private UserRoleMapper userRoleMapper;
+    @Autowired
+    private UptownUnitMapper uptownUnitMapper;
+    @Autowired
+    private QzTaskService qzTaskService;
+    @Autowired
+    private RbService rbService;
+    @Autowired
+    private MsReportService msReportService;
+    @Autowired
+    private RbMapper rbMapper;
+
+    @ApiOperation("登陆首页")
+    @ApiImplicitParams({@ApiImplicitParam(name = "userId", value = "用户ID", required = false, dataType = "Long", paramType = "query"),
+            @ApiImplicitParam(name = "userType", value = "用户类型", required = false, dataType = "Integer", paramType = "query")
+    })
+    @GetMapping("/user/home.html")
+    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(1225321682867105793L);
+//            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
+            userId = userOpen.getUserId();
+            model.put("user", userOpen);
+            model.put("user_id", "\"" + userOpen.getUserId() + "\"");
+
+            List<Uptown> uptowns = rbMapper.selectUptown(userId);
+            if (uptowns != null && uptowns.size() > 0) {
+                Long uptown_id = uptowns.get(0).getUptownId();
+                String uptown_name = uptowns.get(0).getUptownName();
+                model.put("uptown_id", "\"" + uptown_id + "\"");
+                model.put("uptown_name", uptown_name);
+            }
+
+
+            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));
+            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) {
+                return new ModelAndView("/user/changeRole.ftl", model);
+            }
+        }
+        return null;
     }
-    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, @RequestParam(value = "show", required = false, defaultValue = "-") String show) throws JsonProcessingException {
-    if (userId != 0 && userType != 0) {
-      model.put("user_id", "\"" + userId + "\"");
-      List<Uptown> uptowns = rbMapper.selectUptown(userId);
-      if (uptowns != null && uptowns.size() > 0) {
-        Long uptown_id = uptowns.get(0).getUptownId();
-        String uptown_name = uptowns.get(0).getUptownName();
-        model.put("uptown_id", "\"" + uptown_id + "\"");
-        model.put("uptown_name", uptown_name);
-      }
-      if (userType == 1) {
-        MsReport msReport = msReportService.getReportByDateNow(userId);
-        model.put("msReport", new JsonWapper(msReport));
-        model.put("show", "\"" + show + "\"");
-        return new ModelAndView("/home/home.ftl", model);
-      } else if (userType == 2) {
-        List<QzTask> taskList = qzTaskService.selectAll(userId);
-        model.put("taskList", YvanUtil.toJsonPretty(taskList));
-        List<sysUptownUnit> rbList = rbService.selectAll(userId);
-        model.put("rbList", YvanUtil.toJsonPretty(rbList));
-
-        return new ModelAndView("/yeweihui/home.ftl", model);
-      }
+
+    @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, @RequestParam(value = "show", required = false, defaultValue = "-") String show) throws JsonProcessingException {
+        if (userId != 0 && userType != 0) {
+            model.put("user_id", "\"" + userId + "\"");
+            List<Uptown> uptowns = rbMapper.selectUptown(userId);
+            if (uptowns != null && uptowns.size() > 0) {
+                Long uptown_id = uptowns.get(0).getUptownId();
+                String uptown_name = uptowns.get(0).getUptownName();
+                model.put("uptown_id", "\"" + uptown_id + "\"");
+                model.put("uptown_name", uptown_name);
+            }
+            if (userType == 1) {
+                MsReport msReport = msReportService.getReportByDateNow(userId);
+                model.put("msReport", new JsonWapper(msReport));
+                model.put("show", "\"" + show + "\"");
+                return new ModelAndView("/home/home.ftl", model);
+            } else if (userType == 2) {
+                List<QzTask> taskList = qzTaskService.selectAll(userId);
+                model.put("taskList", YvanUtil.toJsonPretty(taskList));
+                List<sysUptownUnit> rbList = rbService.selectAll(userId);
+                model.put("rbList", YvanUtil.toJsonPretty(rbList));
+
+                return new ModelAndView("/yeweihui/home.ftl", model);
+            }
+        }
+        return null;
+    }
+
+    @GetMapping("/home/getUptownData.json")
+    public List<Uptown> getUptownData(HttpServletRequest request, @RequestParam(value = "area") Integer area) {
+        return uptownMapper.getAllUptown(area);
     }
-    return null;
-  }
-
-  @GetMapping("/home/getUptownData.json")
-  public List<Uptown> getUptownData(HttpServletRequest request, @RequestParam(value = "area") Integer area) {
-    return uptownMapper.getAllUptown(area);
-  }
-
-  @GetMapping("/home/getUptownUnitData.json")
-  public List<UptownUnit> getUptownUnitData(HttpServletRequest request, @RequestParam(value = "uptownId") Long uptownId) {
-    return uptownUnitMapper.getUptownUnitData(uptownId);
-  }
-
-  @PostMapping("/home/checkHouseId.json")
-  public ResultModel checkHouseId(HttpServletRequest request) {
-    ResultModel resultModel = new ResultModel();
-    Long unitId = Long.parseLong(request.getParameter("unitId"));
-    String doorplate = request.getParameter("doorplate");
-    List<UptownHouse> list = uptownHouseMapper.getUptownHouseBy(unitId, doorplate);
-    if (list.size() > 0) {
-      resultModel.put("success", false);
-      resultModel.put("msg", "该门牌已有人入住!");
-      return resultModel;
+
+    @GetMapping("/home/getUptownUnitData.json")
+    public List<UptownUnit> getUptownUnitData(HttpServletRequest request, @RequestParam(value = "uptownId") Long uptownId) {
+        return uptownUnitMapper.getUptownUnitData(uptownId);
     }
-    resultModel.put("success", true);
-    resultModel.put("msg", "操作成功");
-    return resultModel;
-  }
-
-  @PostMapping("/home/saveUser.json")
-  public void saveUser(ModelMap model, HttpServletRequest request) {
-    Long userId = Long.parseLong(request.getParameter("userId"));
+
+    @PostMapping("/home/checkHouseId.json")
+    public ResultModel checkHouseId(HttpServletRequest request) {
+        ResultModel resultModel = new ResultModel();
+        Long unitId = Long.parseLong(request.getParameter("unitId"));
+        String doorplate = request.getParameter("doorplate");
+        List<UptownHouse> list = uptownHouseMapper.getUptownHouseBy(unitId, doorplate);
+        if (list.size() > 0) {
+            resultModel.put("success", false);
+            resultModel.put("msg", "该门牌已有人入住!");
+            return resultModel;
+        }
+        resultModel.put("success", true);
+        resultModel.put("msg", "操作成功");
+        return resultModel;
+    }
+
+    @PostMapping("/home/saveUser.json")
+    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");
-    String phone = request.getParameter("phone");
-    Integer area = Integer.parseInt(request.getParameter("area"));
-    Long uptownId = Long.parseLong(request.getParameter("uptownId"));
-    Long unitId = Long.parseLong(request.getParameter("unitId"));
-    String doorplate = request.getParameter("doorplate");
-    userOpenService.saveUserInfo(userId, 1, linkman, phone, area, uptownId, unitId, doorplate);
-  }
-
-  @ApiOperation("客户档案信息错误数据导出")
-  @GetMapping("/user/importExcelUserOpen")
-  @SneakyThrows
-  public void errorCustInfo(HttpServletResponse resp) {
-    List<UserOpen> list = userOpenMapper.getAllUser();
-    ExcelUtils.writeSheet(UserOpen.class, list).export(resp, "errorCust");
-  }
-
-  @GetMapping("/home/desc.html")
-  public ModelAndView descHome(ModelMap model) {
-    return new ModelAndView("/home/desc.ftl", model);
-  }
-
-  @GetMapping("/home/homeHelp.html")
-  public ModelAndView homeHelp(ModelMap model) {
-    return new ModelAndView("/home/homeHelp.ftl", model);
-  }
+        String linkman = request.getParameter("linkman");
+        String phone = request.getParameter("phone");
+        Integer area = Integer.parseInt(request.getParameter("area"));
+        Long uptownId = Long.parseLong(request.getParameter("uptownId"));
+        Long unitId = Long.parseLong(request.getParameter("unitId"));
+        String doorplate = request.getParameter("doorplate");
+        userOpenService.saveUserInfo(userId, 1, linkman, phone, area, uptownId, unitId, doorplate);
+    }
+
+    @ApiOperation("客户档案信息错误数据导出")
+    @GetMapping("/user/importExcelUserOpen")
+    @SneakyThrows
+    public void errorCustInfo(HttpServletResponse resp) {
+        List<UserOpen> list = userOpenMapper.getAllUser();
+        ExcelUtils.writeSheet(UserOpen.class, list).export(resp, "errorCust");
+    }
+
+    @GetMapping("/home/desc.html")
+    public ModelAndView descHome(ModelMap model) {
+        return new ModelAndView("/home/desc.ftl", model);
+    }
+
+    @GetMapping("/home/homeHelp.html")
+    public ModelAndView homeHelp(ModelMap model) {
+        return new ModelAndView("/home/homeHelp.ftl", model);
+    }
 }

+ 3 - 3
whepi-web/src/main/resources/mapper/BuyMapper.xml

@@ -36,9 +36,9 @@
       IFNULL(( SELECT SUM(b.buy_count)
       FROM jm_buy b WHERE a.jm_id = b.jm_id and buy_status=1), 0 ) AS count
       FROM jm_tuangou a
-      INNER JOIN jm_buy c on a.jm_id=c.jm_id and c.user_id=#{userId}
-	  INNER JOIN sys_user_role d on d.user_id=c.user_id and d.role_id=1
-	  INNER JOIN sys_uptown_home e on e.house_id=d.property_id
+      left JOIN jm_buy c on a.jm_id=c.jm_id and c.user_id=#{userId}
+	  left JOIN sys_user_role d on d.user_id=c.user_id and d.role_id=1
+	  left JOIN sys_uptown_home e on e.house_id=d.property_id
       WHERE a.jm_id = #{jmId} limit 1
     </select>