فهرست منبع

Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi into test_branch

lange 5 سال پیش
والد
کامیت
96c907918c
28فایلهای تغییر یافته به همراه1361 افزوده شده و 126 حذف شده
  1. 12 12
      admin-ui/app/whepi/scan/qrImg.js
  2. 30 22
      admin-ui/app/whepi/tugou/dialogTugou.js
  3. BIN
      whepi-ui/static/adminHelp_1.jpg
  4. BIN
      whepi-ui/static/homeHelp.jpg
  5. BIN
      whepi-ui/static/homeHelp_1.jpg
  6. 43 9
      whepi-ui/templates/groupBuying/groupBuyingCx.ftl
  7. 10 2
      whepi-ui/templates/groupBuying/groupBuyingXx.ftl
  8. 19 0
      whepi-ui/templates/home/adminHelp.ftl
  9. 1 1
      whepi-ui/templates/home/buyClient.ftl
  10. 4 0
      whepi-ui/templates/home/frag.head.ftl
  11. 1 1
      whepi-ui/templates/home/home.ftl
  12. 2 2
      whepi-ui/templates/home/homeHelp.ftl
  13. 189 0
      whepi-ui/templates/lingyun/home.ftl
  14. 94 0
      whepi-ui/templates/lingyun/ribao.ftl
  15. 847 0
      whepi-ui/templates/lingyun/ribao.js
  16. 1 1
      whepi-ui/templates/yeweihui/home.ftl
  17. 10 6
      whepi-ui/templates/yeweihui/tgPublish.ftl
  18. 1 1
      whepi-ui/templates/yeweihui/tuangouMemberList.ftl
  19. 4 0
      whepi-web/src/main/java/com/bofeng/dao/JmTuangouDao.java
  20. 1 0
      whepi-web/src/main/java/com/bofeng/dao/OutUserMapper.java
  21. 39 57
      whepi-web/src/main/java/com/bofeng/service/BuyService.java
  22. 15 5
      whepi-web/src/main/java/com/bofeng/service/JmTuangouService.java
  23. 11 2
      whepi-web/src/main/java/com/bofeng/wx/WxController.java
  24. 2 2
      whepi-web/src/main/java/com/bofeng/wx/controller/ScanController.java
  25. 5 0
      whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java
  26. 16 2
      whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java
  27. 1 1
      whepi-web/src/main/resources/mapper/BuyMapper.xml
  28. 3 0
      whepi-web/src/main/resources/mapper/JmTuangouMapper.xml

+ 12 - 12
admin-ui/app/whepi/scan/qrImg.js

@@ -84,18 +84,18 @@ define(function (require) {
                                 xtype: 'toolbar',
                                 title: '小区大门详情',
                                 items: [
-                                    // {
-                                    //     text: '添加大门', iconCls: 'fa fa-plus-circle fa-lg', onClick: function () {
-                                    //         $.yvan.showDialog(this,
-                                    //             require('/app/whepi/scan/addDoor.js')({
-                                    //                 isEdit: false,
-                                    //                 confirm: function () {
-                                    //                     queryGrid1();
-                                    //                 }
-                                    //             })
-                                    //         );
-                                    //     }
-                                    // },
+                                    {
+                                        text: '添加大门', iconCls: 'fa fa-plus-circle fa-lg', onClick: function () {
+                                            $.yvan.showDialog(this,
+                                                require('/app/whepi/scan/addDoor.js')({
+                                                    isEdit: false,
+                                                    confirm: function () {
+                                                        queryGrid1();
+                                                    }
+                                                })
+                                            );
+                                        }
+                                    },
                                     // {
                                     //     text: '编辑大门', iconCls: 'fa fa fa-pencil-square-o fa-lg', onClick: function () {
                                     //         var row = $grid1.rowData();

+ 30 - 22
admin-ui/app/whepi/tugou/dialogTugou.js

@@ -36,7 +36,7 @@ define(function (require) {
     return {
       xtype: 'dialog',
       dialogId: 'dialogTugou',
-      title: context.isEdit == 2 ? '增补修订需求' : '新增需求发布',
+      title: context.isEdit == 2 ? '增补修订需求' : (context.isEdit == 3 ? '取消需求' : '新增需求发布'),
       width: '100%',
       height: '100%',
       onOpen: function () {
@@ -78,7 +78,7 @@ define(function (require) {
                 width: 900,
                 height: 35,
                 validType: 'isBlank',
-                readonly: context.isEdit != 1 ? true : false,
+                disabled: context.isEdit != 1 ? true : false,
                 onChange: function (data) {
                   queryGrid1(data);
                 },
@@ -93,7 +93,7 @@ define(function (require) {
               }, {id: '5', text: '其他服务'}],
               width: 450,
               height: 35,
-              readonly: context.isEdit != 1 ? true : false,
+              disabled: context.isEdit != 1 ? true : false,
               required: true,
               onChange: function (data) {
 
@@ -101,14 +101,14 @@ define(function (require) {
             }, {
               name: 'tgPrice',
               label: '单价',
-              readonly: context.isEdit != 1 ? true : false,
+              disabled: context.isEdit != 1 ? true : false,
               maxlength: 6, validType: 'number',
               width: 450, height: 35,
             }],
             [{
               name: 'tgItemNum',
               label: '个人限额',
-              readonly: context.isEdit != 1 ? true : false,
+              disabled: context.isEdit != 1 ? true : false,
               maxlength: 6, validType: 'integer',
               width: 450, height: 35,
             },],
@@ -116,31 +116,31 @@ define(function (require) {
               name: 'tgGoods', label: '套餐描述',
               required: true, width: 900, height: 35,
               maxlength: 500,
-              readonly: context.isEdit != 1 ? true : false,
+              disabled: context.isEdit != 1 ? true : false,
               height: '100px', multiline: true,
             }],
             [{
               name: 'tgMinNum',
               label: '最低配送',
-              readonly: context.isEdit != 1 ? true : false,
+              disabled: context.isEdit != 1 ? true : false,
               maxlength: 4, validType: 'integer',
               width: 450, height: 35,
             }, {
               name: 'tgMaxNum',
-              readonly: context.isEdit != 1 ? true : false,
+              disabled: context.isEdit != 1 ? true : false,
               label: '配送上限', validType: 'integer',
               maxlength: 4, width: 450, height: 35,
             }],
             [{
               name: 'tgEndTime',
               label: '需求截止时间',
-              readonly: context.isEdit != 1 ? true : false,
+              disabled: context.isEdit == 3 ? true : false,
               xtype: 'datetimebox',
               required: true, width: 450, height: 35,
             }, {
               name: 'tgDeliverTime',
               multiline: true,
-              readonly: context.isEdit != 1 ? true : false,
+              disabled: context.isEdit == 3 ? true : false,
               xtype: 'datetimebox',
               label: '预计配货时间',
               required: true, width: 450, height: 35,
@@ -148,19 +148,19 @@ define(function (require) {
               {
                 name: 'tgPhoneNumber', validType: 'telNum',
                 label: '联系电话', width: 450, height: 35,
-                readonly: context.isEdit != 1 ? true : false,
+                disabled: context.isEdit != 1 ? true : false,
                 required: true, maxlength: 11,
               },
               {
                 name: 'tgSupplier', width: 450, height: 35,
-                label: '供应商', maxlength: 20,
-                readonly: context.isEdit != 1 ? true : false,
+                label: '供应商', maxlength: 20, required: true,
+                disabled: context.isEdit != 1 ? true : false,
               }],
             [
               {
                 name: 'remark', width: 900, height: 120,
                 label: '备注', maxlength: 500, multiline: true,
-                required: true, xtype: context.isEdit==1 ? 'hidden' : '',
+                required: true, xtype: context.isEdit == 1 ? 'hidden' : '',
               }
             ]
           ],
@@ -173,21 +173,29 @@ define(function (require) {
               $.yvan.msg('请先选择小区');
               return;
             }
-            if ($form.formGet().tgMinNum > $form.formGet().tgMaxNum) {
-              $.yvan.msg('最大上限必须大于等于最小起订量');
-              return;
+            if ($form.formGet().tgMinNum != '') {
+              if ($form.formGet().tgMaxNum != '') {
+                if ($form.formGet().tgMinNum > $form.formGet().tgMaxNum) {
+                  $.yvan.msg('最大上限必须大于等于最小起订量');
+                  return;
+                }
+              }
             }
+
             if ($form.formGet().tgEndTime > $form.formGet().tgDeliverTime) {
               $.yvan.msg('团购截止时间必须小于预计送货时间');
               return;
             }
             console.log($form.formGet());
-            if (isLoading === true) {
-              return;
-            }
-            else {
-              isLoading = true;
+            if (context.isEdit == 1) {
+              if (isLoading === true) {
+                return;
+              }
+              else {
+                isLoading = true;
+              }
             }
+
             $.yvan.postForm($form, {
               url: (context.isEdit == 1 ? api('/yeweihui/tgPublish') : (context.isEdit == 3 ? api('/yeweihui/updateStatus') : api('/yeweihui/tgStatus'))),
               success: function (data) {

BIN
whepi-ui/static/adminHelp_1.jpg


BIN
whepi-ui/static/homeHelp.jpg


BIN
whepi-ui/static/homeHelp_1.jpg


+ 43 - 9
whepi-ui/templates/groupBuying/groupBuyingCx.ftl

@@ -23,15 +23,25 @@
             <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;${ tgItem.tgPrice }</p>
             <div style="height: 1vh;"></div>
-            <p style="text-indent: -0em;margin-left: 2em;">最低起送(份):&nbsp;&nbsp;${ tgItem.tgMinNum }</p>
+            <p id="cx_p_tgMinNum" style="text-indent: -0em;margin-left: 2em;">最低起送(份):&nbsp;&nbsp;</p>
             <div style="height: 1vh;"></div>
-            <p style="text-indent: -0em;margin-left: 2em;">最大订量(份):&nbsp;&nbsp;${ tgItem.tgMaxNum }</p>
+            <p id="cx_p_tgMaxNum" style="text-indent: -0em;margin-left: 2em;">最大订量(份):&nbsp;&nbsp;</p>
             <div style="height: 1vh;"></div>
             <p id="cx_p_tgItemNum" style="text-indent: -0em;margin-left: 2em;">个人限额(份):&nbsp;&nbsp;</p>
-            <div style="height: 1vh;"></div>
-            <p id="cx_p_endTime" style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;</p>
-            <div style="height: 1vh;"></div>
-            <p id="cx_p_deliverTime"style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;</p>
+            <div id="cx_showView">
+                <div style="height: 1vh;"></div>
+                <p id="cx_p_endTime" style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;</p>
+                <div style="height: 1vh;"></div>
+                <p id="cx_p_deliverTime"style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;</p>
+            </div>
+            <div id="cx_modifyView">
+                <div style="height: 1vh;"></div>
+                <p class="weui-media-box__desc" style="text-indent: -0em;margin-left: 2em;">截止时间:</p>
+                <input id="cx_tg_input_end_time" type="text" placeholder="请选择时间" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;text-indent: -0em;margin-left: 2em;"/>
+                <div style="height: 1vh;"></div>
+                <p class="weui-media-box__desc" style="text-indent: -0em;margin-left: 2em;">预计送货时间:</p>
+                <input id="cx_tg_input_deliver_time" type="text" placeholder="请选择时间" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;text-indent: -0em;margin-left: 2em;"/>
+            </div>
             <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">服务电话:&nbsp;&nbsp;${ tgItem.tgPhoneNumber }</p>
         </div>
@@ -53,9 +63,31 @@
 
     var operation = ${operation};
 
+    if (operation === 'remark') {
+        $('#cx_showView').hide();
+        $('#cx_modifyView').show();
+
+        $('#cx_tg_input_end_time').val(tgItem.tgEndTime);
+        $('#cx_tg_input_deliver_time').val(tgItem.tgDeliverTime);
+
+        $("#cx_tg_input_end_time").datetimePicker();
+        $("#cx_tg_input_deliver_time").datetimePicker();
+    }
+    if (operation === 'cancel') {
+        $('#cx_showView').show();
+        $('#cx_modifyView').hide();
+
+        $('#cx_p_endTime').append(tgItem.tgEndTime);
+        $('#cx_p_deliverTime').append(tgItem.tgDeliverTime);
+    }
 
-    $('#cx_p_endTime').append(tgItem.tgEndTime);
-    $('#cx_p_deliverTime').append(tgItem.tgDeliverTime);
+    if (tgItem.tgMinNum != 0) {
+        $('#cx_p_tgMinNum').append(tgItem.tgMinNum);
+    }
+
+    if (tgItem.tgMaxNum != 0) {
+        $('#cx_p_tgMaxNum').append(tgItem.tgMaxNum);
+    }
 
     if (tgItem.tgItemNum != 0) {
         $('#cx_p_tgItemNum').append(tgItem.tgItemNum);
@@ -75,7 +107,9 @@
 
         let sendData = {
             jmId: tgItem.jmId,
-            remark: inputValue
+            remark: inputValue,
+            endTime: $('#cx_tg_input_end_time').val(),
+            deliverTime: $('#cx_tg_input_deliver_time').val()
         };
 
         if (operation === 'cancel') {

+ 10 - 2
whepi-ui/templates/groupBuying/groupBuyingXx.ftl

@@ -24,9 +24,9 @@
             <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;${ tgItem.tgPrice }</p>
             <div style="height: 1vh;"></div>
-            <p style="text-indent: -0em;margin-left: 2em;">最低起送(份):&nbsp;&nbsp;${ tgItem.tgMinNum }</p>
+            <p id="p_tgMinNum" style="text-indent: -0em;margin-left: 2em;">最低起送(份):&nbsp;&nbsp;</p>
             <div style="height: 1vh;"></div>
-            <p style="text-indent: -0em;margin-left: 2em;">最大订量(份):&nbsp;&nbsp;${ tgItem.tgMaxNum }</p>
+            <p id="p_tgMaxNum" style="text-indent: -0em;margin-left: 2em;">最大订量(份):&nbsp;&nbsp;</p>
             <div style="height: 1vh;"></div>
             <p id="p_tgItemNum" style="text-indent: -0em;margin-left: 2em;">个人限额(份):&nbsp;&nbsp;</p>
             <div style="height: 1vh;"></div>
@@ -136,6 +136,14 @@
     $('#p_endTime').append(tgItem.tgEndTime);
     $('#p_deliverTime').append(tgItem.tgDeliverTime);
 
+    if (tgItem.tgMinNum != 0) {
+        $('#p_tgMinNum').append(tgItem.tgMinNum);
+    }
+
+    if (tgItem.tgMaxNum != 0) {
+        $('#p_tgMaxNum').append(tgItem.tgMaxNum);
+    }
+
     if (tgItem.tgItemNum != 0) {
         $('#p_tgItemNum').append(tgItem.tgItemNum);
     }

+ 19 - 0
whepi-ui/templates/home/adminHelp.ftl

@@ -0,0 +1,19 @@
+<#assign title="管理员手册"/>
+<#include "/home/frag.head.ftl" />
+
+<div class="page__bd" style="height: 300px">
+    <div class="container">
+        <img src="/static/adminHelp_1.jpg" style="width: 100%"/>
+</div>
+
+
+<#include "/home/frag.foot.ftl" />
+
+<script>
+
+    (function ($) {
+
+    })(jQuery);
+
+
+</script>

+ 1 - 1
whepi-ui/templates/home/buyClient.ftl

@@ -85,7 +85,7 @@
                 $("#Buycount").html(data.data.count);
                 $("#myStatus").html(getStatus(data.data.tgStatus));
                 $("#myPhone").val(data.data.phone);
-                if (data.data.roleType == 1) {
+                if (data.data.tgMaxNum - data.data.count <= 0) {
                     $("#tc1").toggle();
                 } else {
                     $("#tc").html(data.data.tgMaxNum - data.data.count);

+ 4 - 0
whepi-ui/templates/home/frag.head.ftl

@@ -148,6 +148,10 @@
             margin-right: 0.5vw;
             margin-top: 0.7vw;
         }
+        .tt{
+            border-top: 3px solid #75859f;
+            margin-top:2.4em
+        }
     </style>
 </head>
 <span hidden="hidden" id="id"></span>

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

@@ -24,7 +24,7 @@
         </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>
+            <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>-->

+ 2 - 2
whepi-ui/templates/home/homeHelp.ftl

@@ -1,9 +1,9 @@
-<#assign title="操作帮助"/>
+<#assign title="家庭手册"/>
 <#include "/home/frag.head.ftl" />
 
 <div class="page__bd" style="height: 300px">
     <div class="container">
-        <img src="/static/homeHelp.jpg" style="width: 100%"/>
+        <img src="/static/homeHelp_1.jpg" style="width: 100%"/>
 </div>
 
 

+ 189 - 0
whepi-ui/templates/lingyun/home.ftl

@@ -0,0 +1,189 @@
+<#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 "/lingyun/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="tab4" class="weui-tab__bd-item">-->
+    <#--<h1>页面四</h1> </div>-->
+    </div>
+    <div class="weui-tabbar">
+        <a id="jt1" 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 id="jt2" 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">家庭求助</p>
+        </a>
+        <a id="jt3" href="#tab3" class="weui-tabbar__item" ">
+            <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>-->
+    <#--</a>-->
+    </div>
+</div>
+
+
+</body>
+
+<#include "/home/frag.foot.ftl" />
+<script>
+    <#include "/lingyun/ribao.js" />
+    <#include "/home/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");
+            });
+        });
+
+
+        ribao_init();
+        qiuzhu_init();
+        family_init();
+        ribao_add();
+        ribao_cancel();
+
+        <#if msReport ??>var msReport = ${msReport}</#if>;
+        $('#ribao_jinrijujian').append(msReport.safetyNum);
+        if (msReport.reportStatus == 1) {
+            document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
+        }
+        ribaoInitialization(msReport.reportId);
+        $("#my-input-ribao").calendar();
+        /*submit_back();*/
+        familyClick();
+
+        $(function () {
+            $("#ground").bind("click", function () {
+                if ($("#Gj").val() == "off") {
+                    $("#Gj").val("on");
+                    console.log("关闭查看所有");
+
+                    qzMy_help('', $("#quetyFamily").val());
+                } else {
+                    $("#Gj").val("off");
+                    console.log("查看已解决的");
+                    qzMy_help(3, $("#quetyFamily").val());
+                }
+            });
+        });
+
+
+        function selectTab() {
+            $("#tab1").removeClass('weui-tab__bd-item--active');
+            $("#jt1").removeClass('weui-bar__item--on');
+            $("#tab3").addClass('weui-tab__bd-item--active');
+            $("#jt3").addClass('weui-bar__item--on');
+            buyGroup();
+        }
+
+        function selectqiuzhu() {
+            $("#tab1").removeClass('weui-tab__bd-item--active');
+            $("#jt1").removeClass('weui-bar__item--on');
+            $("#tab2").addClass('weui-tab__bd-item--active');
+            $("#jt2").addClass('weui-bar__item--on');
+            familyClick();
+        }
+
+        var show = ${show!'"-"'};
+
+        if (show == 'tuangou') {
+            selectTab();
+
+        } else if (show == 'qiuzhu') {
+            selectqiuzhu();
+        }
+    })(jQuery);
+
+
+    //小区求助信息的展示
+    function familyClick() {
+        $('#notitle').empty();//清除节点
+        $.ajax({
+            url: '/home/home/queryQzTaskxq',
+            data: {userId: $('#userId').val()},
+            type: 'GET',
+            async: false,
+            success: function (data) {
+                console.log(data);
+                if (data.data.length > 0) {
+                    hasData = true;
+                    data.data.forEach(function (v) {
+                        familyValue(v);
+                    });
+                } else {
+
+                }
+            },
+            error: function () {
+            }
+        });
+    }
+
+    function familyValue(v) {
+        $('#notitle').append($('<a class="weui-cell weui-cell_active weui-cell_access js_item" data-id="form" ' +
+                '                               onclick=\'xiaoQuItemClick(' + JSON.stringify(v) + ')\'>\n' +
+                '                        <div class="weui-cell__bd" taskId="1212>\n' +
+                '                            <div class="weui-media-box weui-media-box_text" id="title">\n' +
+                '                                <p class="weui-media-box__desc" >' + v.taskTitle + '</p>\n' +
+                '                            </div>\n' +
+                '                        </div>\n' +
+                '                        <div class="weui-cell__ft">' + conversion(v.taskStatus) + '</div>\n' +
+                '                    </a>\n<br/>'));
+
+    }
+
+    function xiaoQuItemClick(v) {
+        window.location.href = "/quzhu/home/quxiao.html?taskId=" + v.taskId + "&userId=" + $('#userId').val();
+        /*familyClick();*/
+        /*    $.ajax({
+                url: '/home/home/taskQuery',
+                data: {taskId: v.taskId},
+                type: 'GET',
+                success: function (data) {
+                    console.log(data);
+                    if ($('#userId').val() != data.data.userId) {
+                        $.alert('当前求助信息不是你的')
+                        return;
+                    } else {
+                        window.location.href = "/quzhu/home/quxiao.html?taskId=" + v.taskId + "&userId=" + v.userId;
+                        familyClick()
+                    }
+                },
+                error: function () {
+                }
+            });*/
+
+    }
+
+
+    //完成 已解决  为完成的方法
+    function conversion(a) {
+        if (a == 1) {
+            return "<span style='color:red;'>未解决</span>";
+        } else if (a == 2) {
+            return "<span style='color:Black;'>处理中</span>";
+        } else {
+            return "<span style='color:green;'>已完成</span>";
+        }
+    }
+
+</script>

+ 94 - 0
whepi-ui/templates/lingyun/ribao.ftl

@@ -0,0 +1,94 @@
+
+<div class="page__bd">
+    <div class="weui-tab">
+        <div class="weui-navbar">
+            <a class="weui-navbar__item weui-bar__item_on" target="#rb_nav1" module="ri_bao" onclick="ribao_refrash()">
+                今日报告
+            </a>
+            <a class="weui-navbar__item" target="#rb_nav2" module="ri_bao">
+                健康日历
+            </a>
+        </div>
+        <div class="weui-tab__panel">
+            <div id="rb_nav1" class="weui-tab__bd-item ri_bao_weui_tab_bd_item_active">
+
+                <div id="ribao" class="weui-btn-area"><#--style="display: none"-->
+                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 6vh;">
+                        <div style="height: 5vh; line-height: 5vh; width: 55%;">工作驻地</div>
+                        <input id="js_input_gzzd" class="weui-input" type="text" placeholder="请选择"
+                               style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%" onchange="selectinput(this)"/>
+                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                        <input placeholder="其它地点" type="text" style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;" />
+                    </div>
+                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                        <div style="height: 5vh; line-height: 5vh; width: 55%;">今日所在地</div>
+                        <input id="js_input_jrszd" class="weui-input" type="text" placeholder="请选择"
+                               style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"/>
+                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                        <input placeholder="其它地点" type="text" style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;" />
+                    </div>
+                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                        <div style="height: 5vh; line-height: 5vh; width: 55%;">是否出行</div>
+                        <input id="js_input_sf" class="weui-input" type="text" placeholder="请选择"
+                               style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 145%"/>
+                      </div>
+                    <br/>
+                    <#--<div style="text-align: center;height: 1vh;">出行情况上报</div>-->
+                    <div class="weui-loadmore weui-loadmore_line" style="width: 100%;height: 1vh;">
+                        <span class="weui-loadmore__tips">出行情况上报</span>
+                    </div>
+                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 6vh;">
+                        <div style="height: 5vh; line-height: 5vh; width: 55%;">出发地</div>
+                        <input id="js_input_cfd" class="weui-input" type="text" placeholder="请选择"
+                               style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"/>
+                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                        <input placeholder="其它地点" type="text" style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;" />
+                    </div>
+                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                        <div style="height: 5vh; line-height: 5vh; width: 55%;">目的地</div>
+                        <input id="js_input_mdd" class="weui-input" type="text" placeholder="请选择"
+                               style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"/>
+                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                        <input placeholder="其它地点" type="text" style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;" />
+                    </div>
+                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                        <div style="height: 5vh; line-height: 5vh; width: 55%;">出行方式</div>
+                        <input id="js_input_cxfs" class="weui-input" type="text" placeholder="请选择出行方式"
+                               style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"/>
+                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                        <input placeholder="车次/航班/车牌" type="text" disabled="disabled" style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;" />
+
+                    </div>
+                    <div class="weui-cell__ft" style="margin-top: 1vh;">
+                        <button id="btnAdd" href="javascript:" style="height:5vh; margin-right: 0vh;width: 70px;"
+                                class="weui-btn weui-btn_mini weui-btn_primary">添加
+                        </button>
+                    </div>
+                    <div class="weui-loadmore tt" style="width: 100%;height: 1vh;margin-top: 1vh;">
+                    </div>
+                    <div>
+                        <table cellspacing="0" cellpadding="0" style="width: 100%">
+                            <tbody id="tabtr"><#--border="1" cellspacing="0" cellpadding="0"-->
+                            <tr style="background-color: #f8f8f8;">
+                               <#-- <td style="text-align: center;">序号</td>
+                                <td style="text-align: center;">出发地</td>
+                                <td style="text-align: center;">目的地</td>
+                                <td style="text-align: center;">出行方式</td>
+                                <td style="text-align: center;">车次/航班/车牌</td>-->
+                            </tr>
+                            </tbody>
+                        </table>
+                        <table id="tab5" class="new_tab" align="left" cellpadding="0" cellspacing="0"
+                               style="width: 100%;">
+                        </table>
+                    </div>
+                    </div>
+                </br>
+                </br>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+

+ 847 - 0
whepi-ui/templates/lingyun/ribao.js

@@ -0,0 +1,847 @@
+function ribao_init() {
+    var xxIds = [];
+    var xxName = [
+        "序号",
+        "出发地",
+        "目的地",
+        "出行方式",
+        "车次/航班/车牌"
+    ];
+    for (var i = 0; i < xxName.length; i++) {
+        xxIds.push({
+            name: xxName[i]
+        });
+    }
+    var html = "<tr style='background-color: #f8f8f8;'>";
+    for (var i = 0; i < xxIds.length; i++) {
+        // alert(xxIds[i].name);
+        html += "<th>" + xxIds[i].name + "</th>";
+    }
+    html +="</tr>"
+    for (var i = 0; i < 10; i++) {//后端传过来的集合遍历
+        if (i % 2 != 0) {
+            html += "<tr style='background-color: #f8f8f8;'>";
+        }
+        else {
+            html += "<tr>";
+        }
+
+        html += "<td style='text-align: center;'>" + (i + 1) + "</td>";
+        // var isValue = false; //记录是否赋值
+        html += "<td style='text-align: center;' >" + "mao" + " </td>";
+        html += "<td style='text-align: center;' >" + "mao" + " </td>";
+        html += "<td style='text-align: center;' >" + "mao" + " </td>";
+        html += "<td style='text-align: center;' >" + "mao" + " </td>";
+
+        html += "</tr>";
+        $("#tabtr").html(html);
+    }
+
+    $('#btnRB').on('click', function () {
+        window.location.href = "/yeweihui/home.html";
+    });
+
+    $("#js_input_gzzd").select({
+        title: "选择工作驻地",
+        items: [
+            {
+                title: "武汉市",
+                value: "1",
+            },
+            {
+                title: "宜昌市",
+                value: "2",
+            },
+            {
+                title: "当阳市",
+                value: "3",
+            }]
+    });
+
+    $("#js_input_jrszd").select({
+        title: "选择今日所在地",
+        items: [
+            {
+                title: "武汉市",
+                value: "1",
+            }, {
+                title: "宜昌市",
+                value: "2",
+            },
+            {
+                title: "当阳市",
+                value: "3",
+            },
+            {
+                title: "其它地点",
+                value: "4",
+            }]
+    });
+
+    $("#js_input_sf").select({
+        title: "",
+        items: [
+            {
+                title: "是",
+                value: "1",
+            },
+            {
+                title: "否",
+                value: "2",
+            }]
+    });
+
+    $("#js_input_cfd").select({
+        title: "选择出发地",
+        items: [
+            {
+                title: "武汉市",
+                value: "1",
+            }, {
+                title: "宜昌市",
+                value: "2",
+            },
+            {
+                title: "当阳市",
+                value: "3",
+            },
+            {
+                title: "其它地点",
+                value: "4",
+            }]
+    });
+
+    $("#js_input_mdd").select({
+        title: "选择目的地",
+        items: [
+            {
+                title: "武汉市",
+                value: "1",
+            }, {
+                title: "宜昌市",
+                value: "2",
+            },
+            {
+                title: "当阳市",
+                value: "3",
+            },
+            {
+                title: "其它地点",
+                value: "4",
+            }]
+    });
+
+    $("#js_input_cxfs").select({
+        title: "选择出行方式",
+        items: [
+            {
+                title: "自驾",
+                value: "1",
+            },
+            {
+                title: "飞机",
+                value: "2",
+            },
+            {
+                title: "火车",
+                value: "3",
+            },
+            {
+                title: "长途汽车",
+                value: "4",
+            }]
+    });
+
+
+
+}
+
+//近日报告
+function ribaoInitialization(reportId) {
+    if (reportId == null)
+        return;
+    $.ajax({
+        url: '/home/home/queryRibaoRefresh',
+        data: {
+            reportId: reportId
+        },
+        type: 'GET',
+        success: function (data) {
+            console.log(data);
+            if (data.data.length > 0) {
+                hasData = true;
+                data.data.forEach(function (v) {
+                    ribao_cell(v);
+                });
+            }
+        },
+        error: function () {
+        }
+    });
+}
+
+//刷新今日日报
+function ribao_refrash() {
+    var userId = $("#userId").val();
+    $.ajax({
+        url: '/home/home/queryRibao',
+        data: {
+            userCreate: userId
+        },
+        type: 'GET',
+        success: function (data) {
+            console.log(data);
+            if (data.data == undefined) {
+                $('#rb_family').empty();
+            }
+            else {
+                $('#rb_family').empty();
+                if (data.data.length > 0) {
+                    hasData = true;
+                    data.data.forEach(function (v) {
+                        ribao_cell(v);
+                    });
+                } else {
+                }
+            }
+        },
+        error: function () {
+        }
+    });
+}
+
+function ribao_cell(v) {
+    var userName = v.userName + ":";
+    var grender = getGreder(v.grender);
+    var age = v.age;
+    var familyStatus = "";
+    if (v.familyStatus != 0)
+        familyStatus = "基本状况:" + getFamilyStatus(v.familyStatus) + ";";
+    var medical = "";
+    if (v.medical != 0)
+        medical = "是否确诊:" + getMedical(v.medical) + ";";
+    var singleRoom = "";
+    if (v.singleRoom != 0)
+        singleRoom = "单间隔离:" + getSingleRoom(v.singleRoom) + ";";
+    if (v.singleRoom == 0 && v.medical != 0)
+        singleRoom = "单间隔离:" + getSingleRoom(v.singleRoom) + ";";
+    var temperature = "体温:" + v.temperature + ";";
+    var cough = "";
+    if (v.cough != 0)
+        cough = "咳嗽现象:" + getCough(v.cough) + ";";
+    var muscle = "";
+    if (v.muscle != 0)
+        muscle = "肌肉酸痛:" + getMuscle(v.muscle) + ";";
+    var dyspnea = "";
+    if (v.dyspnea != 0)
+        dyspnea = "呼吸困难:" + getDyspnea(v.dyspnea) + ";";
+    var fatigue = "";
+    if (v.fatigue != 0)
+        fatigue = "乏力现象:" + getFatigue(v.fatigue) + ";";
+    var diarrhea = "";
+    if (v.diarrhea != 0)
+        diarrhea = "腹泻现象:" + getDiarrhea(v.diarrhea) + ";";
+    var others = "";
+    if (v.others != "")
+        others = "其他描述:" + v.others + ";";
+    var scoreRezult = "";
+    if (v.scoreRezult != 0)
+        scoreRezult = "评估结果:" + getScoreRezult(v.scoreRezult, v.temperatureScore) + ";";
+    $('#rb_family').append($('<div class="weui-media-box weui-media-box_text" style="height: 15vh">\n' +
+        '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #bc4246" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId) + ')\'>删除</a>\n' +
+        '                                      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'updateSuspected(' + JSON.stringify(v.suspectedId) + ')\'>修改</a></h4>\n' +
+        '                                      <p class="weui-media-box__desc" style="height: 80%">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
+        '                                    </div>\n' +
+        '                              '));
+}
+
+
+function ribao_cancel() {
+    $('#cancel').on('click', function () {
+
+        if ($('#ribao')[0].style.display == 'none') {
+            $('#notOpenRibao').toggle();
+            $('#ribao')[0].style.display = '';
+        } else {
+            $('#notOpenRibao')[0].style.display = '';
+            $('#ribao')[0].style.display = 'none';
+        }
+        clearShow();
+    });
+}
+
+function ribaoCommit() {
+    var suspectedId = $("#suspectedId").val();
+    var userId = $("#userId").val();
+    var userName = $("#js_input_user_name").val();
+    var grender = $("#js_input_user_sex").attr("data-values") == undefined ? 0 : $("#js_input_user_sex").attr("data-values");
+    var age = $("#js_input_user_age").val();
+    //不能同时选择服用和未服用
+    if ($("input[name='checkbox1']:checked").val() == "on" && $("input[name='checkbox2']:checked").val() == "on") {
+        $.alert("心脑血管不能同时选择服用和未服用");
+        return;
+    }
+    //男性不能选择妊娠期
+    if ($("#js_input_user_sex").attr("data-values") == 1 && $("input[name='checkbox7']:checked").val() == "on") {
+        $.alert("男性不能选择妊娠期");
+        return;
+    }
+    //家庭状态
+    var familyStatus = "";
+    if ($("input[name='checkbox1']:checked").val() == "on")
+        familyStatus += "1";
+    else
+        familyStatus += "0";
+    if ($("input[name='checkbox2']:checked").val() == "on")
+        familyStatus += ",1";
+    else
+        familyStatus += ",0";
+    if ($("input[name='checkbox3']:checked").val() == "on")
+        familyStatus += ",1";
+    else
+        familyStatus += ",0";
+    if ($("input[name='checkbox4']:checked").val() == "on")
+        familyStatus += ",1";
+    else
+        familyStatus += ",0";
+    if ($("input[name='checkbox5']:checked").val() == "on")
+        familyStatus += ",1";
+    else
+        familyStatus += ",0";
+    if ($("input[name='checkbox6']:checked").val() == "on")
+        familyStatus += ",1";
+    else
+        familyStatus += ",0";
+    if ($("input[name='checkbox7']:checked").val() == "on")
+        familyStatus += ",1";
+    else
+        familyStatus += ",0";
+    //var familyStatus = $("#js_input_user_status").attr("data-values") == undefined ? 0 : $("#js_input_user_status").attr("data-values");
+    //var statusDesp = $("#jibenmiaoshu").val() == undefined ? "" : $("#jibenmiaoshu").val();
+    var statusDesp = "";
+    var medical = $("#switchQuezhen").attr("data-values") == undefined ? 0 : $("#switchQuezhen").attr("data-values");
+    var singleRoom = $("#switchDanjiangeli").attr("data-values") == undefined ? 0 : $("#switchDanjiangeli").attr("data-values");
+    var temperature = $("#js_input_user_tiwen").val() == "" ? 0 : $("#js_input_user_tiwen").val();
+    var cough = $("#js_input_user_kesou").attr("data-values") == undefined ? 0 : $("#js_input_user_kesou").attr("data-values");
+    var muscle = $("#js_input_user_jirou").attr("data-values") == undefined ? 0 : $("#js_input_user_jirou").attr("data-values");
+    var dyspnea = $("#js_input_user_huxi").attr("data-values") == undefined ? 0 : $("#js_input_user_huxi").attr("data-values");
+    var fatigue = $("#js_input_user_fali").attr("data-values") == undefined ? 0 : $("#js_input_user_fali").attr("data-values");
+    var diarrhea = $("#js_input_user_fuxie").attr("data-values") == undefined ? 0 : $("#js_input_user_fuxie").attr("data-values");
+    var others = $("#shuruqita").val() == undefined ? "" : $("#shuruqita").val();
+    var scoreRezult = $("#js_input_score_rezult_value").val() == undefined ? "" : $("#js_input_score_rezult_value").val();
+    var temperatureScore = $("#js_input_temperature_score").val() == undefined ? "" : $("#js_input_temperature_score").val();
+    var scoreHistroy = $("#js_input_score_histroy").val() == undefined ? "" : $("#js_input_score_histroy").val();
+    var score = $("#js_input_score").val() == undefined ? "" : $("#js_input_score").val();
+
+    if (userName == undefined || userName == '') {
+        $.alert("请填写姓名");
+        return;
+    }
+    if (grender == 0) {
+        $.alert("请填写性别");
+        return;
+    }
+    if (age == undefined || age == '') {
+        $.alert("请填写年龄");
+        return;
+    }
+    if (age > 150 || age < 0) {
+        $.alert("请填写正确的年龄");
+        return;
+    }
+
+    if (temperature <= 0) {
+        $.alert("请填写体温");
+        return;
+    }
+    if (temperature > 50 || temperature < 30) {
+        $.alert("请填写正确的体温");
+        return;
+    }
+
+    $.ajax({
+        url: '/home/addRibao',
+        type: "post",
+        data: {
+            "suspectedId": suspectedId,
+            "userCreate": userId,
+            "userName": userName,
+            "grender": grender,
+            "age": age,
+            "familyStatus": familyStatus,
+            "statusDesp": statusDesp,
+            "medical": medical,
+            "singleRoom": singleRoom,
+            "temperature": temperature,
+            "cough": cough,
+            "muscle": muscle,
+            "dyspnea": dyspnea,
+            "fatigue": fatigue,
+            "diarrhea": diarrhea,
+            "others": others,
+            "scoreRezult": scoreRezult,
+            "temperatureScore": temperatureScore,
+            "scoreHistroy": scoreHistroy,
+            "score": score,
+        },
+        success: function (data) {
+            if (data.msgReport == "2") {
+                $.toast("家人姓名不能重复,如果重复,可以带上称呼");
+                return;
+            }
+            if ($('#ribao')[0].style.display == 'none') {
+                $('#notOpenRibao').toggle();
+                $('#ribao')[0].style.display = '';
+            } else {
+                $('#notOpenRibao')[0].style.display = '';
+                $('#ribao')[0].style.display = 'none';
+            }
+            $('#ribao_jinrijujian').empty();
+            $('#ribao_jinrijujian').append(data.safetyNum);
+
+            ribao_refrash();
+
+            clearShow();
+            document.getElementById("btn_shangbao").style['background-color'] = "#0bb20c";
+        },
+    });
+}
+
+function deleteSuspected(suspectedId) {
+    $.ajax({
+        url: '/home/deleteSuspected',
+        type: "post",
+        data: {
+            "suspectedId": suspectedId
+        },
+        success: function (data) {
+            $('#ribao_jinrijujian').empty();
+            $('#ribao_jinrijujian').append(data.safetyNum);
+            ribao_refrash();
+        },
+    });
+}
+
+function updateSuspected(suspectedId) {
+    $("#suspectedId").val("");
+    if ($('#ribao')[0].style.display == 'none') {
+        $('#notOpenRibao').toggle();
+        $('#ribao')[0].style.display = '';
+    } else {
+        $('#notOpenRibao')[0].style.display = '';
+        $('#ribao')[0].style.display = 'none';
+    }
+    $.ajax({
+        url: '/home/selectSuspected',
+        get: "get",
+        data: {
+            "suspectedId": suspectedId
+        },
+        success: function (data) {
+            // console.log(data);
+            if (data) {
+                var suspected = data;
+                $("#suspectedId").val(suspected.suspectedId);
+                $("#js_input_user_sex").val(getGreder(suspected.grender));
+                $("#js_input_user_sex").attr("data-values", suspected.grender);
+                $("#js_input_user_name").val(suspected.userName);
+                $("#js_input_user_age").val(suspected.age);
+                //基本情况
+                if (suspected.familyStatus != "") {
+                    var familyStatusList = suspected.familyStatus.split(",");
+                    if (familyStatusList[0] == 1)
+                        $("input[name='checkbox1']").prop("checked", "checked");
+                    else
+                        $("input[name='checkbox1']").removeAttr("checked");
+                    if (familyStatusList[1] == 1)
+                        $("input[name='checkbox2']").prop("checked", "checked");
+                    else
+                        $("input[name='checkbox2']").removeAttr("checked");
+                    if (familyStatusList[2] == 1)
+                        $("input[name='checkbox3']").prop("checked", "checked");
+                    else
+                        $("input[name='checkbox3']").removeAttr("checked");
+                    if (familyStatusList[3] == 1)
+                        $("input[name='checkbox4']").prop("checked", "checked");
+                    else
+                        $("input[name='checkbox4']").removeAttr("checked");
+                    if (familyStatusList[4] == 1)
+                        $("input[name='checkbox5']").prop("checked", "checked");
+                    else
+                        $("input[name='checkbox5']").removeAttr("checked");
+                    if (familyStatusList[5] == 1)
+                        $("input[name='checkbox6']").prop("checked", "checked");
+                    else
+                        $("input[name='checkbox6']").removeAttr("checked");
+                    if (familyStatusList[6] == 1)
+                        $("input[name='checkbox7']").prop("checked", "checked");
+                    else
+                        $("input[name='checkbox7']").removeAttr("checked");
+
+                }
+                // $("#js_input_user_status").val(getFamilyStatus(suspected.familyStatus));
+                // $("#js_input_user_status").attr("data-values", suspected.familyStatus);
+
+                // $("#jibenmiaoshu").val(suspected.statusDesp);
+
+                $("#switchQuezhen").val(getMedical(suspected.medical));
+                $("#switchQuezhen").attr("data-values", suspected.medical);
+
+                $("#switchDanjiangeli").val(getSingleRoom(suspected.singleRoom));
+                $("#switchDanjiangeli").attr("data-values", suspected.singleRoom);
+
+                $("#js_input_user_tiwen").val(suspected.temperature);
+
+                $("#js_input_user_kesou").val(getCough(suspected.cough));
+                $("#js_input_user_kesou").attr("data-values", suspected.cough);
+
+                $("#js_input_user_jirou").val(getMuscle(suspected.muscle));
+                $("#js_input_user_jirou").attr("data-values", suspected.muscle);
+
+                $("#js_input_user_huxi").val(getDyspnea(suspected.dyspnea));
+                $("#js_input_user_huxi").attr("data-values", suspected.dyspnea);
+
+                $("#js_input_user_fali").val(getFatigue(suspected.fatigue));
+                $("#js_input_user_fali").attr("data-values", suspected.fatigue);
+
+                $("#js_input_user_fuxie").val(getDiarrhea(suspected.diarrhea));
+                $("#js_input_user_fuxie").attr("data-values", suspected.diarrhea);
+
+                $("#shuruqita").val(suspected.others);
+                $("#js_input_score_rezult").val(getScoreRezult(suspected.scoreRezult, suspected.temperatureScore));
+                $("#js_input_score_rezult_value").val(suspected.scoreRezult);
+                $("#js_input_temperature_score").val(suspected.temperatureScore);
+                $("#js_input_score_histroy").val(suspected.scoreHistroy);
+                $("#js_input_score").val(suspected.score);
+            }
+        },
+    });
+
+}
+
+
+
+
+$("#my-input-ribao").calendar({
+    dateFormat: 'yyyy-mm-dd',
+    inputReadOnly: false,
+    onChange: function (p, values, displayValues) {
+        var reportDate = values.toString();
+        var userId = $("#userId").val();
+        $.ajax({
+            url: '/home/home/queryRibaoReportDate',
+            data: {
+                "userCreate": userId,
+                "reportDate": reportDate,
+            },
+            type: 'GET',
+            success: function (data) {
+                if (data.data == undefined) {
+                    $('#ribao_famliy').empty();
+                }
+                else {
+                    if (data.data.length > 0) {
+                        $('#ribao_famliy').empty();
+                        data.data.forEach(function (v) {
+                            helpValue1(v);
+                        });
+                    } else {
+
+                    }
+                }
+            },
+            error: function () {
+            }
+        });
+    }
+});
+
+
+function helpValue1(v) {
+    var userName = v.userName + ":";
+    var grender = getGreder(v.grender);
+    var age = v.age;
+    var familyStatus = "";
+    if (v.familyStatus != 0)
+        familyStatus = "基本状况:" + getFamilyStatus(v.familyStatus) + ";";
+    var medical = "";
+    if (v.medical != 0)
+        medical = "是否确诊:" + getMedical(v.medical) + ";";
+    var singleRoom = "";
+    if (v.singleRoom != 0)
+        singleRoom = "单间隔离:" + getSingleRoom(v.singleRoom) + ";";
+    if (v.singleRoom == 0 && v.medical != 0)
+        singleRoom = "单间隔离:" + getSingleRoom(v.singleRoom) + ";";
+    var temperature = "体温:" + v.temperature + ";";
+    var cough = "";
+    if (v.cough != 0)
+        cough = "咳嗽现象:" + getCough(v.cough) + ";";
+    var muscle = "";
+    if (v.muscle != 0)
+        muscle = "肌肉酸痛:" + getMuscle(v.muscle) + ";";
+    var dyspnea = "";
+    if (v.dyspnea != 0)
+        dyspnea = "呼吸困难:" + getDyspnea(v.dyspnea) + ";";
+    var fatigue = "";
+    if (v.fatigue != 0)
+        fatigue = "乏力现象:" + getFatigue(v.fatigue) + ";";
+    var diarrhea = "";
+    if (v.diarrhea != 0)
+        diarrhea = "腹泻现象:" + getDiarrhea(v.diarrhea) + ";";
+    var others = "";
+    if (v.others != "")
+        others = "其他描述:" + v.others + ";";
+    var scoreRezult = "";
+    if (v.scoreRezult != 0)
+        scoreRezult = "评估结果:" + getScoreRezult(v.scoreRezult, v.temperatureScore) + ";";
+    $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text" style="height: 15vh">\n' +
+        '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '</h4>\n' +
+        '                                      <p class="weui-media-box__desc" style="height: 80%">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
+        '                                    </div>\n' +
+        '                              '));
+}
+
+
+function getGreder(greder) {
+    if (greder == 1)
+        return "男";
+    else if (greder == 2)
+        return "女";
+    return "";
+}
+
+function getFamilyStatus(familyStatus) {
+    var familyStatusList = familyStatus.split(",");
+    var familyStatusString = "";
+    if (familyStatus == '0,0,0,0,0,0,0')
+        familyStatusString += "无病史,";
+    else {
+        if (familyStatusList[0] == 1)
+            familyStatusString += "心脑血管疾病(服用ARB),";
+        if (familyStatusList[1] == 1)
+            familyStatusString += "心脑血管疾病(未服ARB),";
+        if (familyStatusList[2] == 1)
+            familyStatusString += "呼吸系统病史,";
+        if (familyStatusList[3] == 1)
+            familyStatusString += "肿瘤病史,";
+        if (familyStatusList[4] == 1)
+            familyStatusString += "糖尿病史,";
+        if (familyStatusList[5] == 1)
+            familyStatusString += "服用过激素药物,";
+        if (familyStatusList[6] == 1)
+            familyStatusString += "妊娠期,";
+    }
+    return familyStatusString.substring(0, familyStatusString.length - 1);
+}
+
+function getCough(cough) {
+    if (cough == 0)
+        return "无咳嗽";
+    else if (cough == 1)
+        return "偶尔短暂咳嗽";
+    else if (cough == 2)
+        return "咳嗽轻度影响生活";
+    else if (cough == 3)
+        return "咳嗽严重影响生活";
+    return "";
+}
+
+function getMuscle(muscle) {
+    if (muscle == 0)
+        return "无";
+    else if (muscle == 1)
+        return "按压有";
+    else if (muscle == 2)
+        return "偶尔";
+    else if (muscle == 3)
+        return "持续有";
+    return "";
+}
+
+function getDyspnea(dyspnea) {
+    if (dyspnea == 0)
+        return "无";
+    else if (dyspnea == 1)
+        return "急走或上坡气短";
+    else if (dyspnea == 2)
+        return "气短而走路变慢";
+    else if (dyspnea == 3)
+        return "走路数分钟后气短";
+    else if (dyspnea == 4)
+        return "气短无法离开房间";
+    return "";
+}
+
+function getFatigue(fatigue) {
+    if (fatigue == 0)
+        return "无";
+    else if (fatigue == 1)
+        return "体力劳动后不能恢复";
+    else if (fatigue == 2)
+        return "轻体力活非常累";
+    else if (fatigue == 3)
+        return "不能正常生活";
+    return "";
+}
+
+function getMedical(medical) {
+    if (medical == 0)
+        return "否";
+    else if (medical == 1)
+        return "是";
+    return "";
+}
+
+function getSingleRoom(singleRoom) {
+    if (singleRoom == 0)
+        return "否";
+    else if (singleRoom == 1)
+        return "是";
+    return "";
+}
+
+
+function getDiarrhea(diarrhea) {
+    if (diarrhea == 0)
+        return "无";
+    else if (diarrhea == 1)
+        return "轻度腹泻(少于3次)";
+    else if (diarrhea == 2)
+        return "中度腹泻(4-6次)";
+    else if (diarrhea == 3)
+        return "重度腹泻(超过6次)";
+    return "";
+}
+
+function clearShow() {
+    console.log("qingkong")
+    $("#suspectedId").val("");
+    $("#js_input_user_sex").val("");
+    $("#js_input_user_sex").attr("data-values", "");
+    $("#js_input_user_name").val("");
+    $("#js_input_user_age").val("");
+    $("#js_input_user_status").val("");
+    $("#js_input_user_status").attr("data-values", "");
+
+    $("#jibenmiaoshu").val("");
+
+    $("#switchQuezhen").val("");
+    $("#switchQuezhen").attr("data-values", "");
+
+    $("#switchDanjiangeli").val("");
+    $("#switchDanjiangeli").attr("data-values", "");
+
+    $("#js_input_user_tiwen").val("");
+
+    $("#js_input_user_kesou").val("");
+    $("#js_input_user_kesou").attr("data-values", "");
+
+    $("#js_input_user_jirou").val("");
+    $("#js_input_user_jirou").attr("data-values", "");
+
+    $("#js_input_user_huxi").val("");
+    $("#js_input_user_huxi").attr("data-values", "");
+
+    $("#js_input_user_fali").val("");
+    $("#js_input_user_fali").attr("data-values", "");
+
+    $("#js_input_user_fuxie").val("");
+    $("#js_input_user_fuxie").attr("data-values", "");
+
+    $("#shuruqita").val("");
+    $("#js_input_score_rezult").val("");
+    $("#js_input_score_rezult_value").val("");
+    $("#js_input_temperature_score").val("");
+    $("#js_input_score_histroy").val("");
+    $("#js_input_score").val("");
+}
+
+//健康评估
+$('#ribao_score').on('click', function () {
+    var suspectedId = $("#suspectedId").val();
+    var userId = $("#userId").val();
+    var userName = $("#js_input_user_name").val();
+    var medical = $("#switchQuezhen").attr("data-values") == undefined ? 0 : $("#switchQuezhen").attr("data-values");
+    var temperature = $("#js_input_user_tiwen").val() == "" ? 0 : $("#js_input_user_tiwen").val();
+    var cough = $("#js_input_user_kesou").attr("data-values") == undefined ? 0 : $("#js_input_user_kesou").attr("data-values");
+    var muscle = $("#js_input_user_jirou").attr("data-values") == undefined ? 0 : $("#js_input_user_jirou").attr("data-values");
+    var dyspnea = $("#js_input_user_huxi").attr("data-values") == undefined ? 0 : $("#js_input_user_huxi").attr("data-values");
+    var fatigue = $("#js_input_user_fali").attr("data-values") == undefined ? 0 : $("#js_input_user_fali").attr("data-values");
+    var diarrhea = $("#js_input_user_fuxie").attr("data-values") == undefined ? 0 : $("#js_input_user_fuxie").attr("data-values");
+    if (userName == undefined || userName == '') {
+        $.alert("请填写姓名");
+        return;
+    }
+    if (temperature <= 0) {
+        $.alert("请填写体温");
+        return;
+    }
+    if (temperature > 50 || temperature < 30) {
+        $.alert("请填写正确的体温");
+        return;
+    }
+
+    $.ajax({
+        url: '/home/addScore',
+        type: "post",
+        data: {
+            "userName": userName,
+            "suspectedId": suspectedId,
+            "userCreate": userId,
+            "medical": medical,
+            "temperature": temperature,
+            "cough": cough,
+            "muscle": muscle,
+            "dyspnea": dyspnea,
+            "fatigue": fatigue,
+            "diarrhea": diarrhea,
+        },
+        success: function (data) {
+            if (data == undefined) {
+                $('#js_input_score_rezult').empty();
+                $('#js_input_score_rezult_value').empty();
+                $('#js_input_temperature_score').empty();
+                $('#js_input_score_histroy').empty();
+                $('#js_input_score').empty();
+            }
+            else {
+                $('#js_input_score_rezult').empty();
+                $('#js_input_temperature_score').empty();
+                $('#js_input_score_histroy').empty();
+                $('#js_input_score').empty();
+                var ScoreRezult = getScoreRezult(data.scoreRezult, data.temperatureScore);
+                $("#js_input_score_rezult").val(ScoreRezult);
+                $("#js_input_score_rezult_value").val(data.scoreRezult);
+                $("#js_input_temperature_score").val(data.temperatureScore);
+                $("#js_input_score_histroy").val(data.scoreHistory);
+                $("#js_input_score").val(data.score);
+            }
+        },
+    });
+});
+
+
+function getScoreRezult(scoreRezult, temperatureScore) {
+    if (scoreRezult == 0)
+        return "未评估";
+    else if (scoreRezult == 1) {
+        if (temperatureScore > 1)
+            return "正常,间隔时间服用退烧药,多休息,多喝水";
+        else
+            return "正常";
+    }
+    else if (scoreRezult == 2) {
+        if (temperatureScore > 1)
+            return "注意观察,间隔时间服用退烧药,多休息,多喝水";
+        else
+            return "注意观察";
+    }
+    else if (scoreRezult == 3)
+        return "联系社区医生(或者在线问诊)";
+    else if (scoreRezult == 4)
+        return "尽快就诊";
+    return "";
+}
+
+
+

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

@@ -32,7 +32,7 @@
             <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>
+            <div class="weui-tabbar__icon"><img src="/static/images/wx/upload.png" alt=""></div>
             <p class="weui-tabbar__label">团购</p>
         </a>
     <#--<a href="#tab3" class="weui-tabbar__item">-->

+ 10 - 6
whepi-ui/templates/yeweihui/tgPublish.ftl

@@ -156,9 +156,11 @@
         //     return;
         // }
 
-        if (parseInt(maxnum) < parseInt(minnum)) {
-            $.alert("最大订量应大于或等于最低起送量");
-            return;
+        if (maxnum != "0" && minnum != "0") {
+            if (parseInt(maxnum) < parseInt(minnum)) {
+                $.alert("最大订量应大于或等于最低起送量");
+                return;
+            }
         }
 
         // if (parseInt(itemNum) <= 0) {
@@ -166,9 +168,11 @@
         //     return;
         // }
 
-        if (parseInt(maxnum) < parseInt(itemNum)) {
-            $.alert("最大订量应大于或等于个人限额");
-            return;
+        if (maxnum != "0" && itemNum != "0") {
+            if (parseInt(maxnum) < parseInt(itemNum)) {
+                $.alert("最大订量应大于或等于个人限额");
+                return;
+            }
         }
 
         let curTimestamp =(new Date()).valueOf();

+ 1 - 1
whepi-ui/templates/yeweihui/tuangouMemberList.ftl

@@ -84,7 +84,7 @@
     $('#tg_member_xiaoqu').html(members[0].uptownName);
     $('#tg_member_num').append(totalNum);
     $('#tg_member_count').append(members.length);
-    $('#tg_member_totoalPrice').append(totalPrice);
+    $('#tg_member_totoalPrice').append(totalPrice.toFixed(2));
 
     $("#tg_member_export").attr('href', '/yeweihui/tuangou/member/list/export?jmId=' + tgItem.jmId);
     $('#tg_member_export_url_detail').val(window.location.hostname + '/yeweihui/tuangou/member/list/export?jmId=' + tgItem.jmId);

+ 4 - 0
whepi-web/src/main/java/com/bofeng/dao/JmTuangouDao.java

@@ -5,8 +5,10 @@ import com.bofeng.entity.JmTuangou;
 import com.yvan.PageDb;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.joda.time.DateTime;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
 import java.util.List;
 
 @Mapper
@@ -43,4 +45,6 @@ public interface JmTuangouDao extends BaseMapper<JmTuangou> {
 
   JmTuangou getSelectOneRoleId(@Param("jmId") Long jmId);
 
+  int updateRemarkByJmIdzbxd(@Param("jmId") Long jmId, @Param("remark") String remark, @Param("tgEndTime")Date tgEndTime, @Param("tgDeliverTime")Date tgDeliverTime);
+
 }

+ 1 - 0
whepi-web/src/main/java/com/bofeng/dao/OutUserMapper.java

@@ -15,6 +15,7 @@ import java.util.Map;
 @Repository
 public interface OutUserMapper extends BaseMapper<OutUser> {
 
+
     @Select("SELECT * FROM out_user WHERE name = #{name} and phone = #{phone} and start_date <= curdate() and end_date >= curdate()")
     OutUser getOutUserByPhone(@Param("name") String name, @Param("phone") Long phone);
 

+ 39 - 57
whepi-web/src/main/java/com/bofeng/service/BuyService.java

@@ -27,44 +27,29 @@ public class BuyService {
   @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
   public int buyGroup(Buy buy) {
     Buy buy1 = buyMapper.selectBuyOne(buy.getUserId(), buy.getJmId());
-    JmTuangou roleType = jmTuangouDao.getSelectOneRoleId(buy.getJmId());
-    if (buy1 != null) {
-      JmTuangou jmTuangou = jmTuangouDao.selectJmTuangouByJmId(buy1.getJmId());
-      Buy buy2 = buyMapper.selectById(buy1.getBuyId());
-      if (roleType.getRoleType() != 1) {
-        if (jmTuangou.getTgMaxNum().intValue() >= jmTuangou.getCurrentNum().intValue() - buy2.getBuyCount().intValue() + buy.getBuyCount().intValue()) {
-          //个人限额(指挥部的限额 和 管理员的限额)
-          if (roleType.getTgItemNum().intValue() != 0 && roleType.getTgItemNum().intValue() < buy.getBuyCount().intValue()) {
-            return 4;
-          }
-          buy.setBuyId(buy1.getBuyId());
-          return buyMapper.updateById(buy);
-        } else {
-          return 3;//不允许更改团购数量
-        }
-      } else {
-        //指挥部的更改
-        //个人限额(指挥部的限额 和 管理员的限额)
-        if (roleType.getTgItemNum().intValue() != 0 && roleType.getTgItemNum().intValue() < buy.getBuyCount().intValue()) {
-          return 4;
-        }
-        buy.setBuyId(buy1.getBuyId());
-        return buyMapper.updateById(buy);
-      }
-    }
-    //1 是指挥部
-    if (roleType.getRoleType() != 1) {
-      //第一次购买团购数量大于最大上限数量不允许
-      JmTuangou jmTuangou = jmTuangouDao.selectJmTuangouByJmId(buy.getJmId());
-      if (jmTuangou.getTgMaxNum().intValue() < jmTuangou.getCurrentNum().intValue() + buy.getBuyCount().intValue()) {
+    JmTuangou jmTuangou = jmTuangouDao.selectJmTuangouByJmId(buy.getJmId());//团购主表
+    if (buy1 != null) {//判断是否是第一次添加
+      //JmTuangou jmTuangou = jmTuangouDao.selectJmTuangouByJmId(buy.getJmId());
+
+      //最大上限有的话就遵循
+      if (jmTuangou.getTgMaxNum().intValue() != 0 && jmTuangou.getTgMaxNum().intValue() < jmTuangou.getCurrentNum().intValue() + buy.getBuyCount().intValue()) {
         return 3;
       }
+      //单人限额有的话的遵循
+      if (jmTuangou.getTgItemNum().intValue() != 0 && jmTuangou.getTgItemNum().intValue() < buy.getBuyCount().intValue()) {
+        return 4;
+      }
+      buy.setBuyId(buy1.getBuyId());
+      return buyMapper.updateById(buy);
     }
-    //个人限额(指挥部的限额 和 管理员的限额)
-    if (roleType.getTgItemNum().intValue() != 0 && roleType.getTgItemNum().intValue() < buy.getBuyCount().intValue()) {
+    //最大上限有的话就遵循
+    if (jmTuangou.getTgMaxNum() != 0 && jmTuangou.getTgMaxNum().intValue() < jmTuangou.getCurrentNum().intValue() + buy.getBuyCount().intValue()) {
+      return 3;
+    }
+    //单人限额有的话的遵循
+    if (jmTuangou.getTgItemNum().intValue() != 0 && jmTuangou.getTgItemNum().intValue() < buy.getBuyCount().intValue()) {
       return 4;
     }
-
     buy.setBuyId(IdWorker.getId());
     buy.setUserCreate(buy.getUserId());
     buy.setTimeCreate(new DateTime());
@@ -114,38 +99,35 @@ public class BuyService {
   //截止日期状态的更改
   @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
   public int updateStatus() {
+    //团购的在团状态
     List<JmTuangou> jmTuangous = jmTuangouDao.selectAll();
     if (jmTuangous != null && jmTuangous.size() > 0) {
       for (JmTuangou list : jmTuangous) {
-        //判断是指挥部还是管理员
-        if (list.getRoleType() == 1) {
-          if (list.getTgEndTime().getTime() < new DateTime().getMillis()) {
-            jmTuangouDao.updateStatusByJmId(list.getJmId(), 2L);//发货
-          }
-        } else {
-          // 团购数量  最小起订量
+        //到了截止日期
+        if (list.getTgEndTime().getTime() < new DateTime().getMillis()) {
+          //已经到了截止日期  判断有没有人购买
           Buy buy = buyMapper.selectCountNum(list.getJmId());
-          //已经到截止时间
-          if (list.getTgEndTime().getTime() < new DateTime().getMillis()) {
-
-            if (buy != null) { //最小起订量
-              if (list.getTgMinNum().longValue() > buy.getCount().longValue()) {
-                jmTuangouDao.updateStatusByJmId(list.getJmId(), 4L);//取消
+          if (buy.getCount().intValue() > 0) {
+            //判断是否有最小起订量 只有达到最小量的并且是到截止时间的
+            if (list.getTgMinNum().intValue() != 0) {
+              if (buy.getCount().intValue() >= list.getTgMinNum().intValue()) {
+                if (buy.getCount().intValue() == 0 && list.getTgMinNum().intValue() == 0) {
+                  jmTuangouDao.updateStatusByJmId(list.getJmId(), 4L);//取消
+                } else if (buy.getCount().intValue() != 0) {
+                  jmTuangouDao.updateStatusByJmId(list.getJmId(), 2L);//发货
+                }
               } else {
-                jmTuangouDao.updateStatusByJmId(list.getJmId(), 2L);//发货
+                jmTuangouDao.updateStatusByJmId(list.getJmId(), 4L);//取消
               }
             } else {
-              jmTuangouDao.updateStatusByJmId(list.getJmId(), 4L);//取消
+              jmTuangouDao.updateStatusByJmId(list.getJmId(), 2L);//发货
             }
-          } /*else {
-            //团购数量已经过了最大起订量的 就直接发货
-            if (buy != null) {
-              if (list.getTgMaxNum().intValue() == buy.getCount().intValue()) {
-                jmTuangouDao.updateStatusByJmId(list.getJmId(), 2L);//发货
-              }
-            }
-          }*/
-        }
+          } else {
+            //已经到截止日期但是没人购买就取消
+            jmTuangouDao.updateStatusByJmId(list.getJmId(), 4L);//取消
+          }
+
+        }//已经到截止日期
       }
     }
     return 1;

+ 15 - 5
whepi-web/src/main/java/com/bofeng/service/JmTuangouService.java

@@ -192,13 +192,23 @@ public class JmTuangouService {
   }
 
   @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-  public Integer updateRemarkByJmId(Long jmId, Long status, String remark) {
-    if (status == 0) {
-      return jmTuangouDao.updateRemarkByJmId(jmId, remark);
+  public Integer updateRemarkByJmId(Long jmId, Long status, String remark, String endTime, String deliverTime) {
+    if (status == 0) { // 增补修订
+      SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+      Date tgEndTime = new Date();
+      Date tgDeliverTime = new Date();
+      try {
+        tgEndTime = sdf.parse(endTime);
+        tgDeliverTime = sdf.parse(deliverTime);
+      } catch (ParseException e) {
+        e.printStackTrace();
+      }
+      return jmTuangouDao.updateRemarkByJmIdzbxd(jmId, remark, tgEndTime, tgDeliverTime);
     }
-    if (remark.equals("")) {
+    if (remark.equals("")) {  // 完成
       return jmTuangouDao.updateStatusByJmId(jmId, status);
     }
+    // 取消
     return jmTuangouDao.updateStatusRemarkByJmId(jmId, status, remark);
   }
 
@@ -226,6 +236,6 @@ public class JmTuangouService {
 
   @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
   public int updateRemarkByJmIdzbxd(JmTuangou jmTuangou) {
-    return jmTuangouDao.updateRemarkByJmId(jmTuangou.getJmId(), jmTuangou.getRemark());
+    return jmTuangouDao.updateRemarkByJmIdzbxd(jmTuangou.getJmId(), jmTuangou.getRemark(),jmTuangou.getTgEndTime(),jmTuangou.getTgDeliverTime());
   }
 }

+ 11 - 2
whepi-web/src/main/java/com/bofeng/wx/WxController.java

@@ -152,7 +152,7 @@ public class WxController {
         val btnDesc = new WxMenuButton();
         btnDesc.setName("平台简介");
         val btn31 = new WxMenuButton();
-        btn31.setName("帮助");
+        btn31.setName("家庭手册");
         btn31.setType(WxConsts.MenuButtonType.VIEW);
         btn31.setUrl(
                 wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
@@ -160,15 +160,24 @@ public class WxController {
                         WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
         );
         val btn32 = new WxMenuButton();
-        btn32.setName("简介");
+        btn32.setName("管理员手册");
         btn32.setType(WxConsts.MenuButtonType.VIEW);
         btn32.setUrl(
                 wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
+                                "/home/adminHelp.html",
+                        WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
+        );
+        val btn33 = new WxMenuButton();
+        btn33.setName("简介");
+        btn33.setType(WxConsts.MenuButtonType.VIEW);
+        btn33.setUrl(
+                wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
                                 "/home/desc.html",
                         WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
         );
         btnDesc.getSubButtons().add(btn31);
         btnDesc.getSubButtons().add(btn32);
+        btnDesc.getSubButtons().add(btn33);
 //        btn3.getSubButtons().add(btnDesc);
 //        btn3.getSubButtons().add(btnHelp);
 

+ 2 - 2
whepi-web/src/main/java/com/bofeng/wx/controller/ScanController.java

@@ -139,7 +139,7 @@ public class ScanController {
                     model.put("into", "禁止外出");
                     model.put("errorMsg", "根据武汉市小区封闭管理规定,非特殊人员禁止出行!");
                     scanService.saveOutScan(userOpen.getUserId(), inType, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
-                    return new ModelAndView("/user/goOut.ftl", model);
+                    return new ModelAndView("/user/scan.ftl", model);
                 }
                 OutScan outScan = outScanMapper.getOutScanThreeday(userOpen.getUserId(), 2, outScanConf.getGoOutFre());
                 if (outScan != null) {
@@ -223,7 +223,7 @@ public class ScanController {
                 model.put("into", "禁止外出");
                 model.put("errorMsg", "根据武汉市小区封闭管理规定,非特殊人员禁止出行!");
                 scanService.saveOutScanEstate(userOpen.getUserId(), -1, model.get("errorMsg").toString());
-                return new ModelAndView("/user/goOut.ftl", model);
+                return new ModelAndView("/user/scanEstate.ftl", model);
             }
             List<MsReport> msReports = msReportMapper.selectMsReportLate(userOpen.getUserId());
             if (msReports.size() != 3) {

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

@@ -242,6 +242,11 @@ public class UserOpenController {
         return new ModelAndView("/home/homeHelp.ftl", model);
     }
 
+    @GetMapping("/home/adminHelp.html")
+    public ModelAndView adminHelp(ModelMap model) {
+        return new ModelAndView("/home/adminHelp.ftl", model);
+    }
+
     @GetMapping("/home/testOk.html")
     public ModelAndView testOk(ModelMap model, HttpServletResponse response) {
         response.setHeader("Access-Control-Allow-Credentials", "true");

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

@@ -167,6 +167,16 @@ public class YeWeiHuiController {
     return new ModelAndView("/yeweihui/ribao.ftl", model);
   }
 
+  @GetMapping("/lingyun/home.html")
+  public ModelAndView lingyunRibao(ModelMap model) {
+
+//        List<QzTask> taskList = qzTaskService.selectAll();
+//
+//        model.put("taskList", YvanUtil.toJsonPretty(taskList));
+
+    return new ModelAndView("/lingyun/home.ftl", model);
+  }
+
   @GetMapping("/yeweihui/ribaoDy")
   public Model<List<SysUptownHouse>> yeweihuiRibaoDy(Long str) {
 //        String[] split = str.split("&");
@@ -352,9 +362,13 @@ public class YeWeiHuiController {
   }
 
   @PostMapping("/yeweihui/groupBuyingCx/remark/add.json")
-  public Model groupBuyingCxRemarkAdd(@Pd(name = "jmId") Long jmId, @Pd(name = "status", required = false, defaultValue = "0") Long status, @Pd(name = "remark", required = false) String remark) {
+  public Model groupBuyingCxRemarkAdd(@Pd(name = "jmId") Long jmId,
+                                      @Pd(name = "status", required = false, defaultValue = "0") Long status,
+                                      @Pd(name = "remark", required = false) String remark,
+                                      @Pd(name = "endTime", required = false) String endTime,
+                                      @Pd(name = "deliverTime", required = false) String deliverTime) {
 
-    Integer success = jmTuangouService.updateRemarkByJmId(jmId, status, remark);
+    Integer success = jmTuangouService.updateRemarkByJmId(jmId, status, remark, endTime, deliverTime);
 
     if (success == 1) {
       return Model.newSuccess("操作成功");

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

@@ -45,7 +45,7 @@
     </select>
 
     <select id="selectCountNum" resultType="com.bofeng.entity.Buy">
-        select sum(buy_count) as count,jm_id from jm_buy where jm_id=#{jmId} and buy_status=1 GROUP BY jm_id
+        select IFNULL(sum(buy_count),0) as count from jm_buy where jm_id=#{jmId} and buy_status=1
     </select>
 
 </mapper>

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

@@ -98,5 +98,8 @@
         select * from jm_tuangou where jm_id=#{jmId}
     </select>
 
+    <update id="updateRemarkByJmIdzbxd">
+        update jm_tuangou set remark=#{remark},tg_end_time=#{tgEndTime},tg_deliver_time=#{tgDeliverTime}, time_update=now() where jm_id=#{jmId}
+    </update>
 
 </mapper>