hudingbo 5 years ago
parent
commit
4af605def2

+ 0 - 0
whepi-ui/templates/wuye/fabu.ftl


+ 0 - 0
whepi-ui/templates/wuye/fabu.js


+ 65 - 0
whepi-ui/templates/wuye/home.ftl

@@ -0,0 +1,65 @@
+<#assign title="物业"/>
+<#include "/home/frag.head.ftl" />
+
+<div class="weui-tab">
+    <input id="userId" type="text" hidden="hidden" value=${user_id!}/>
+    <div class="weui-tab__bd">
+        <div id="tab1" class="weui-tab__bd-item weui-tab__bd-item--active">
+            <#include "/wuye/qiuzhu.ftl" /></div>
+        <div id="tab2" class="weui-tab__bd-item">
+            <#include "/wuye/fabu.ftl" /></div>
+    </div>
+    <div class="weui-tabbar">
+        <a href="#tab1" class="weui-tabbar__item weui-bar__item--on">
+            <div class="weui-tabbar__icon"><img src="/static/images/wx/order.png" alt=""></div>
+            <p class="weui-tabbar__label">求助响应</p>
+        </a>
+        <a href="#tab2" class="weui-tabbar__item">
+            <div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>
+            <p class="weui-tabbar__label" onclick="familyClick()">信息发布</p>
+        </a>
+    </div>
+</div>
+
+
+</body>
+
+<#include "/home/frag.foot.ftl" />
+<script>
+    <#include "/wuye/fabu.js" />
+    <#include "/wuye/qiuzhu.js" />
+    (function ($) {
+        // $(function () {
+        //     $('.weui-navbar__item').on('click', function () {
+        //         $(this).addClass('weui-bar__item_on').siblings('.weui-bar__item_on').removeClass('weui-bar__item_on');
+        //         //内容切换
+        //         var moduleClass = jQuery(this).attr("module");
+        //         var ss = ".weui-tab__panel ." + moduleClass + "_weui_tab_bd_item_active";
+        //         $(ss).removeClass(moduleClass + '_weui_tab_bd_item_active');
+        //         var data_toggle = jQuery(this).attr("target");
+        //         $(data_toggle).addClass(moduleClass + "_weui_tab_bd_item_active");
+        //     });
+        // });
+        //
+        // $(function () {
+        //     $("#ground").bind("click", function () {
+        //         if ($("#Gj").val() == "off") {
+        //             $("#Gj").val("on");
+        //             console.log("关闭查看所有");
+        //             qzMy_help(1);
+        //         } else {
+        //             $("#Gj").val("off");
+        //             console.log("查看已解决的");
+        //             qzMy_help(2);
+        //         }
+        //     });
+        // });
+    })(jQuery);
+
+
+    //小区求助信息的展示
+    function familyClick() {
+
+    }
+
+</script>

+ 103 - 0
whepi-ui/templates/wuye/qiuzhu.ftl

@@ -0,0 +1,103 @@
+<div class="page__bd">
+    <div class="weui-tab">
+        <div class="weui-navbar">
+            <a class="weui-navbar__item weui-bar__item_on" target="#qz_nav1" module="qiu_zhu" onclick="familyClick()">
+                用户求助
+            </a>
+            <a class="weui-navbar__item" target="#qz_nav2" module="qiu_zhu" id="qzMy_help" onclick="qzMy_help('')">
+                业委会任务
+            </a>
+        </div>
+        <div class="weui-tab__panel">
+            <div id="qz_nav1" class="weui-tab__bd-item qiu_zhu_weui_tab_bd_item_active">
+                <div id="notitle">
+                </div>
+                <div class="weui-cells__title"></div>
+                <div class="weui-cells">
+                    <a class="weui-cell weui-cell_access" href="javascript:dateSelect();">
+                        <div class="weui-cell__bd">
+                            <p>日期</p>
+                        </div>
+                        <div class="weui-cell__ft">2020-02-05</div>
+                    </a>
+                </div>
+                <div id="userHelpAnaly"></div>
+            <#--<div class="weui-flex">-->
+            <#--<div class="weui-flex__item">-->
+            <#--<div class="placeholder">今日新增</div>-->
+            <#--<div class="">1</div>-->
+            <#--</div>-->
+            <#--<div class="weui-flex__item">-->
+            <#--<div class="placeholder">今日已处理</div>-->
+            <#--<div class="">2</div>-->
+            <#--</div>-->
+            <#--<div class="weui-flex__item">-->
+            <#--<div class="placeholder">今日未处理</div>-->
+            <#--<div class="">3</div>-->
+            <#--</div>-->
+            <#--</div>-->
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+    (function ($) {
+        familyClick();
+    })(jQuery);
+
+    //用户求助信息统计
+    function familyClick() {
+        $('#userHelpAnaly').empty();//清除节点
+        $.ajax({
+            url: '/wuye/userHelpAnaly',
+            data: {queryDate: '2020-02-05'},
+            type: 'GET',
+            success: function (data) {
+                console.log(data);
+                if (data.data.length > 0) {
+                    hasData = true;
+                    getHelpData(data);
+                } else {
+
+                }
+            },
+            error: function () {
+            }
+        });
+    }
+
+    function getHelpData(data) {
+        $('#userHelpAnaly').append($('<div class="weui-flex"> \n' +
+                '                   <div class="weui-flex__item">\n' +
+                '                       <div class="placeholder">今日新增</div>\n' +
+                '                       <div>' + data.todayAdd + '</div>\n' +
+                '                   </div>\n' +
+                '                   <div class="weui-flex__item">\n' +
+                '                       <div class="placeholder">今日已处理</div>\n' +
+                '                       <div>\' + data.todayDo + \'</div>\n' +
+                '                   </div>\n' +
+                '                   <div class="weui-flex__item">\n' +
+                '                   <div class="placeholder">今日未处理</div>\n' +
+                '                       <div>\' + data.todayDonot + \'</div>\n' +
+                '                   </div>\n' +
+                '               <div>'));
+    }
+
+    //我的求助的页面展示
+    function dateSelect() {
+        weui.datePicker({
+            start: 1990,
+            end: 2000,
+            defaultValue: [1991, 6, 9],
+            onChange: function (result) {
+                console.log(result);
+            },
+            onConfirm: function (result) {
+                console.log(result);
+            },
+            id: 'datePicker'
+        });
+    }
+</script>
+

+ 58 - 0
whepi-ui/templates/wuye/qiuzhu.js

@@ -0,0 +1,58 @@
+function qiuzhu_init() {
+
+}
+
+function shValue(v) {
+  $('#qzHS').append($('<a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg">\n' +
+    '                <div class="weui-media-box__bd">\n' +
+    '                    <div style="display: flex; flex-direction: row; justify-content: space-between;">\n' +
+    '                        <p class="weui-media-box__desc">业主1号</p>\n' +
+    '                        <p class="weui-media-box__desc">' + timestampToTime(v.timeUpdate) + '</p>\n' +
+    '                    </div>\n' +
+    '                    <div class="weui-cell ">\n' +
+    '                        <div class="weui-cell__bd">\n' +
+    '                            <textarea class="weui-textarea" rows="1" readonly >' + v.replyContent + '</textarea>\n' +
+    '                            <div class="weui-textarea-counter"></div>\n' +
+    '                        </div>\n' +
+    '                    </div>\n' +
+    '                </div>\n' +
+    '            </a>\n<br />'));
+}
+
+function timestampToTime(timestamp) {
+  var date = new Date(timestamp); //时间戳为10位需*1000,时间戳为13位的话不需乘1000
+  var Y = date.getFullYear() + '/';
+  var M = ((date.getMonth() + 1) < 10) ? ('0' + (date.getMonth() + 1) + '/') : ((date.getMonth() + 1) + '/');
+  var D = (date.getDate() < 10) ? ('0' + date.getDate() + ' ') : (date.getDate() + ' ');
+  var h = (date.getHours() < 10) ? ('0' + date.getHours() + ':') : (date.getHours() + ':');
+  var m = (date.getMinutes() < 10) ? ('0' + date.getMinutes() + ':') : (date.getMinutes() + ':');
+  var s = (date.getSeconds() < 10) ? ('0' + date.getSeconds()) : (date.getSeconds());
+  return Y + M + D + h + m + s;
+}
+
+function family_init() {
+  /*$('#family').on('click',function () {
+    $('#familyDisplay')[0].style.display == '';
+    alert($('#familyDisplay')[0].style.display == 'none')
+    if($('#familyDisplay')[0].style.display == 'none'){
+      $('#notPlay').toggle();
+
+    }else{
+      $('#familyDisplay')[0].style.display == '';
+      $('#notPlay')[0].style.display == 'none';
+    }
+
+
+  })*/
+}
+
+function submit_back() {
+  $('#back').on('click', function () {
+    if ($('#notPlay')[0].style.display = 'none') {
+      $('#notPlay')[0].style.display = '';
+      $('#play').toggle();
+
+    }
+
+  })
+}

+ 23 - 10
whepi-web/src/main/java/com/bofeng/dao/QzTaskDao.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.bofeng.entity.QzTask;
 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.List;
@@ -12,19 +13,31 @@ import java.util.List;
 @Repository
 public interface QzTaskDao extends BaseMapper<QzTask> {
 
-  List<QzTask> selectAll();
+    List<QzTask> selectAll();
 
-  QzTask queryByTaskId(Long taskId);
+    QzTask queryByTaskId(Long taskId);
 
-  List<QzTask> queryByHouseNumber(@Param("houseNumber") String houseNumber, @Param("status") Integer status);
+    List<QzTask> queryByHouseNumber(@Param("houseNumber") String houseNumber, @Param("status") Integer status);
 
-  Integer updateStatusById(@Param("taskId") Long taskId, @Param("status") Integer status);
+    Integer updateStatusById(@Param("taskId") Long taskId, @Param("status") Integer status);
 
-  List<QzTask> queryQzTaskByStatus(@Param("taskStatus")Integer taskStatus);
-  List<QzTask> queryQzTask(@Param("taskStatus") Integer taskStatus, @Param("taskTitle") String taskTitle,@Param("userId")Long userId);
+    List<QzTask> queryQzTaskByStatus(@Param("taskStatus") Integer taskStatus);
+
+    List<QzTask> queryQzTask(@Param("taskStatus") Integer taskStatus, @Param("taskTitle") String taskTitle, @Param("userId") Long userId);
+
+    //当前用户名称
+    QzTask selectUserName(@Param("userId") Long userId);
+
+    //当前用户门牌id 门牌号
+    QzTask selectHome(@Param("userId") Long userId);
+
+    @Select("select count(1) from qz_task where DATE_FORMAT(time_create,'%Y-%m-%d')=#{queryDate}\n" +
+            "union all select count(1) from qz_task where DATE_FORMAT(time_create,'%Y-%m-%d')=#{queryDate} and task_status=3\n" +
+            "union all select count(1) from qz_task where DATE_FORMAT(time_create,'%Y-%m-%d')=#{queryDate} and task_status in (1,2)\n" +
+            "union all select count(1) from qz_task where time_create BETWEEN date_add(#{queryDate}, interval -30 day) and date_add(#{queryDate}, interval 1 day)\n" +
+            "union all select count(1) from qz_task where time_create BETWEEN date_add(#{queryDate}, interval -30 day) and date_add(#{queryDate}, interval 1 day) and task_status=3\n" +
+            "union all select count(1) from qz_task where time_create BETWEEN date_add(#{queryDate}, interval -30 day) and date_add(#{queryDate}, interval 1 day) and task_status in (1,2);\n" +
+            "")
+    List<Long> queryUserHelpAnaly(@Param("queryDate") String queryDate);
 
-  //当前用户名称
-  QzTask selectUserName(@Param("userId") Long userId);
-  //当前用户门牌id 门牌号
-  QzTask selectHome(@Param("userId") Long userId);
 }

+ 44 - 0
whepi-web/src/main/java/com/bofeng/entity/UserHelpAnaly.java

@@ -0,0 +1,44 @@
+package com.bofeng.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * qz_task
+ *
+ * @author
+ */
+@Data
+public class UserHelpAnaly implements Serializable {
+    /**
+     * 今日新增
+     */
+    private Long todayAdd;
+
+    /**
+     * 今日已处理
+     */
+    private Long todayDo;
+
+    /**
+     * 今日未处理
+     */
+    private Long todayDonot;
+
+    /**
+     * 近30日累计新增
+     */
+    private Long monthAdd;
+
+    /**
+     * 近30日累计处理
+     */
+    private Long monthDo;
+
+    /**
+     * 近30日累计未处理
+     */
+    private Long monthDonot;
+
+}

+ 32 - 0
whepi-web/src/main/java/com/bofeng/service/WuYeService.java

@@ -0,0 +1,32 @@
+package com.bofeng.service;
+
+import com.bofeng.dao.QzTaskDao;
+import com.bofeng.entity.UserHelpAnaly;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional(readOnly = true)
+public class WuYeService {
+
+    @Autowired
+    private QzTaskDao qzTaskDao;
+
+    public UserHelpAnaly queryUserHelpAnaly(String queryDate) {
+        UserHelpAnaly userHelpAnaly = new UserHelpAnaly();
+        List<Long> lstAnaly = qzTaskDao.queryUserHelpAnaly(queryDate);
+        if (lstAnaly != null && lstAnaly.size() == 6) {
+            userHelpAnaly.setTodayAdd(lstAnaly.get(0));
+            userHelpAnaly.setTodayDo(lstAnaly.get(1));
+            userHelpAnaly.setTodayDonot(lstAnaly.get(2));
+            userHelpAnaly.setMonthAdd(lstAnaly.get(3));
+            userHelpAnaly.setMonthDo(lstAnaly.get(4));
+            userHelpAnaly.setMonthDonot(lstAnaly.get(5));
+        }
+        return userHelpAnaly;
+    }
+
+}

+ 74 - 0
whepi-web/src/main/java/com/bofeng/wx/controller/WuYeController.java

@@ -0,0 +1,74 @@
+package com.bofeng.wx.controller;
+
+import com.bofeng.entity.QzTask;
+import com.bofeng.entity.UserHelpAnaly;
+import com.bofeng.service.QzTaskReplyService;
+import com.bofeng.service.QzTaskService;
+import com.bofeng.service.WuYeService;
+import com.google.common.collect.Maps;
+import com.yvan.Model;
+import com.yvan.mvc.Pd;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+public class WuYeController {
+
+    @Autowired
+    private QzTaskService qzTaskService;
+    @Autowired
+    private WuYeService wuYeService;
+
+    @Autowired
+    private QzTaskReplyService qzTaskReplyService;
+
+    @GetMapping("/wuye/home.html")
+    public ModelAndView wuye(ModelMap model, @RequestParam(value = "userId", required = false, defaultValue = "0") Long userId) {
+
+        Map<String, Object> queryParam = Maps.newLinkedHashMap();
+        queryParam.put("userId", "12345677");
+        queryParam.put("statistics", "M");
+
+        List<QzTask> taskList = qzTaskService.selectAll();
+//        List<sysUptownUnit> rbList = rbService.selectAll();
+        model.put("taskList", YvanUtil.toJsonPretty(taskList));
+//        model.put("rbList", YvanUtil.toJsonPretty(rbList));
+
+        return new ModelAndView("/wuye/home.ftl", model);
+    }
+
+    @GetMapping("/wuye/qiuzhu.html")
+    public ModelAndView wuyeUserHelp(ModelMap model) {
+
+//        List<QzTask> taskList = qzTaskService.selectAll();
+//
+//        model.put("taskList", YvanUtil.toJsonPretty(taskList));
+
+        return new ModelAndView("/wuye/qiuzhu.ftl", model);
+    }
+
+    @GetMapping("/wuye/fabu.html")
+    public ModelAndView wuyePub(ModelMap model) {
+
+//        List<QzTask> taskList = qzTaskService.selectAll();
+//
+//        model.put("taskList", YvanUtil.toJsonPretty(taskList));
+
+        return new ModelAndView("/wuye/fabu.ftl", model);
+    }
+
+    //小区求助的查看
+    @GetMapping("/wuye/userHelpAnaly")
+    public Model<UserHelpAnaly> taskQuery(@Pd(name = "queryDate") String queryDate) {
+        return Model.newSuccess(wuYeService.queryUserHelpAnaly(queryDate));
+    }
+
+}