Browse Source

未选中二级部门报错

caotao 5 years ago
parent
commit
92a9bcc11a

+ 11 - 11
admin-ui/app/whepi/lingyun/lingyunUser.js

@@ -200,16 +200,16 @@ define(function (require) {
             },
           },
 
-          {
-            name: 'isBand',
-            xtype: 'combobox',
-            label: '是否迁移',
-            data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
-            value: '',
-            onChange: function (value) {
-              queryGrid1();
-            },
-          },
+          // {
+          //   name: 'isBand',
+          //   xtype: 'combobox',
+          //   label: '是否迁移',
+          //   data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
+          //   value: '',
+          //   onChange: function (value) {
+          //     queryGrid1();
+          //   },
+          // },
         ]]
       };
 
@@ -368,7 +368,7 @@ define(function (require) {
                     {field: 'doorplate', title: '工号', maxWidth: 200, align: 'left',},
 
                     {field: 'oldOpenId', title: '旧openId',hidden: true},
-                    {field: 'isBand', title: '是否迁移', maxWidth: 200, align:  'center', formatter: function (value, row) {
+                    {field: 'isBand', title: '是否迁移',hidden: true, maxWidth: 200, align:  'center', formatter: function (value, row) {
                         if (row.rowData.oldOpenId) {
                           return "<span style='color: green;'>是<span>";
                         } else {

+ 11 - 11
admin-ui/app/whepi/lingyun/lingyunUser2.js

@@ -179,16 +179,16 @@ define(function (require) {
               queryGrid1();
             },
           },
-          {
-            name: 'isBand',
-            xtype: 'combobox',
-            label: '是否迁移',
-            data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
-            value: '',
-            onChange: function (value) {
-              queryGrid1();
-            },
-          },
+          // {
+          //   name: 'isBand',
+          //   xtype: 'combobox',
+          //   label: '是否迁移',
+          //   data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
+          //   value: '',
+          //   onChange: function (value) {
+          //     queryGrid1();
+          //   },
+          // },
         ]]
       };
 
@@ -344,7 +344,7 @@ define(function (require) {
                     {field: 'doorplate', title: '工号', maxWidth: 200, align: 'left',},
 
                     {field: 'oldOpenId', title: '旧openId',hidden: true},
-                    {field: 'isBand', title: '是否迁移', maxWidth: 200, align:  'center', formatter: function (value, row) {
+                    {field: 'isBand', title: '是否迁移',hidden: true, maxWidth: 200, align:  'center', formatter: function (value, row) {
                         if (row.rowData.oldOpenId) {
                           return "<span style='color: green;'>是<span>";
                         } else {

+ 11 - 11
admin-ui/app/whepi/lingyun/lingyunUser7.js

@@ -200,16 +200,16 @@ define(function (require) {
             },
           },
 
-          {
-            name: 'isBand',
-            xtype: 'combobox',
-            label: '是否迁移',
-            data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
-            value: '',
-            onChange: function (value) {
-              queryGrid1();
-            },
-          },
+          // {
+          //   name: 'isBand',
+          //   xtype: 'combobox',
+          //   label: '是否迁移',
+          //   data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
+          //   value: '',
+          //   onChange: function (value) {
+          //     queryGrid1();
+          //   },
+          // },
         ]]
       };
 
@@ -367,7 +367,7 @@ define(function (require) {
 
 
                     {field: 'oldOpenId', title: '旧openId',hidden: true},
-                    {field: 'isBand', title: '是否迁移', maxWidth: 200, align:  'center', formatter: function (value, row) {
+                    {field: 'isBand', title: '是否迁移',hidden: true, maxWidth: 200, align:  'center', formatter: function (value, row) {
                         if (row.rowData.oldOpenId) {
                           return "<span style='color: green;'>是<span>";
                         } else {

+ 11 - 11
admin-ui/app/whepi/lingyun/lingyunUserNotOnJob.js

@@ -118,16 +118,16 @@ define(function (require) {
             },
           },
 
-          {
-            name: 'isBand',
-            xtype: 'combobox',
-            label: '是否迁移',
-            data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
-            value: '',
-            onChange: function (value) {
-              queryGrid1();
-            },
-          },
+          // {
+          //   name: 'isBand',
+          //   xtype: 'combobox',
+          //   label: '是否迁移',
+          //   data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
+          //   value: '',
+          //   onChange: function (value) {
+          //     queryGrid1();
+          //   },
+          // },
 ]]
       };
 
@@ -218,7 +218,7 @@ define(function (require) {
                     {field: 'phone', title: '联系电话', maxWidth: 200, align: 'left',},
                     {field: 'doorplate', title: '工号', maxWidth: 200, align: 'left',},
                     {field: 'oldOpenId', title: '旧openId',hidden: true},
-                    {field: 'isBand', title: '是否迁移', maxWidth: 200, align:  'center', formatter: function (value, row) {
+                    {field: 'isBand', title: '是否迁移',hidden: true, maxWidth: 200, align:  'center', formatter: function (value, row) {
                         if (row.rowData.oldOpenId) {
                           return "<span style='color: green;'>是<span>";
                         } else {

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

@@ -141,16 +141,16 @@ define(function (require) {
                 queryGrid1();
               }
             },
-            {
-              name: 'isBand',
-              xtype: 'combobox',
-              label: '是否迁移',
-              data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
-              value: '',
-              onChange: function (value) {
-                queryGrid1();
-              },
-            },
+            // {
+            //   name: 'isBand',
+            //   xtype: 'combobox',
+            //   label: '是否迁移',
+            //   data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
+            //   value: '',
+            //   onChange: function (value) {
+            //     queryGrid1();
+            //   },
+            // },
           ]]
         };
 
@@ -321,7 +321,7 @@ define(function (require) {
                           {field: 'phone', title: '联系电话', maxWidth: 200, align: 'left',},
                           {field: 'doorplate', title: '工号', maxWidth: 200, align: 'left',},
                           {field: 'oldOpenId', title: '旧openId', hidden: true},
-                          {field: 'isBand', title: '是否迁移', maxWidth: 200, align:  'center', formatter: function (value, row) {
+                          {field: 'isBand', title: '是否迁移',hidden: true, maxWidth: 200, align:  'center', formatter: function (value, row) {
                               if (row.rowData.oldOpenId) {
                                 return "<span style='color: green;'>是<span>";
                               } else {

+ 341 - 0
admin-ui/app/whepi/lingyun/lingyunUserOnJob2.js

@@ -0,0 +1,341 @@
+define(function (require) {
+      return function (context) {
+
+        var $grid1, $form, $coma;
+
+        // 输入搜索文本后点击回车按钮查询列表
+        function enterQueryGrid1(e) {
+          if (e.keyCode === 13) {
+            var tmp = $(this).val();
+            $form.formSet({queryProperties: tmp});
+            queryGrid1();
+          }
+        }
+
+        // 弹框的方式
+        var widgets = {
+          // 搜索分类检索
+          selectTableUnit: {
+            url: 'app/whepi/home/selectLYbumen.js',
+            bind: {
+              unitId: 'unitId',
+              unit: 'unit',
+            },
+          },
+        };
+
+        // 下拉选清空并重新赋值
+        function reloadValuea(_datas) {
+          if ($coma) {
+            $coma.combobox('clear');// 清除当前的选项
+            $coma.combobox('loadData', _datas);// 重新加载数据
+          }
+        }
+
+        // 获取联机下拉选二级信息
+        function getList() {
+          var _datas = [];
+          _datas.push({
+            "id": "",
+            "text": "全部",
+            "selected": true
+          });
+          $.yvan.ajax({
+            url: api('/home/getDepartmentIdLYepi.json?unitId=0'),
+            method: 'GET',
+            async: true,
+            success: function (data) {
+              if (data.data != null && data.data != undefined) {
+                for (var i = 0; i < data.data.length; i++) {
+                  _datas.push({
+                    "id": data.data[i].departmentId,
+                    "text": data.data[i].departmentName
+                  })
+                }
+                reloadValuea(_datas);
+              }
+            }
+          });
+          return _datas;
+        }
+
+        // 检索条件查询
+        function queryGrid1() {
+          var queryForm = $form.formGet();
+          $grid1.reload({
+            mtype: 'POST',
+            url: api('/sweepCode/selectLingyunUser'),
+            queryParams: queryForm
+          }, true);
+        }
+
+        var queryToolbar = {
+          xtype: 'toolbar',
+          title: '用户管理',
+          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: 200
+            },
+
+            {
+              xtype: 'combobox',
+              label: '二级部门',
+              name: 'departmentId',
+              labelWidth: 'auto',
+              width: 280,
+              value: '',
+              data: getList(),
+              onRender: function () {
+                $coma = $(this);
+              },
+              onValue: function (data) {
+              },
+              onChange: function () {
+                queryGrid1();
+              }
+            },
+            // {
+            //   name: 'isBand',
+            //   xtype: 'combobox',
+            //   label: '是否迁移',
+            //   data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
+            //   value: '',
+            //   onChange: function (value) {
+            //     queryGrid1();
+            //   },
+            // },
+          ]]
+        };
+
+        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: {
+                    xtype: 'toolbar',
+                    title: '用户列表',
+                    items: [
+                      {
+                        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.confirm('确定勾选的这' + row.length + '条人员做离职处理吗?', {
+                            yes: function (index) {
+                              $.yvan.ajax({
+                                method: 'post',
+                                url: api('/user/resignUser'),
+                                data: {ids: ids},
+                                success: function (data) {
+                                  $.yvan.msg("操作成功");
+                                  $grid1.reload();
+                                  queryGrid1();
+                                }
+                              });
+                            }
+                          });
+                        }
+                      },
+
+                      {
+                        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.rowData();
+                            if ( row == null || row == undefined || row.userId == null || row.userId == "") {
+                                $.yvan.msg('请选择数据');
+                                return
+                            }
+
+                            $.yvan.showDialog(this,
+                                require('/app/whepi/lingyun/editPhone.js')({
+                                    isEdit: false,
+                                    houseId: row.houseId,
+                                    linkman: row.linkman,
+                                    phone: row.phone,
+                                    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, /// 表格多选
+                  idField: 'userId',
+                  editable: true,
+                  editOnSelected: true,
+                  autoSizeColumns: true,
+                  columns:
+                      [
+                        [
+                          {field: 'userId', title: '用户ID', hidden: true},
+                          {field: 'houseId', title: 'houseId', hidden: true},
+                          {field: 'linkman', title: '姓名', maxWidth: 200, align: 'left',},
+                          {field: 'loudong', title: '部门名称', maxWidth: 200, align: 'left',},
+                          {field: 'departmentName', title: '二级部门', maxWidth: 200, align: 'left',},
+                          {
+                            field: 'returnWork', title: '今日复工', maxWidth: 100, align: 'center', formatter: function (value) {
+                              if (value == 1) {
+                                return "<span style='color: green;'>允许复工<span>";
+                              } else if (value == 0) {
+                                return "<span style='color: red;'>禁止复工<span>";
+                              }
+                            }
+                          },
+                          {field: 'reportStatus', title: '上报', hidden: true},
+                          {
+                            field: 'msStatus', title: '个人上报状态', maxWidth: 100, align: 'center', formatter: function (value, row) {
+                              if (row.rowData.reportStatus == 0) {
+                                return "<span style='color: #ffb717;'>未上报<span>";
+                              } else if (value == 1) {
+                                return "<span style='color: green;'>正常<span>";
+                              } else {
+                                return "<span style='color: red;'>异常<span>";
+                              }
+                            }
+                          },
+                          {field: 'phone', title: '联系电话', maxWidth: 200, align: 'left',},
+                          {field: 'doorplate', title: '工号', maxWidth: 200, align: 'left',},
+                          {field: 'oldOpenId', title: '旧openId', hidden: true},
+                          {field: 'isBand', title: '是否迁移',hidden: true, maxWidth: 200, align:  'center', formatter: function (value, row) {
+                              if (row.rowData.oldOpenId) {
+                                return "<span style='color: green;'>是<span>";
+                              } else {
+                                return "<span style='color: red;'>否<span>";
+                              }
+                            }
+                          },
+                          {field: 'bingqingDesc', title: '病情表述', align: 'left',},
+                          {field: 'isContactDesc', title: '家人确诊或接触', align: 'left',formatter: function (value) {
+                              if (value == "否") {
+                                return "<span style='color: green;'>否<span>";
+                              } else {
+                                return "<span style='color: red;'>是<span>";
+                              }
+                            }
+                          },
+                          {field: 'isSuspectedDesc', title: '家人健康异常', align: 'left',formatter: function (value) {
+                              if (value == "否") {
+                                return "<span style='color: green;'>否<span>";
+                              } else {
+                                return "<span style='color: red;'>是<span>";
+                              }
+                            }
+                          },
+                          {field: 'autoLocal', title: '定位地区', maxWidth: 200, align: 'left',},
+                          {field: 'autoAddr', title: '定位地址', maxWidth: 200, align: 'left',},
+                          {field: 'isTripDesc', title: '是否出行', maxWidth: 200, align: 'left',},
+                          {field: 'tripDetDesc', title: '出行详细', align: 'left',},
+                        ]
+                      ]
+                }
+          }
+        };
+      };
+    }
+);

+ 28 - 4
admin-ui/app/whepi/mock/menu2.json

@@ -3,10 +3,34 @@
   "msg": "",
   "data": [
     {
-      "id": "ENT10000",
-      "text": "系统首页",
-      "href": "/app/whepi/home/home.js",
-      "iconCls": "icon-blank fa fa-desktop",
+      "id": "ENT10001",
+      "text": "凌云导出报表",
+      "href": "/app/whepi/lingyun/lingyunUser2.js",
+      "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": []
+    },
+    {
+      "id": "ENT101007",
+      "text": "在职人员管理",
+      "href": "/app/whepi/lingyun/lingyunUserOnJob2.js",
+      "iconCls": "icon-blank fa fa-align-justify",
+      "state": "close",
+      "children": []
+    },
+    {
+      "id": "ENT101008",
+      "text": "不在职人员管理",
+      "href": "/app/whepi/lingyun/lingyunUserNotOnJob.js",
+      "iconCls": "icon-blank fa fa-align-justify",
       "state": "close",
       "children": []
     }

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

@@ -97,10 +97,10 @@ public class SweepCodeService {
 
 
     public List<ExcelRiBaoLYBM4> selectLingyunUserNotOnJob(PageDb pageDb, Map<String, Object> queryParam,Long notOnJob) throws ParseException {
-        Long userId = JwtHelper.getUserId();
-        if (userId > 7000 && userId < 8000) {
-            queryParam.put("unitId", userId);
-        }
+//        Long userId = JwtHelper.getUserId();
+//        if (userId > 7000 && userId < 8000) {
+//            queryParam.put("unitId", userId);
+//        }
         queryParam.put("notOnJob", notOnJob);
         queryParam.put("orderStr", "  op.create_at desc ");
         List<ExcelRiBaoLYBM4> sysUptownHouses = rbMapper.exSelectLingyunUserPage(pageDb,queryParam);

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

@@ -113,7 +113,7 @@ public class ScanController {
                 if (!unit.getUptownId().equals(uptownDoor.getUptownId())) {
                     model.put("into", "禁止" + getMsg(inType));
                     model.put("collor", "red");
-                    model.put("errorMsg", "本公司员工,禁止" + getMsg(inType) + "。");
+                    model.put("errorMsg", "本公司员工,禁止" + getMsg(inType) + "。");
                     scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                     return new ModelAndView("/user/scan.ftl", model);
                 }