maoyunfeng il y a 5 ans
Parent
commit
45b1398900

+ 16 - 16
whepi-ui/templates/user/home.ftl

@@ -18,11 +18,11 @@
                     <br/>
                     <br/>
                     <div class="weui-form" id="fromMsg">
-                        <div class="weui-cells_radio user-font">
-                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;我是&nbsp;&nbsp;
-                            <input name="Fruit" type="radio" value="1"/>家庭用户
-                            <input name="Fruit" type="radio" value="2"/>业委会人员
-                        </div>
+<#--                        <div class="weui-cells_radio user-font">-->
+<#--                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;我是&nbsp;&nbsp;-->
+<#--                            <input name="Fruit" type="radio" value="1"/>家庭用户-->
+<#--                            <input name="Fruit" type="radio" value="2"/>业委会人员-->
+<#--                        </div>-->
                         <hr class="user-hr">
                         <div class="maindiv">
                             <div class="leftdiv">
@@ -295,7 +295,7 @@
                         type: "post",
                         data: {
                             "userId": userId,
-                            "userType": $('input:radio:checked').val(),
+                            // "userType": $('input:radio:checked').val(),
                             "linkman": $("#linkman").val(),
                             "phone": $("#phone").val(),
                             "city": city,
@@ -304,7 +304,7 @@
                             "uptownId": uptownId,
                             "doorplate": doorplate,
                         },success: function (date) {
-                            window.location.href = "/user/home.html?userId=" + userId + "&userType=" + $('input:radio:checked').val();
+                            window.location.href = "/user/home.html?userId=" + userId + "&userType=1";
                         }
                     });
                 }
@@ -313,14 +313,14 @@
     }
 
     function goOn() {
-        var userType = $('input:radio:checked').val();
-        if (!userType) {
-            $("#tpl_msg_warn_userType").show();
-            $("#tpl_msg_warn_linkman").hide();
-            $("#tpl_msg_warn_phone").hide();
-            $("#fromMsg").hide();
-            return false;
-        }
+        // var userType = $('input:radio:checked').val();
+        // if (!userType) {
+        //     $("#tpl_msg_warn_userType").show();
+        //     $("#tpl_msg_warn_linkman").hide();
+        //     $("#tpl_msg_warn_phone").hide();
+        //     $("#fromMsg").hide();
+        //     return false;
+        // }
         var linkman = $("#linkman").val();
         if (!linkman) {
             $("#tpl_msg_warn_userType").hide();
@@ -342,7 +342,7 @@
         $("#tpl_msg_warn_phone").hide();
         $("#first").hide();
         $("#second").show();
-        console.log(userType)
+        // console.log(userType)
         console.log(linkman)
         console.log(phone)
     }

+ 55 - 40
whepi-ui/templates/yeweihui/home.ftl

@@ -5,31 +5,33 @@
     <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 "/yeweihui/ribaoDy.ftl" /></div>
+        <#--<#include "/yeweihui/ribaoDy.ftl" />-->
+            <#include "/yeweihui/ribaohuiz.ftl" />
+        </div>
         <div id="tab2" class="weui-tab__bd-item">
             <#include "/yeweihui/qiuzhu.ftl" /></div>
-        <#--<div id="tab3" class="weui-tab__bd-item">-->
-            <#--<h1>页面三</h1> </div>-->
-        <#--<div id="tab4" class="weui-tab__bd-item">-->
-            <#--<h1>页面四</h1> </div>-->
+    <#--<div id="tab3" class="weui-tab__bd-item">-->
+    <#--<h1>页面三</h1> </div>-->
+    <#--<div id="tab4" class="weui-tab__bd-item">-->
+    <#--<h1>页面四</h1> </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>
+            <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>
+            <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>-->
-        <#--</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>-->
-        <#--</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>-->
+    <#--</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>-->
+    <#--</a>-->
     </div>
 </div>
 
@@ -38,36 +40,49 @@
 
 <#include "/home/frag.foot.ftl" />
 <script>
-<#include "/yeweihui/ribao.js" />
+    <#include "/yeweihui/ribao.js" />
 <#include "/yeweihui/qiuzhu.js" />
 
-var taskList = ${taskList!'[]'};
-var statisticsOrderList =${rbList!'[]'};
+    var taskList = ${taskList!'[]'};
+    var statisticsOrderList =${rbList!'[]'};
 
-(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 ($) {
+        $(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");
+            });
 
-    });
-    $('#btnRB').empty();
-    for (var i = 0; i < statisticsOrderList.length; i++) {//unitId
-        var v = statisticsOrderList[i];//'+v.ridgepole+'&'+v.unit+'&'+userId+'
-        $('#btnRB').append('<button class="weui-btn weui-btn_primary" style="display: grid;" value="'+v.unitId+'" onclick="ribao_init(this.value)" >'+v.ridgepole+'栋'+v.unit+'单元'+'</button>');
-    }
+        });
+        $('#btnRB').empty();
+        for (var i = 0; i < statisticsOrderList.length; i++) {//unitId
+            var v = statisticsOrderList[i];//'+v.ridgepole+'&'+v.unit+'&'+userId+'
+            $('#btnRB').append('<button class="weui-btn weui-btn_primary" style="display: grid;" value="' + v.unitId + '" onclick="ribao_init(this.value)" >' + v.ridgepole + '栋' + v.unit + '单元' + '</button>');
+        }
     <#--console.log('ssssss');-->
     <#--var tasks = ${taskList!'[]'};-->
-    // console.log('ssssss', tasks);
-    // console.log('asdsfdgfhjghfgdf');
+        // console.log('ssssss', tasks);
+        // console.log('asdsfdgfhjghfgdf');
+
+        ribao_init();
+        qiuzhu_init();
+
+
+        $("#ribaohuiz").calendar({
+            dateFormat: 'yyyy-mm-dd',
+            inputReadOnly: false,
+            onChange: function (p, values, displayValues) {
+                var reportDate = values.toString();
+                $("#exportRiBao").attr('href', "/yeweihui/exportRiBao?userId=" + $('#userId').val() + "&date=" + reportDate);
+                console.log(reportDate);
+                $("#exportRiBaoLink").val(window.location.hostname + "/yeweihui/exportRiBao?userId=" + $('#userId').val() + "&date=" + reportDate);
+            }
+        });
 
-    ribao_init();
-    qiuzhu_init();
-})(jQuery);
+    })(jQuery);
 </script>

+ 33 - 64
whepi-ui/templates/yeweihui/ribaohuiz.ftl

@@ -1,69 +1,38 @@
 <#assign title="业委会"/>
-<#include "/home/frag.head.ftl" />
+<div class="page__bd" style="height: 300px">
+    <header class="demos-header">
+        <h1 class="demos-title">抗疫小区</h1>
+    </header>
 
-<div class="page__bd">
-        <header class="demos-header">
-            <h1 class="demos-title">抗疫小区</h1>
-        </header>
-        <div id="rbs" class="weui-tab__bd-item ">
-                <div id="ribaohuiz"></div>
-            <div class="weui-panel weui-panel_access">
-                <table cellspacing="0" cellpadding="0" style="width: 100%">
-                    <tbody><#--border="1" cellspacing="0" cellpadding="0"-->
-                    <tr>
-                        <td style="background-color: lightgrey" align="center">注册户数</td>
-                        <td style="background-color: lightgrey" align="center">上报户数</td>
-                        <td style="background-color: lightgrey" align="center">异常户数</td>
-                    </tr>
-                    <tr id="huiz">
-                    <#--<td align="center">8</td>-->
-                    <#--<td align="center">0</td>-->
-                    <#--<td align="center">0</td>-->
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
-            <div class="weui-btn-area"  style="display: grid;">
-            <#--<p id="btnRB" class="weui-btn weui-btn_primary" href="javascript:" type="hidden">一键通知</p>-->
-                <a id="returnc" class="weui-btn weui-btn_primary" href="javascript:">生成报表</a>
+    <div id="ribaohuiz"></div>
+    <div class="weui-panel weui-panel_access">
+        <table cellspacing="0" cellpadding="0" style="width: 100%">
+            <tbody><#--border="1" cellspacing="0" cellpadding="0"-->
+            <tr>
+                <td style="background-color: lightgrey" align="center">注册户数</td>
+                <td style="background-color: lightgrey" align="center">上报户数</td>
+                <td style="background-color: lightgrey" align="center">异常户数</td>
+            </tr>
+            <tr id="huiz">
+                <td align="center">8</td>
+                <td align="center">0</td>
+                <td align="center">0</td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+    <div class="weui-btn-area" style="display: grid;">
+    <#--<p id="btnRB" class="weui-btn weui-btn_primary" href="javascript:" type="hidden">一键通知</p>-->
+        <a id="exportRiBao" class="weui-btn weui-btn_primary" href="javascript:">生成报表</a>
+    </div>
+    <div id="doorplateMsg">
+        <div class="weui-cells__title">复制下面下载链接到浏览器下载</div>
+        <div class="weui-cells">
+            <div class="weui-cell">
+                <div class="weui-cell__bd">
+                    <input class="weui-input" type="text" id="exportRiBaoLink"/>
+                </div>
             </div>
         </div>
-
+    </div>
 </div>
-<#include "/home/frag.foot.ftl" />
-<script>
-    (function ($) {
-        $(function(){
-
-            $("#ribaohuiz").calendar({
-                dateFormat: 'yyyy-mm-dd',
-                inputReadOnly: false,
-                onChange: function (p, values, displayValues) {
-                    var reportDate = values.toString();
-                    console.log(reportDate);
-                    // var userId = $("#userId").val();
-                    $.ajax({
-                        url: '/yeweihui/ribaohuiz',
-                        data: {
-                            // "userCreate": userId,
-                            "reportDate": reportDate,
-                        },
-                        type: 'GET',
-                        success: function (data) {
-                            // $('#ribao_famliy').empty();
-                            for (var i = 0; i < data.data.length; i++) {
-                                var v = data.data[i];
-                                var t1 = $('<td align="center">' + v.num + '</td>');
-                                $("#huiz").append(t1);
-                            }
-                        },
-                        error: function () {
-                        }
-                    });
-                }
-            });
-        });
-    })(jQuery);
-
-
-</script>

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

@@ -69,10 +69,11 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
     List<MsSuspected> selecthuiz(@Param("userId") Long userId,@Param("reportDate") String reportDate);
 
     @Select(
-            "select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num," +
-            "msr.sure_num,msr.suspected_num,msr.normal_num,msr.single_num,mss.user_name,mss.grender," +
-            "mss.age,mss.family_status,mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea," +
-            "mss.fatigue,mss.diarrhea,mss.single_room from ms_suspected mss "+
+            "select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum," +
+            "msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum," +
+                    "msr.single_num as singleNum,mss.user_name as userName,mss.grender," +
+            "mss.age,mss.family_status as familyStatus,mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea," +
+            "mss.fatigue,mss.diarrhea,mss.single_room as singleRoom from ms_suspected mss "+
             "inner join ms_report msr on msr.report_id = mss.report_id and msr.report_date = #{date} "+
             "inner join sys_uptown_house suh on suh.house_id = msr.house_id "+
             "inner join sys_uptown_unit suu on suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId} "+

+ 20 - 20
whepi-web/src/main/java/com/bofeng/entity/ExcelRiBao.java

@@ -15,7 +15,7 @@ public class ExcelRiBao {
     private String unit;
     private String doorplate;
     private int grender;
-    private int family_status;
+    private int familyStatus;
     private int medical;
     private BigDecimal temperature;
     private int cough;
@@ -23,8 +23,8 @@ public class ExcelRiBao {
     private int dyspnea;
     private int fatigue;
     private int diarrhea;
-    private int single_room;
-    private String status_desp = "";
+    private int singleRoom;
+    private String statusDesp = "";
     private String others = "";
 
 
@@ -55,22 +55,22 @@ public class ExcelRiBao {
     private String phone;
 
     @ExcelProperty(value = "今日居家人数", index = 4)
-    private int safety_num;
+    private int safetyNum;
 
     @ExcelProperty(value = "确诊入院人数", index = 5)
-    private int sure_num;
+    private int sureNum;
 
     @ExcelProperty(value = "隔离人数", index = 6)
-    private int single_num;
+    private int singleNum;
 
     @ExcelProperty(value = "异常观察人数", index = 7)
-    private int suspected_num;
+    private int suspectedNum;
 
     @ExcelProperty(value = "身体正常人数", index = 8)
-    private int normal_num;
+    private int normalNum;
 
     @ExcelProperty(value = "居家人员姓名", index = 9)
-    private String user_name;
+    private String userName;
 
     @ExcelProperty(value = "性别", index = 10)
     private String grenderStr;
@@ -92,21 +92,21 @@ public class ExcelRiBao {
     @ExcelProperty(value = "身体基本情况", index = 12)
     private String baseDesc;
     public String getBaseDesc() {
-        if (family_status == 0) {
+        if (familyStatus == 0) {
             baseDesc = "无病史";
-        } else if (family_status == 1) {
+        } else if (familyStatus == 1) {
             baseDesc = "心血管疾病(服用ARB)";
-        } else if (family_status == 2) {
+        } else if (familyStatus == 2) {
             baseDesc = "心血管疾病(未服用ARB)";
-        } else if (family_status == 3) {
+        } else if (familyStatus == 3) {
             baseDesc = "呼吸系统病史";
-        } else if (family_status == 4) {
+        } else if (familyStatus == 4) {
             baseDesc = "肿瘤病史";
-        } else if (family_status == 5) {
+        } else if (familyStatus == 5) {
             baseDesc = "糖尿病史";
-        } else if (family_status == 6) {
+        } else if (familyStatus == 6) {
             baseDesc = "服用过激素药物";
-        } else if (family_status == 7) {
+        } else if (familyStatus == 7) {
             baseDesc = "妊娠期";
         } else {
             baseDesc = "其他";
@@ -155,11 +155,11 @@ public class ExcelRiBao {
         } else if (diarrhea == 3) {
             bingqingDesc += "重度腹泻超过6次、";
         }
-        if (single_room == 1) {
+        if (singleRoom == 1) {
             bingqingDesc += "单间隔离、";
         }
-        if (!Strings.isNullOrEmpty(status_desp)) {
-            bingqingDesc += status_desp;
+        if (!Strings.isNullOrEmpty(statusDesp)) {
+            bingqingDesc += statusDesp;
             bingqingDesc += "、";
         }
         if (!Strings.isNullOrEmpty(others)) {

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

@@ -62,8 +62,8 @@ public class UserOpenController {
         if (userId == 0) {
             UserOpen userOpen = homeService.getUserOpen();
             list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-//            list = userRoleMapper.getUserRoleByUserId(1225325493987995649L);
-//            UserOpen userOpen = userOpenMapper.selectByUserId(1225325493987995649L);
+//            list = userRoleMapper.getUserRoleByUserId(13131L);
+//            UserOpen userOpen = userOpenMapper.selectByUserId(13131L);
             userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\""+userOpen.getUserId()+"\"");
@@ -141,14 +141,14 @@ public class UserOpenController {
     @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"));
+//        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,userType,linkman,phone,area,uptownId,unitId,doorplate);
+        userOpenService.saveUserInfo(userId,1,linkman,phone,area,uptownId,unitId,doorplate);
     }
 
     @ApiOperation("客户档案信息错误数据导出")