未选中二级部门报错

admin-ui/app/whepi/clock/clock1.js

@@ -0,0 +1,220 @@
+define(function (require) {
+    return function (context) {
+
+      var $grid1, $form, $coma;
+
+      // 导出
+      function exportExcel() {
+        var queryForm = $form.formGet();
+        $.yvan.download({
+          method: 'post',
+          url: api('/clock/exSelectClockLY?queryProperties=' + queryForm.queryProperties + '&phone=' + queryForm.phone + '&unitId=' + queryForm.unitId + '&departmentId=' + queryForm.departmentId + '&dateSta=' + queryForm.dateSta + '&dateEnd=' + queryForm.dateEnd),
+          fileName: '签到管理-' + $.yvan.getMoment().format('YYYY-MM-DD HH:mm:ss') + '.xlsx'
+
+        });
+      }
+
+      // 输入搜索文本后点击回车按钮查询列表
+      function enterQueryGrid1(e) {
+        if (e.keyCode === 13) {
+          var tmp = $(this).val();
+          $form.formSet({queryProperties: tmp});
+          queryGrid1();
+        }
+      }
+      function enterQueryGrid2(e) {
+        if (e.keyCode === 13) {
+          var tmp = $(this).val();
+          $form.formSet({phone: tmp});
+          queryGrid1();
+        }
+      }
+      function enterQueryGrid3(e) {
+        if (e.keyCode === 13) {
+          var tmp = $(this).val();
+          $form.formSet({errorInfo: tmp});
+          queryGrid1();
+        }
+      }
+
+      //　检索条件查询
+      function queryGrid1() {
+        var queryUrl = '/clock/selectClockLY';// 自行替换此参数
+        var queryForm = $form.formGet();
+        if (!queryForm.dateSta) {
+          $form.formSet({dateSta: getFormatDate() + " 00:00:00"});
+          queryForm.dateSta = getFormatDate() + " 00:00:00";
+        }
+        if (!queryForm.dateEnd) {
+          $form.formSet({dateEnd: getFormatDate() + " 23:59:59"});
+          queryForm.dateEnd = getFormatDate() + " 23:59:59";
+        }
+        queryForm.roleCode = App.currentRoleCode;
+        $grid1.reload({
+          mtype: 'POST',
+          url: api(queryUrl),
+          queryParams: queryForm
+        }, true);
+      }
+
+      // 搜索按钮
+      var queryToolbarTitle = '签到管理';// 自行替换此参数
+      var queryToolbar = {
+        xtype: 'toolbar', title: queryToolbarTitle, items: [
+          {
+            text: '查询', iconCls: 'fa fa-search', onClick: function () {
+              queryGrid1();
+            }
+          }, {
+            text: '重置', iconCls: 'fa fa-refresh', onClick: function () {
+              $form.formClear();
+              queryGrid1();
+            }
+          }, {
+            text: '关闭', iconCls: 'fa fa-times-circle', onClick: function () {
+              App.closeMe(this);
+            }
+          }
+        ]
+      };
+
+      // 搜索条件
+      var queryForm = {
+        onRender: function () {
+          $form = $(this);
+        },
+        xtype: 'form',
+        items: [[
+          {
+            xtype: 'textbox',
+            label: '大门名称',
+            name: 'queryProperties',
+            prompt: "大门名称",
+            labelWidth: 'auto',
+            events: {keydown: enterQueryGrid1}, width: 250
+          },
+          {
+            xtype: 'textbox',
+            label: '姓名/电话',
+            name: 'phone',
+            prompt: "姓名/电话",
+            labelWidth: 'auto',
+            events: {keydown: enterQueryGrid2}, width: 250
+          },
+          {
+            xtype: 'datetimebox',
+            name: 'dateSta',
+            label: '进出时间',
+            labelWidth: 'auto',
+            width: 230,
+            onChange: function (data) {
+              /*  var expDateStart = $form.formGet().nextRepairDate;
+                var expDateEnd = $form.formGet().expDateEnd;
+                var expDateStart = new Date(expDateStart.replace("-", "/"));
+                var expDateEnd = new Date(expDateEnd.replace("-", "/"));
+                if (expDateStart > expDateEnd) {
+                    $.yvan.msg('起止日期必须大于起始日期');
+                    return;
+                }*/
+            }
+          },
+          {
+            xtype: 'datetimebox', label: '--', name: 'dateEnd', labelWidth: 'auto', width: 220,
+            onChange: function (data) {
+              /* var expDateStart = $form.formGet().nextRepairDate;
+               var expDateEnd = $form.formGet().expDateEnd;
+               var expDateStart = new Date(expDateStart.replace("-", "/"));
+               var expDateEnd = new Date(expDateEnd.replace("-", "/"));
+               if (expDateStart > expDateEnd) {
+                   $.yvan.msg('起止日期必须大于起始日期');
+                   return;
+               }*/
+            }
+          }
+          ],]
+      };
+
+      var gridToolbarTitle = '签到列表';// 自行替换此参数
+      var gridToolbar = {
+        xtype: 'toolbar',
+        title: gridToolbarTitle,
+        items: [
+          {
+            text: '导出', iconCls: 'fa fa-cloud-upload', onClick: function () {
+              exportExcel();
+            }
+          },
+          {
+            text: '分单位统计考勤', iconCls: 'fa fa-cloud-upload', onClick: function () {
+              var queryForm = $form.formGet();
+              $.yvan.download({
+                method: 'post',
+                url: api('/clock/exClockCount?queryProperties=' + queryForm.queryProperties + '&phone=' + queryForm.phone + '&unitId=' + queryForm.unitId + '&departmentId=' + queryForm.departmentId + '&dateSta=' + queryForm.dateSta + '&dateEnd=' + queryForm.dateEnd),
+                fileName: '分单位统计考勤-' + $.yvan.getMoment().format('YYYY-MM-DD HH:mm:ss') + '.xlsx'
+
+              });
+            }
+          },
+        ]
+      };
+
+      return {
+        north: {
+          height: 88,
+          /* split: true,
+           border: false,*///底框是否可变动
+          items: [
+            queryToolbar,
+            queryForm
+          ]
+        },
+        center: {
+          height: '60%',
+          split: true,
+          items:
+            {
+              onRender: function () {
+                $grid1 = $(this);
+                queryGrid1()
+              },
+              xtype: 'grid',
+              toolbar:
+              gridToolbar,
+              idField: 'joId',
+              autoSizeColumns: true,//序号多  正确显示
+              columns:
+                [
+                  [
+                    {field: 'uptownId', title: '小区id', maxWidth: 200, align: 'left', hidden: true},
+                    // {field: 'uptownName', title: '小区名称', maxWidth: 200, align: 'left',},
+                    {field: 'doorName', title: '出入大门', align: 'left',},
+                    {field: 'unit', title: '部门', maxWidth: 200,},
+                    {field: 'departmentName', title: '二级部门', maxWidth: 200, align: 'left',},
+                    {
+                      field: 'linkman',
+                      title: '用户名',
+                    },
+                    {
+                      field: 'phone',
+                      title: '电话',
+                    },
+                    {
+                      field: 'doorplate',
+                      title: '工号', maxWidth: 200,
+                    },
+                    {
+                      field: 'dateStr',
+                      title: '签到时间',
+                      align: 'left',
+                    },
+                    // {field: 'longitude', title: '经度', maxWidth: 200, align: 'left',},
+                    // {field: 'latitude', title: '纬度', maxWidth: 200, align: 'left',},
+                    // {field: 'address', title: '详细地址', maxWidth: 200, align: 'left',},
+                  ]
+                ]
+            }
+        }
+      };
+    };
+  }
+);

admin-ui/app/whepi/lingyun/addUser.js

@@ -56,7 +56,7 @@ define(function (require) {
         return {
             xtype: 'dialog',
             dialogId: 'dialogEnvLog',
-            title: context.isEdit ? '人员入职部门' : '人员入职部门',
+            title: context.isEdit ? '部门变更' : '人员入职部门',
             width: 450,
             height: 300,
             onOpen: function () {

admin-ui/app/whepi/lingyun/editUser.js

@@ -0,0 +1,73 @@
+define(function (require) {
+    return function (context) {
+
+        var $dlg, $form, $coma;
+
+
+        return {
+            xtype: 'dialog',
+            dialogId: 'dialogEnvLog',
+            title:  '工号变更',
+            width: 450,
+            height: 300,
+            onOpen: function () {
+                $dlg = $(this);
+                $form.formSet({houseId:context.houseId,linkman:context.linkman,doorplate:context.doorplate});
+            },
+            center: {
+                items: {
+                    width: 450,
+                    height: 400,
+                    autoSizeColumns: true,
+                    xtype: 'formgroup',
+                    onRender: function () {
+                        $form = $(this);
+                    },
+                    items: [
+                        [
+                            {name: 'houseId', xtype: 'hidden'},
+                            {
+                                name: 'linkman',
+                                label: '姓名',
+                                disabled: true,
+                                maxlength: 60,
+                                width: 350,
+                            },
+                            {
+                                name: 'doorplate',
+                                label: '工号',
+                                required: true,
+                                maxlength: 60,
+                                width: 350,
+                            },
+
+
+                        ]
+                    ],
+                }
+            },
+            buttons: [
+                {
+                    text: "保存", iconCls: "fa fa-save", onClick: function () {
+                        $.yvan.postForm($form, {
+                            url: api('/user/editUser'),
+                            success: function (data) {
+                                if (data.data > 0) {
+                                    $.yvan.msg('保存成功');
+                                    $dlg.window('close');
+                                    if ($.type(context.confirm) === 'function') {
+                                        context.confirm();
+                                    }
+                                }
+                            }
+                        });
+                    }
+                }, {
+                    text: "关闭", iconCls: "fa fa-times", onClick: function () {
+                        $dlg.dialog('close');
+                    }
+                }
+            ]
+        };
+    };
+});

admin-ui/app/whepi/lingyun/lingyunUserOnJob.js

@@ -205,6 +205,55 @@ define(function (require) {
                           });
                         }
                       },
+
+                      {
+                        text: '工号变更', iconCls: 'fa fa fa-pencil-square-o fa-lg', onClick: function () {
+
+                          var row = $grid1.rowData();
+                          if ( row == null || row == undefined || row.userId == null || row.userId == "") {
+                            $.yvan.msg('请选择数据');
+                            return
+                          }
+
+                          $.yvan.showDialog(this,
+                              require('/app/whepi/lingyun/editUser.js')({
+                                isEdit: false,
+                                houseId: row.houseId,
+                                linkman: row.linkman,
+                                doorplate: row.doorplate,
+                                confirm: function () {
+                                  queryGrid1();
+                                }
+                              })
+                          );
+                        }
+                      },
+
+                      {
+                        text: '部门变更', iconCls: 'fa fa fa-pencil-square-o fa-lg', onClick: function () {
+
+                          var row = $grid1.checkedData();
+                          if (row.length == 0) {
+                            $.yvan.msg('请至少选择一行数据');
+                            return;
+                          }
+                          var ids = "";
+                          for (var i=0; i<row.length; i++) {
+                            ids += row[i].houseId + ","
+                          }
+
+
+                          $.yvan.showDialog(this,
+                              require('/app/whepi/lingyun/addUser.js')({
+                                isEdit: true,
+                                ids: ids,
+                                confirm: function () {
+                                  queryGrid1();
+                                }
+                              })
+                          );
+                        }
+                      },
                     ]
                   },
                   multiselect: true, /// 表格多选

admin-ui/app/whepi/mock/menu6.json

@@ -9,6 +9,14 @@
       "iconCls": "icon-blank fa fa-align-justify",
       "state": "close",
       "children": []
+    },
+    {
+      "id": "ENT10003",
+      "text": "凌云签到信息",
+      "href": "/app/whepi/clock/clock1.js",
+      "iconCls": "icon-blank fa fa-align-justify",
+      "state": "close",
+      "children": []
     }
   ]
 }

whepi-ui/templates/user/home.ftl

@@ -1,181 +1,19 @@
-<#assign title="健康上报"/>
+<#assign title="用户注册"/>
 <#include "/home/frag.head.ftl" />
 
 <div class="weui-tab">
     <div class="weui-tab__bd">
-        <div id="first">
-            <div class="weui-tab__bd-item weui-tab__bd-item--active">
-                <div class="page__bd">
-                    <header class="user-header">
-                        <br/>
-                        <br/>
-                        <h1 class="user-title">凌云集团</h1>
-                        <br/>
-<#--                        <h1 class="user-title">用户登录</h1>-->
-                        <h1 class="user-title">用户绑定</h1>
-                    </header>
-                    <br/>
-                    <br/>
-                    <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>-->
-                        <hr class="user-hr">
-                        <div class="maindiv">
-<#--                            <div class="leftdiv">-->
-<#--                                <br/>-->
-<#--                                <div class="weui-cells__title user-font" style="font-weight: 300;">&nbsp;&nbsp;&nbsp;&nbsp;<#if user ??>${user.nickName!''}</#if></div>-->
-<#--                                <div class="weui-cells__title user-font">&nbsp;&nbsp;&nbsp;&nbsp;用户登录</div>-->
-<#--                                <br/>-->
-<#--                            </div>-->
-<#--                            <div class="centerdiv"></div>-->
-<#--                            <div class="rightdiv">-->
-<#--&lt;#&ndash;                                <div class="weui-cells__title">联系人</div>&ndash;&gt;-->
-<#--&lt;#&ndash;                                <div class="weui-cells">&ndash;&gt;-->
-<#--&lt;#&ndash;                                    <div class="weui-cell">&ndash;&gt;-->
-<#--&lt;#&ndash;                                        <div class="weui-cell__bd">&ndash;&gt;-->
-<#--&lt;#&ndash;                                            <input class="weui-input" type="text" id="linkman" placeholder="请填写真实姓名"/>&ndash;&gt;-->
-<#--&lt;#&ndash;                                        </div>&ndash;&gt;-->
-<#--&lt;#&ndash;                                    </div>&ndash;&gt;-->
-<#--&lt;#&ndash;                                </div>&ndash;&gt;-->
-<#--&lt;#&ndash;                                <div class="weui-cells__title">手机号</div>&ndash;&gt;-->
-<#--                                <div class="weui-cells">-->
-<#--                                    <div class="weui-cell">-->
-<#--                                        <div class="weui-cell__bd">-->
-<#--                                            <input class="weui-input" type="text" id="phone" placeholder="请填写手机号码！"/>-->
-<#--                                        </div>-->
-<#--                                    </div>-->
-<#--                                </div>-->
-<#--                            </div>-->
 
-                            <div class="weui-cells cx-reset-userhome" style="width: 90%;margin: 0 auto;border:1px solid #e5e5e5;border-radius: 5px;">
-                                <div class="weui-cell">
-                                    <div class="weui-cell__bd">
-                                        <input class="weui-input" type="text" id="phone" placeholder="请填写您在家园互助平台上注册的手机号码！"/>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <br/>
-                        <div class="weui-form__opr-area" style="width: 90%;margin: 0 auto;">
-                            <a class="weui-btn weui-btn_primary" href="javascript:;" onclick="goOn();" id="goOn">手机号绑定</a>
-                        </div>
-                    </div>
-                    <div class="page" id="tpl_msg_warn_userType" hidden="hidden">
-                        <div class="weui-msg">
-                            <div class="weui-msg__icon-area"><i class="weui-icon-warn weui-icon_msg"></i></div>
-                            <div class="weui-msg__text-area">
-                                <h2 class="weui-msg__title">操作失败</h2>
-                                <p class="weui-msg__desc" id="errorMsg">用户类型不能为空</p>
-                            </div>
-                            <div class="weui-msg__opr-area">
-                                <p class="weui-btn-area">
-                                    <a href="javascript:;" onclick="back();" class="weui-btn weui-btn_default">返回</a>
-                                </p>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="page" id="tpl_msg_warn_linkman" hidden="hidden">
-                        <div class="weui-msg">
-                            <div class="weui-msg__icon-area"><i class="weui-icon-warn weui-icon_msg"></i></div>
-                            <div class="weui-msg__text-area">
-                                <h2 class="weui-msg__title">操作失败</h2>
-                                <p class="weui-msg__desc" id="errorMsg">联系人不能为空</p>
-                            </div>
-                            <div class="weui-msg__opr-area">
-                                <p class="weui-btn-area">
-                                    <a href="javascript:;" onclick="back();" class="weui-btn weui-btn_default">返回</a>
-                                </p>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="page" id="tpl_msg_warn_phone" hidden="hidden">
-                        <div class="weui-msg">
-                            <div class="weui-msg__icon-area"><i class="weui-icon-warn weui-icon_msg"></i></div>
-                            <div class="weui-msg__text-area">
-                                <h2 class="weui-msg__title">操作失败</h2>
-                                <p class="weui-msg__desc" id="errorMsg">电话号码校验失败</p>
-                            </div>
-                            <div class="weui-msg__opr-area">
-                                <p class="weui-btn-area">
-                                    <a href="javascript:;" onclick="back();" class="weui-btn weui-btn_default">返回</a>
-                                </p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div id="second" hidden="hidden">
+        <div id="first" >
             <div class="weui-tab__bd-item weui-tab__bd-item--active">
                 <div class="page__bd">
                     <header class="user-header">
                         <br/>
-                        <h1 class="user-title">请继续完善信息</h1>
+                        <h1 class="user-title">凌云集团</h1>
                         <br/>
                     </header>
                     <br/>
                     <br/>
-<#--                    <div class="weui-cell weui-cell_select weui-cell_select-after">-->
-<#--                        <div class="weui-cell__hd">-->
-<#--                            <label for="" class="weui-label">城市</label>-->
-<#--                        </div>-->
-<#--                        <div class="weui-cell__bd">-->
-<#--                            <select class="weui-select" id="city" name="select1">-->
-<#--                                <option value="420100">武汉市</option>-->
-<#--                                <option value="420200">黄石市</option>-->
-<#--                                <option value="420300">十堰市</option>-->
-<#--                                <option value="420500">宜昌市</option>-->
-<#--                                <option value="420600">襄阳市</option>-->
-<#--                                <option value="420700">鄂州市</option>-->
-<#--                                <option value="420800">荆门市</option>-->
-<#--                                <option value="420900">孝感市</option>-->
-<#--                                <option value="421000">荆州市</option>-->
-<#--                                <option value="421100">黄冈市</option>-->
-<#--                                <option value="421200">咸宁市</option>-->
-<#--                                <option value="421300">随州市</option>-->
-<#--                                <option value="422800">恩施土家族苗族自治州</option>-->
-<#--                                <option value="429000">省直辖县级行政区划</option>-->
-<#--                            </select>-->
-<#--                        </div>-->
-<#--                    </div>-->
-<#--                    <div class="weui-cell weui-cell_select weui-cell_select-after">-->
-<#--                        <div class="weui-cell__hd">-->
-<#--                            <label for="" class="weui-label">区/县</label>-->
-<#--                        </div>-->
-<#--                        <div class="weui-cell__bd">-->
-<#--                            <select class="weui-select" id="area" name="select2">-->
-<#--                                <option value="420102">江岸区</option>-->
-<#--                                <option value="420103">江汉区</option>-->
-<#--                                <option value="420104">硚口区</option>-->
-<#--                                <option value="420105">汉阳区</option>-->
-<#--                                <option value="420106">武昌区</option>-->
-<#--                                <option value="420107">青山区</option>-->
-<#--                                <option value="420111">洪山区</option>-->
-<#--                                <option value="420112">东西湖区</option>-->
-<#--                                <option value="420113">汉南区</option>-->
-<#--                                <option value="420114">蔡甸区</option>-->
-<#--                                <option value="420115">江夏区</option>-->
-<#--                                <option value="420116">黄陂区</option>-->
-<#--                                <option value="420117">新洲区</option>-->
-<#--                            </select>-->
-<#--                        </div>-->
-<#--                    </div>-->
-<#--                    <div class="weui-cell weui-cell_select weui-cell_select-after">-->
-<#--                        <div class="weui-cell__hd">-->
-<#--                            <label for="" class="weui-label">小区</label>-->
-<#--                        </div>-->
-<#--                        <div class="weui-cell__bd">-->
-<#--                            <select class="weui-select" id="uptownId" name="select3">-->
-<#--                            </select>-->
-<#--                        </div>-->
-<#--                    </div>-->
-
                     <div>
                         <div class="weui-cells__title" >姓名</div>
                         <div class="weui-cells">
@@ -187,22 +25,13 @@
                         </div>
                     </div>
 
-                    <div class="weui-cell weui-cell_select weui-cell_select-after" id="unitMsg">
-                        <div class="weui-cell__hd">
-                            <label for="" class="weui-label" id="danweiTitle">部门</label>
-                        </div>
-                        <div class="weui-cell__bd">
-                            <select class="weui-select" id="unitId" name="select4">
-                                <option>请选择</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div id="doorplateMsg" >
-                        <div class="weui-cells__title" id="menpaiTitle">工号</div>
+
+                    <div id="phoneMsg" >
+                        <div class="weui-cells__title" id="phoneTitle">手机号</div>
                         <div class="weui-cells">
                             <div class="weui-cell">
                                 <div class="weui-cell__bd">
-                                    <input class="weui-input" type="text" id="doorplate" placeholder="请输入工号或身份证号"/>
+                                    <input class="weui-input" type="text" id="phone" placeholder="请输入手机号"/>
                                 </div>
                             </div>
                         </div>
@@ -241,395 +70,56 @@
 <script>
 
     $(document).ready(function () {
-        // $("#area").on("change", function () {
-        //     var area = $("#area").val();
-        //     $("#uptownId").empty();
-        //     $("#houseId").empty();
-        //     getUptownData(area);
-        // });
-        //
-        // $("#city").on("change", function () {
-        //     var city = $("#city").val();
-        //
-        //     $("#area").empty();
-        //     $("#uptownId").empty();
-        //     $("#houseId").empty();
-        //
-        //     var areaData = [];
-        //     switch (parseInt(city)) {
-        //         case 420100 : {
-        //
-        //             areaData = [
-        //                 {value: 420102, text: "江岸区"},
-        //                 {value: 420103, text: "江汉区"},
-        //                 {value: 420104, text: "硚口区"},
-        //                 {value: 420105, text: "汉阳区"},
-        //                 {value: 420106, text: "武昌区"},
-        //                 {value: 420107, text: "青山区"},
-        //                 {value: 420111, text: "洪山区"},
-        //                 {value: 420112, text: "东西湖区"},
-        //                 {value: 420113, text: "汉南区"},
-        //                 {value: 420114, text: "蔡甸区"},
-        //                 {value: 420115, text: "江夏区"},
-        //                 {value: 420116, text: "黄陂区"},
-        //                 {value: 420117, text: "新洲区"}
-        //             ];
-        //             break;
-        //         }
-        //         case 420200 : {
-        //             areaData = [
-        //                 {value: 420202, text: "黄石港区"},
-        //                 {value: 420203, text: "西塞山区"},
-        //                 {value: 420204, text: "下陆区"},
-        //                 {value: 420205, text: "铁山区"},
-        //                 {value: 420222, text: "阳新县"},
-        //                 {value: 420281, text: "大冶市"}
-        //             ];
-        //             break;
-        //         }
-        //         case 420300 : {
-        //             areaData = [
-        //                 {value: 420302, text: "茅箭区"},
-        //                 {value: 420303, text: "张湾区"},
-        //                 {value: 420321, text: "郧县"},
-        //                 {value: 420322, text: "郧西县"},
-        //                 {value: 420323, text: "竹山县"},
-        //                 {value: 420324, text: "竹溪县"},
-        //                 {value: 420325, text: "房县"},
-        //                 {value: 420381, text: "丹江口市"}
-        //             ];
-        //             break;
-        //         }
-        //         case 420500 : {
-        //             areaData = [
-        //                 {value: 420502, text: "西陵区"},
-        //                 {value: 420503, text: "伍家岗区"},
-        //                 {value: 420504, text: "点军区"},
-        //                 {value: 420505, text: "猇亭区"},
-        //                 {value: 420506, text: "夷陵区"},
-        //                 {value: 420525, text: "远安县"},
-        //                 {value: 420526, text: "兴山县"},
-        //                 {value: 420527, text: "秭归县"},
-        //                 {value: 420528, text: "长阳土家族自治县"},
-        //                 {value: 420529, text: "五峰土家族自治县"},
-        //                 {value: 420581, text: "宜都市"},
-        //                 {value: 420582, text: "当阳市"},
-        //                 {value: 420583, text: "枝江市"},
-        //             ];
-        //             break;
-        //         }
-        //         case 420600 : {
-        //             areaData = [
-        //                 {value: 420602, text: "襄城区"},
-        //                 {value: 420606, text: "樊城区"},
-        //                 {value: 420607, text: "襄州区"},
-        //                 {value: 420624, text: "南漳县"},
-        //                 {value: 420625, text: "谷城县"},
-        //                 {value: 420626, text: "保康县"},
-        //                 {value: 420682, text: "老河口市"},
-        //                 {value: 420683, text: "枣阳市"},
-        //                 {value: 420684, text: "宜城市"},
-        //             ];
-        //             break;
-        //         }
-        //         case 420700 : {
-        //             areaData = [
-        //                 {value: 420702, text: "梁子湖区"},
-        //                 {value: 420703, text: "华容区"},
-        //                 {value: 420704, text: "鄂城区"},
-        //             ];
-        //             break;
-        //         }
-        //         case 420800 : {
-        //             areaData = [
-        //                 {value: 420802, text: "东宝区"},
-        //                 {value: 420804, text: "掇刀区"},
-        //                 {value: 420821, text: "京山县"},
-        //                 {value: 420822, text: "沙洋县"},
-        //                 {value: 420881, text: "钟祥市"},
-        //
-        //             ];
-        //             break;
-        //         }
-        //         case 420900 : {
-        //             areaData = [
-        //                 {value: 420902, text: "孝南区"},
-        //                 {value: 420921, text: "孝昌县"},
-        //                 {value: 420922, text: "大悟县"},
-        //                 {value: 420923, text: "云梦县"},
-        //                 {value: 420981, text: "应城市"},
-        //                 {value: 420982, text: "安陆市"},
-        //                 {value: 420984, text: "汉川市"},
-        //
-        //             ];
-        //             break;
-        //         }
-        //         case 421000 : {
-        //             areaData = [
-        //                 {value: 421002, text: "沙市区"},
-        //                 {value: 421003, text: "荆州区"},
-        //                 {value: 421022, text: "公安县"},
-        //                 {value: 421023, text: "监利县"},
-        //                 {value: 421024, text: "江陵县"},
-        //                 {value: 421081, text: "石首市"},
-        //                 {value: 421083, text: "洪湖市"},
-        //                 {value: 421087, text: "松滋市"},
-        //
-        //             ];
-        //             break;
-        //         }
-        //         case 421100 : {
-        //             areaData = [
-        //                 {value: 421102, text: "黄州区"},
-        //                 {value: 421121, text: "团风县"},
-        //                 {value: 421122, text: "红安县"},
-        //                 {value: 421123, text: "罗田县"},
-        //                 {value: 421124, text: "英山县"},
-        //                 {value: 421125, text: "浠水县"},
-        //                 {value: 421126, text: "蕲春县"},
-        //                 {value: 421127, text: "黄梅县"},
-        //                 {value: 421181, text: "麻城市"},
-        //                 {value: 421182, text: "武穴市"},
-        //
-        //             ];
-        //             break;
-        //         }
-        //         case 421200 : {
-        //             areaData = [
-        //                 {value: 421202, text: "咸安区"},
-        //                 {value: 421221, text: "嘉鱼县"},
-        //                 {value: 421222, text: "通城县"},
-        //                 {value: 421223, text: "崇阳县"},
-        //                 {value: 421224, text: "通山县"},
-        //                 {value: 421281, text: "赤壁市"},
-        //
-        //             ];
-        //             break;
-        //         }
-        //         case 421300 : {
-        //             areaData = [
-        //                 {value: 421303, text: "曾都区"},
-        //                 {value: 421321, text: "随县"},
-        //                 {value: 421381, text: "广水市"},
-        //             ];
-        //             break;
-        //         }
-        //         case 422800 : {
-        //             areaData = [
-        //                 {value: 422801, text: "恩施市"},
-        //                 {value: 422802, text: "利川市"},
-        //                 {value: 422822, text: "建始县"},
-        //                 {value: 422823, text: "巴东县"},
-        //                 {value: 422825, text: "宣恩县"},
-        //                 {value: 422826, text: "咸丰县"},
-        //                 {value: 422827, text: "来凤县"},
-        //                 {value: 422828, text: "鹤峰县"},
-        //
-        //             ];
-        //             break;
-        //         }
-        //         case 429000 : {
-        //             areaData = [
-        //                 {value: 429004, text: "仙桃市"},
-        //                 {value: 429005, text: "潜江市"},
-        //                 {value: 429006, text: "天门市"},
-        //                 {value: 429021, text: "神农架林区"},
-        //             ];
-        //             break;
-        //         }
-        //     }
-        //     var html = "";
-        //     for (var i = 0; i < areaData.length; i++) {
-        //         html += '<option value="' + areaData[i].value + '">' + areaData[i].text + '</option>';
-        //     }
-        //     $('#area').append(html);
-        //     $("#area").val(areaData[0].value);
-        // });
-
-        // $("#uptownId").on("change", function () {
-        //     getUptownUnitData();
-        //     $("#houseId").empty()
-        // })
-
-
-
-        // $("#danweiTitle").text("单位");
-        // $("#menpaiTitle").text("工号");
-        // $("#doorplate").attr("placeholder", "输入工号或身份证号");
-
-        getUptownUnitData();
-
-        $("#unitId").on("change", function () {
-            var unitId = $("#unitId").val();
-            console.log("unitId:" + unitId)
-            if(unitId=='002'){
-                $("#yaoqingmaSS")[0].style.display = '';
-                $("#doorplateMsg")[0].style.display = 'none';
-            }else{
-                $("#yaoqingmaSS")[0].style.display = 'none';
-                $("#doorplateMsg")[0].style.display = '';
-            }
-
-        })
-
 
     })
 
-    // function getUptownData(area) {
-    //     $.ajax({
-    //         type: "GET",
-    //         url: "/home/getUptownData.json?area=" + area,
-    //         dataType: "json",
-    //         success: function (data) {
-    //             if (data.length > 0) {
-    //                 $("#uptownId").empty();
-    //                 var html = "";
-    //                 for (var i = 0; i < data.length; i++) {
-    //                     html += '<option value="' + data[i].uptownId + '">' + data[i].uptownName + '</option>';
-    //                 }
-    //                 $('#uptownId').append(html);
-    //                 $("#uptownId").val(data[0].uptownId);
-    //                 var uptownId = $("#uptownId").val();
-    //                 // console.log("uptownId:"+uptownId);
-    //                 if (uptownId == '1238790987234' || uptownId == '100000002') {
-    //                     console.log("单位");
-    //                     $("#yaoqingmaSS")[0].style.display = '';
-    //                     $("#danweiTitle").text("单位");
-    //                     $("#menpaiTitle").text("工号");
-    //                     $("#doorplate").attr("placeholder", "输入工号或身份证号");
-    //
-    //                 } else {
-    //                     console.log("小区");
-    //                     $("#yaoqingmaSS")[0].style.display = 'none';
-    //                     $("#danweiTitle").text("栋/单元");
-    //                     $("#menpaiTitle").text("门牌号码");
-    //                     $("#doorplate").attr("placeholder", "请输入门牌号码: 如 108");
-    //                 }
-    //                 getUptownUnitData();
-    //             }
-    //         }
-    //     });
-    // }
-
-    function getUptownUnitData() {
-        $.ajax({
-            type: "GET",
-            url: "/home/getUptownUnitData.json?uptownId=1238790987234",
-            data: {},
-            dataType: "json",
-            success: function (data) {
-                if (data.length > 0) {
-                    $("#unitId").empty();
-                    $('#unitId').append("<option value='001'>请选择</option>");
-                    $('#unitId').append("<option value='002'>没有归属部门</option>");
-                    var html = "";
-                    for (var i = 0; i < data.length; i++) {
-                        html += '<option value="' + data[i].unitId + '">' + data[i].ridgepole + data[i].unit + '</option>';
-                    }
-                    $('#unitId').append(html);
-                    $("#unitId").val('001');
-                }
-            }
-        });
-    }
-
     <#if user_id ??>var userId = ${user_id!''}</#if>;
 
     function save() {
-        // console.log("userId:" + userId)
-        // var userType = $('input:radio:checked').val();
-        // var city = $("#city").val();
-        // if (!city) {
-        //     $.alert("请选择城市！")
-        //     return false;
-        // }
-        // var area = $("#area").val();
-        // if (!area) {
-        //     $.alert("请选择区/县！")
-        //     return false;
-        // }
-        // var uptownId = $("#uptownId").val();
-        // if (!uptownId) {
-        //     $.alert("请选择小区！")
-        //     return false;
-        // }
-        if (uptownId == '1238790987234') {
-          $.alert("暂停注册！")
-          return false;
-            var yaoqingma = $("#yaoqingma").val();
-            if (yaoqingma != '5714') {
-                $.alert("请填写正确的邀请码！")
-                return false;
-            }
-        }
-        // if (uptownId == '100000002') {
-        //     var yaoqingma = $("#yaoqingma").val();
-        //     if (yaoqingma != '071797') {
-        //         $.alert("请填写正确的邀请码！")
-        //         return false;
-        //     }
-        // }
+
+
         var linkman = $("#linkman").val();
         if (!linkman) {
             $.alert("请填写姓名！")
             return false;
         }
 
-        var unitId = $("#unitId").val();
-
-        if (!unitId) {
-            $.alert("请选择部门！")
+        var phone = $("#phone").val();
+        if (!phone) {
+            $.alert("请填写手机号！")
             return false;
-        }else{
-            if(unitId=='002'){
-                var yaoqingma = $("#yaoqingma").val();
-                if (yaoqingma != '5714') {
-                    $.alert("请填写正确的邀请码！")
-                    return false;
-                }
-            }else{
-                var doorplate = $("#doorplate").val().trim();
-                if (!doorplate) {
-                    $.alert("请填写工号或身份证！")
-                    return false;
-                }
-            }
         }
 
-        // console.log(city)
-        // console.log(area)
-        // console.log(uptownId)
-        console.log(unitId)
-        console.log(doorplate)
+
+        // var yaoqingma = $("#yaoqingma").val();
+        // if (yaoqingma != '5714') {
+        //     $.alert("请填写正确的邀请码！")
+        //     return false;
+        // }
+
+
         $.ajax({
-            url: '/home/checkHouseId.json',
+            url: '/home/checkPhone.json',
             type: "post",
             data: {
-                "unitId": unitId,
-                "doorplate": doorplate,
+                "phone": phone,
             }, success: function (data) {
                 if (!data.success) {
-                    if (uptownId == '1238790987234' || uptownId == '100000002') {
-                        $.alert("该工号已经被占用，请输入身份证号码");
-                        return false;
-                    } else {
-                        $.alert(data.msg);
-                        return false;
-                    }
+                    $.alert(data.msg);
+                    return false;
                 } else {
                     $.ajax({
                         url: '/home/saveUser.json',
                         type: "post",
                         data: {
                             "userId": userId,
-                            // "userType": $('input:radio:checked').val(),
                             "linkman": $("#linkman").val(),
                             "phone": $("#phone").val(),
                             "city": null,
                             "area": null,
-                            "unitId": unitId,
+                            "unitId": 7000,
                             "uptownId": null,
-                            "doorplate": doorplate,
+                            "doorplate": '0',
                         }, success: function (date) {
                             window.location.href = "/user/home.html?userId=" + userId + "&userType=1";
                         }
@@ -639,76 +129,6 @@
         });
     }
 
-    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 linkman = $("#linkman").val();
-        // if (!linkman) {
-        //     $("#tpl_msg_warn_userType").hide();
-        //     $("#tpl_msg_warn_linkman").show();
-        //     $("#tpl_msg_warn_phone").hide();
-        //     $("#fromMsg").hide();
-        //     return false;
-        // }
-        var phone = $("#phone").val();
-        if (!(/^1[3456789]\d{9}$/.test(phone))) {
-            $("#tpl_msg_warn_userType").hide();
-            $("#tpl_msg_warn_linkman").hide();
-            $("#tpl_msg_warn_phone").show();
-            $("#fromMsg").hide();
-            return false;
-        }
-        $("#tpl_msg_warn_userType").hide();
-        $("#tpl_msg_warn_linkman").hide();
-        $("#tpl_msg_warn_phone").hide();
-
-
-        // $("#first").hide();
-        // $("#second").show();
-
-        // console.log(userType)
-        // console.log(linkman)
-        console.log(phone)
-
-
-        $.ajax({
-            url: '/home/bandUser.json',
-            type: "post",
-            data: {
-                "userId": userId,
-                "phone": $("#phone").val(),
-            }, success: function (data) {
-                console.log(data)
-                if (!data.success) {
-                    // $("#first").hide();
-                    // $("#second").show();
-
-                    $.alert("当前手机号码无法绑定，请重新输入正确的手机号码！");
-                    return false;
-
-                }else{
-                    window.location.href = "/user/home.html?userId=" + data.newUserId + "&userType=1";
-                }
-
-            }
-
-        });
-
-
-    }
-
-    function back() {
-        $("#tpl_msg_warn_userType").hide();
-        $("#tpl_msg_warn_linkman").hide();
-        $("#tpl_msg_warn_phone").hide();
-        $("#fromMsg").show();
-    }
 
 </script>
 

whepi-web/src/main/java/com/bofeng/entity/MsSuspected.java

@@ -52,6 +52,9 @@ public class MsSuspected {
     @TableField("medical")
     private Integer medical;
 
+    @TableField("medical_state")
+    private Integer medicalState;
+
     @TableField(exist = false)
     private String medicalStr = "";
 

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

@@ -43,7 +43,7 @@ public class MsTripService {
     //添加家人
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public Long addSuspectedTrip(Long suspectedId, String userName, Integer grender, Integer age, String familyStatus,
-                                 String statusDesp, Integer medical, BigDecimal temperature, Integer cough, Integer muscle,
+                                 String statusDesp, Integer medical,Integer medicalState, BigDecimal temperature, Integer cough, Integer muscle,
                                  Integer dyspnea, Integer fatigue, Integer diarrhea, Integer singleRoom, String others, Long userCreate, Integer scoreRezult, Integer temperatureScore, Integer scoreHistroy, Integer score
             , Integer isContact, Integer isSuspected, Integer workLocal, String workLocalOther, Integer todayLocal, String todayLocalOther, String autoLocal, String autoAddr, Integer isTrip, List<MsTripDet> listTripDet) {
         Long reportId = 0L;
@@ -127,6 +127,7 @@ public class MsTripService {
             msSuspected.setFamilyStatus(familyStatus);
             msSuspected.setStatusDesp(statusDesp);
             msSuspected.setMedical(medical);
+            msSuspected.setMedicalState(medicalState);
             msSuspected.setTemperature(temperature);
             msSuspected.setCough(cough);
             msSuspected.setMuscle(muscle);
@@ -222,6 +223,7 @@ public class MsTripService {
                 msSuspected1.setFamilyStatus(familyStatus);
                 msSuspected1.setStatusDesp(statusDesp);
                 msSuspected1.setMedical(medical);
+                msSuspected1.setMedicalState(medicalState);
                 msSuspected1.setTemperature(temperature);
                 msSuspected1.setCough(cough);
                 msSuspected1.setMuscle(muscle);

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

@@ -353,6 +353,10 @@ public class SweepCodeService {
 
     public List<OutScanClock> selectClockLY(PageDb pageDb, Map<String, Object> queryParam) {
         queryParam.put("uptownId", 1238790987234L);
+        Long userId = JwtHelper.getUserId();
+        if (userId > 7000 && userId < 8000) {
+            queryParam.put("unitId", userId);
+        }
         List<OutScanClock> list = sweepCodeMapper.selectClockLY(pageDb,queryParam);
         return list;
     }

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

@@ -65,6 +65,8 @@ public class ScanAdminController {
     @Autowired
     private UptownHomeMapper uptownHomeMapper;
     @Autowired
+    private UptownHouseMapper uptownHouseMapper;
+    @Autowired
     private UptownUnitMapper uptownUnitMapper;
     @Autowired
     private SysUptownUnitMapper sysUptownUnitMapper;
@@ -452,6 +454,12 @@ public class ScanAdminController {
         return Model.newSuccess(outUserMapper.entryUser(uptownHouse.getIds(),uptownHouse.getUnitId(),uptownHouse.getDepartmentId()!=null?uptownHouse.getDepartmentId():0));
     }
 
+    @ApiOperation("工号变更")
+    @PostMapping("/whepi/user/editUser")
+    public Model editUser(@JsonBody UptownHouse uptownHouse) {
+        return Model.newSuccess(uptownHouseMapper.updateById(uptownHouse));
+    }
+
     @ApiOperation("小区进出二维码")
     @PostMapping("/whepi/qrImg/scanQrImg")
     public Model<List<UptownDoor>> scanQrImg(HttpParameterParser parser, PageDb pagination) throws IOException, WriterException {

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

@@ -321,6 +321,24 @@ public class UserOpenController {
         return resultModel;
     }
 
+
+
+    @PostMapping("/home/checkPhone.json")
+    public ResultModel checkPhone(ModelMap model, HttpServletRequest request) {
+        ResultModel resultModel = new ResultModel();
+        String phone = request.getParameter("phone");
+        List<UptownHome> homeList = uptownHomeMapper.getUptownHomeByPhone(phone);
+        if(homeList.size()>0){
+            resultModel.put("success", false);
+            resultModel.put("msg", "该手机号已注册！");
+            return resultModel;
+        }
+        resultModel.put("success", true);
+        resultModel.put("msg", "操作成功");
+        return resultModel;
+    }
+
+
     @PostMapping("/home/saveUser.json")
     public void saveUser(ModelMap model, HttpServletRequest request) {
         Long userId = Long.parseLong(request.getParameter("userId"));