凌云集团更改公司

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

@@ -69,7 +69,7 @@
         {
           "id": "ENT101003",
           "text": "凌云二类特殊人员管理",
-          "href": "/app/whepi/scan/specialPersonnelLY2.js",
+          "href": "/app/whepi/scan/specialPersonnelLYS2.js",
           "iconCls": "icon-blank fa fa-align-justify",
           "state": "close",
           "children": []
@@ -85,7 +85,7 @@
         {
           "id": "ENT101005",
           "text": "凌云六类人员管理",
-          "href": "/app/whepi/scan/specialPersonnelLYSix.js",
+          "href": "/app/whepi/scan/specialPersonnelLYSixS.js",
           "iconCls": "icon-blank fa fa-align-justify",
           "state": "close",
           "children": []

admin-ui/app/whepi/scan/specialPersonnelLYS.js

@@ -0,0 +1,290 @@
+define(function (require) {
+        return function (context) {
+
+            var $grid1, $form;
+
+            // 弹框的方式
+            var widgets = {
+                // 搜索分类检索
+                selectTableUnit: {
+                    url: 'app/whepi/home/selectLYbumen.js',
+                    bind: {
+                        unitId: 'unitId',
+                        unit: 'unit',
+                    },
+                },
+            }
+
+            // 输入搜索文本后点击回车按钮查询列表
+            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 queryGrid1() {
+                var queryForm = $form.formGet();
+                queryForm.tuType = 1;
+                $grid1.reload({
+                    mtype: 'POST',
+                    url: api('/OutUser/selectAllOutUserLY'),
+                    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: 350
+                    },
+                    {xtype: 'hidden', name: 'unitId'},
+                    {
+                        xtype: 'searchbox',
+                        label: '部门',
+                        labelWidth: 'auto',
+                        name: 'unit',
+                        prompt: "部门",
+                        width: 250,
+                        widget: widgets.selectTableUnit,// 弹出框方法
+                        onChange: function (value) {
+                            if (!isNotNullOrEmpty(value)) {
+                                $form.formSet({
+                                    unitId : ''
+                                })
+                            }
+                            queryGrid1();
+                        },
+                    },
+                    {
+                        xtype: 'textbox',
+                        label: '电话',
+                        name: 'phone',
+                        prompt: "请输入完整的电话号码",
+                        labelWidth: 'auto',
+                        events: {keydown: enterQueryGrid2}, width: 350
+                    },
+                ]]
+            };
+
+            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-plus-circle fa-lg', onClick: function () {
+                                            $.yvan.showDialog(this,
+                                                require('/app/whepi/scan/addOutUserLY.js')({
+                                                    isEdit: false,
+                                                    confirm: function () {
+                                                        queryGrid1();
+                                                    }
+                                                })
+                                            );
+                                        }
+                                    },
+                                    // {
+                                    //     text: '保存', iconCls: 'fa fa-pencil-square-o', onClick: function () {
+                                    //         var row = $grid1.rowData();
+                                    //         if (!row) {
+                                    //             $.yvan.msg('请选择一条要保存的数据');
+                                    //             return;
+                                    //         }
+                                    //         var startDateStr = row.startDateStr;
+                                    //         var endDateStr = row.endDateStr;
+                                    //         if (startDateStr > endDateStr) {
+                                    //             $.yvan.msg('开始时间必须小于等于结束时间');
+                                    //             return;
+                                    //         }
+                                    //         $.yvan.ajax({
+                                    //             url: api('/OutUser/updateOutUser'),
+                                    //             data: {
+                                    //                 tuId: row.tuId,
+                                    //                 startDate: row.startDateStr,
+                                    //                 endDate: row.endDateStr
+                                    //             },
+                                    //             method: 'post',
+                                    //             async: false,
+                                    //             success: function (data) {
+                                    //                 $.yvan.msg("操作成功");
+                                    //                 $grid1.reload();
+                                    //                 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].tuId + ","
+                                            }
+                                            $.yvan.confirm('确定删除勾选的这' + row.length + '条特殊人员吗？', {
+                                                yes: function (index) {
+                                                    $.yvan.ajax({
+                                                        method: 'post',
+                                                        url: api('/OutUser/deleteOutUser'),
+                                                        data: {ids: ids},
+                                                        success: function (data) {
+                                                            $.yvan.msg("删除成功");
+                                                            $grid1.reload();
+                                                            queryGrid1();
+                                                        }
+                                                    });
+                                                }
+                                            });
+                                        }
+                                    }
+                                ]
+                            },
+                            multiselect: true, /// 表格多选
+                            idField: 'tuId',
+                            editable: true,
+                            editOnSelected: true,
+                            autoSizeColumns: true,
+                            columns:
+                                [
+                                    [
+                                        {field: 'tuId', title: '用户ID', hidden: true},
+                                        {field: 'userId', title: '用户ID', hidden: true},
+                                        {field: 'unit', title: '部门', maxWidth: 200, align: 'left',},
+                                        {field: 'name', title: '名字', maxWidth: 200, align: 'left',},
+                                        {field: 'phone', title: '电话', maxWidth: 200, align: 'left',},
+                                        {field: 'doorplate', title: '工号', maxWidth: 200, align: 'left',},
+                                        {
+                                            field: 'startDateStr', title: '开始时间', minWidth: 120, maxWidth: 300, align: 'left', editor: {
+                                                xtype: 'datebox',
+                                                required: true,
+                                                onChange: function (value) {
+                                                    console.log(value)
+                                                    var row = $grid1.rowData();
+                                                    var startDateStr = row.startDateStr;
+                                                    var endDateStr = row.endDateStr;
+                                                    if (startDateStr > endDateStr) {
+                                                        $.yvan.msg('开始时间必须小于等于结束时间');
+                                                        return;
+                                                    } else {
+                                                        $.yvan.ajax({
+                                                            url: api('/OutUser/updateOutUser'),
+                                                            data: {
+                                                                tuId: row.tuId,
+                                                                startDate: row.startDateStr,
+                                                                endDate: row.endDateStr
+                                                            },
+                                                            method: 'post',
+                                                            async: false,
+                                                            success: function (data) {
+                                                                $.yvan.msg("操作成功");
+                                                                return;
+                                                            }
+                                                        });
+                                                    }
+                                                },
+                                                maxlength: 50
+                                            }
+                                        },
+                                        {
+                                            field: 'endDateStr', title: '结束时间', minWidth: 120, maxWidth: 200, align: 'left', editor: {
+                                                xtype: 'datebox',
+                                                required: true,
+                                                onChange: function (value) {
+                                                    console.log(value)
+                                                    var row = $grid1.rowData();
+                                                    var startDateStr = row.startDateStr;
+                                                    var endDateStr = row.endDateStr;
+                                                    if (startDateStr > endDateStr) {
+                                                        $.yvan.msg('开始时间必须小于等于结束时间');
+                                                        return;
+                                                    } else {
+                                                        $.yvan.ajax({
+                                                            url: api('/OutUser/updateOutUser'),
+                                                            data: {
+                                                                tuId: row.tuId,
+                                                                startDate: row.startDateStr,
+                                                                endDate: row.endDateStr
+                                                            },
+                                                            method: 'post',
+                                                            async: false,
+                                                            success: function (data) {
+                                                                $.yvan.msg("操作成功");
+                                                                return;
+                                                            }
+                                                        });
+                                                    }
+                                                },
+                                                maxlength: 50
+                                            }
+                                        },
+                                        {field: 'staffName', title: '修改人', maxWidth: 200, align: 'left',},
+                                    ]
+                                ]
+                        }
+                }
+            };
+        };
+    }
+);

admin-ui/app/whepi/scan/specialPersonnelLYS2.js

@@ -0,0 +1,249 @@
+define(function (require) {
+        return function (context) {
+
+            var $grid1, $form;
+
+            // 弹框的方式
+            var widgets = {
+                // 搜索分类检索
+                selectTableUnit: {
+                    url: 'app/whepi/home/selectLYbumen.js',
+                    bind: {
+                        unitId: 'unitId',
+                        unit: 'unit',
+                    },
+                },
+            };
+
+            // 输入搜索文本后点击回车按钮查询列表
+            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 queryGrid1() {
+                var queryForm = $form.formGet();
+                queryForm.tuType = 5;
+                $grid1.reload({
+                    mtype: 'POST',
+                    url: api('/OutUser/selectAllOutUserLY'),
+                    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: 350
+                    },
+                    {xtype: 'hidden', name: 'unitId'},
+                    {
+                        xtype: 'searchbox',
+                        label: '部门',
+                        labelWidth: 'auto',
+                        name: 'unit',
+                        prompt: "部门",
+                        width: 250,
+                        widget: widgets.selectTableUnit,// 弹出框方法
+                        onChange: function (value) {
+                            if (!isNotNullOrEmpty(value)) {
+                                $form.formSet({
+                                    unitId : ''
+                                })
+                            }
+                            queryGrid1();
+                        },
+                    },
+                    {
+                        xtype: 'textbox',
+                        label: '电话',
+                        name: 'phone',
+                        prompt: "请输入完整的电话号码",
+                        labelWidth: 'auto',
+                        events: {keydown: enterQueryGrid2}, width: 350
+                    },
+                ]]
+            };
+
+            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-plus-circle fa-lg', onClick: function () {
+                                            $.yvan.showDialog(this,
+                                                require('/app/whepi/scan/addOutUserLY2.js')({
+                                                    isEdit: false,
+                                                    confirm: function () {
+                                                        queryGrid1();
+                                                    }
+                                                })
+                                            );
+                                        }
+                                    },
+                                    // {
+                                    //     text: '保存', iconCls: 'fa fa-pencil-square-o', onClick: function () {
+                                    //         var row = $grid1.rowData();
+                                    //         if (!row) {
+                                    //             $.yvan.msg('请选择一条要保存的数据');
+                                    //             return;
+                                    //         }
+                                    //         var startDateStr = row.startDateStr;
+                                    //         var endDateStr = row.endDateStr;
+                                    //         if (startDateStr > endDateStr) {
+                                    //             $.yvan.msg('开始时间必须小于等于结束时间');
+                                    //             return;
+                                    //         }
+                                    //         $.yvan.ajax({
+                                    //             url: api('/OutUser/updateOutUser'),
+                                    //             data: {
+                                    //                 tuId: row.tuId,
+                                    //                 startDate: row.startDateStr,
+                                    //                 endDate: row.endDateStr
+                                    //             },
+                                    //             method: 'post',
+                                    //             async: false,
+                                    //             success: function (data) {
+                                    //                 $.yvan.msg("操作成功");
+                                    //                 $grid1.reload();
+                                    //                 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].tuId + ","
+                                            }
+                                            $.yvan.confirm('确定删除勾选的这' + row.length + '条二类特殊人员吗？', {
+                                                yes: function (index) {
+                                                    $.yvan.ajax({
+                                                        method: 'post',
+                                                        url: api('/OutUser/deleteOutUser'),
+                                                        data: {ids: ids},
+                                                        success: function (data) {
+                                                            $.yvan.msg("删除成功");
+                                                            $grid1.reload();
+                                                            queryGrid1();
+                                                        }
+                                                    });
+                                                }
+                                            });
+                                        }
+                                    }
+                                ]
+                            },
+                            multiselect: true, /// 表格多选
+                            idField: 'tuId',
+                            editable: true,
+                            editOnSelected: true,
+                            autoSizeColumns: true,
+                            columns:
+                                [
+                                    [
+                                        {field: 'tuId', title: '用户ID', hidden: true},
+                                        {field: 'userId', title: '用户ID', hidden: true},
+                                        {field: 'unit', title: '部门', maxWidth: 200, align: 'left',},
+                                        {field: 'name', title: '名字', maxWidth: 200, align: 'left',},
+                                        {field: 'phone', title: '电话', maxWidth: 200, align: 'left',},
+                                        {field: 'doorplate', title: '工号', maxWidth: 200, align: 'left',},
+                                        {
+                                            field: 'startDateStr', title: '开始时间', minWidth: 120, maxWidth: 300, align: 'left', editor: {
+                                                xtype: 'datebox',
+                                                required: true,
+                                                onChange: function (value) {
+                                                    var row = $grid1.rowData();
+                                                    $.yvan.ajax({
+                                                        url: api('/OutUser/updateOutUserLY2'),
+                                                        data: {
+                                                            tuId: row.tuId,
+                                                            startDate: row.startDateStr,
+                                                        },
+                                                        method: 'post',
+                                                        async: false,
+                                                        success: function (data) {
+                                                            $.yvan.msg("操作成功");
+                                                            return;
+                                                        }
+                                                    });
+                                                },
+                                                maxlength: 50
+                                            }
+                                        },
+                                        {field: 'staffName', title: '修改人', maxWidth: 200, align: 'left',},
+                                    ]
+                                ]
+                        }
+                }
+            };
+        };
+    }
+);

admin-ui/app/whepi/scan/specialPersonnelLYSixS.js

@@ -0,0 +1,272 @@
+define(function (require) {
+        return function (context) {
+
+            var $grid1, $form;
+
+            // 弹框的方式
+            var widgets = {
+                // 搜索分类检索
+                selectTableUnit: {
+                    url: 'app/whepi/home/selectLYbumen.js',
+                    bind: {
+                        unitId: 'unitId',
+                        unit: 'unit',
+                    },
+                },
+            };
+
+            // 输入搜索文本后点击回车按钮查询列表
+            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 queryGrid1() {
+                var queryForm = $form.formGet();
+                queryForm.tuType = 4;
+                $grid1.reload({
+                    mtype: 'POST',
+                    url: api('/OutUser/selectAllOutUserLY'),
+                    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: 350
+                    },
+                    {xtype: 'hidden', name: 'unitId'},
+                    {
+                        xtype: 'searchbox',
+                        label: '部门',
+                        labelWidth: 'auto',
+                        name: 'unit',
+                        prompt: "部门",
+                        width: 250,
+                        widget: widgets.selectTableUnit,// 弹出框方法
+                        onChange: function (value) {
+                            if (!isNotNullOrEmpty(value)) {
+                                $form.formSet({
+                                    unitId : ''
+                                })
+                            }
+                            queryGrid1();
+                        },
+                    },
+                    {
+                        xtype: 'textbox',
+                        label: '电话',
+                        name: 'phone',
+                        prompt: "请输入完整的电话号码",
+                        labelWidth: 'auto',
+                        events: {keydown: enterQueryGrid2}, width: 350
+                    },
+                ]]
+            };
+
+            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-plus-circle fa-lg', onClick: function () {
+                                            $.yvan.showDialog(this,
+                                                require('/app/whepi/scan/addOutUserLYSix.js')({
+                                                    isEdit: false,
+                                                    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].tuId + ","
+                                            }
+                                            $.yvan.confirm('确定删除勾选的这' + row.length + '条六类人员吗？', {
+                                                yes: function (index) {
+                                                    $.yvan.ajax({
+                                                        method: 'post',
+                                                        url: api('/OutUser/deleteOutUser'),
+                                                        data: {ids: ids},
+                                                        success: function (data) {
+                                                            $.yvan.msg("删除成功");
+                                                            $grid1.reload();
+                                                            queryGrid1();
+                                                        }
+                                                    });
+                                                }
+                                            });
+                                        }
+                                    },
+                                    {
+                                        text: '导出系统六类人员', iconCls: 'fa fa-cloud-upload', onClick: function () {
+                                            var queryForm = $form.formGet();
+                                            $.yvan.download({
+                                                method: 'post',
+                                                url: api('/sweepCode/getByReportSuspected'),
+                                                fileName: '系统六类人员-' + $.yvan.getMoment().format('YYYY-MM-DD HH:mm:ss') + '.xlsx'
+
+                                            });
+                                        }
+                                    },
+                                ]
+                            },
+                            multiselect: true, /// 表格
+                            // 多选
+                            idField: 'tuId',
+                            editable: true,
+                            editOnSelected: true,
+                            autoSizeColumns: true,
+                            columns:
+                                [
+                                    [
+                                        {field: 'tuId', title: '用户ID', hidden: true},
+                                        {field: 'userId', title: '用户ID', hidden: true},
+                                        {field: 'unit', title: '部门', maxWidth: 200, align: 'left',},
+                                        {field: 'name', title: '名字', maxWidth: 200, align: 'left',},
+                                        {field: 'phone', title: '电话', maxWidth: 200, align: 'left',},
+                                        {field: 'doorplate', title: '工号', maxWidth: 200, align: 'left',},
+                                        {
+                                            field: 'startDateStr', title: '开始时间', minWidth: 120, maxWidth: 300, align: 'left', editor: {
+                                                xtype: 'datebox',
+                                                required: true,
+                                                onChange: function (value) {
+                                                    console.log(value)
+                                                    var row = $grid1.rowData();
+                                                    var startDateStr = row.startDateStr;
+                                                    var endDateStr = row.endDateStr;
+                                                    if (startDateStr > endDateStr) {
+                                                        $.yvan.msg('开始时间必须小于等于结束时间');
+                                                        return;
+                                                    } else {
+                                                        $.yvan.ajax({
+                                                            url: api('/OutUser/updateOutUser'),
+                                                            data: {
+                                                                tuId: row.tuId,
+                                                                startDate: row.startDateStr,
+                                                                endDate: row.endDateStr
+                                                            },
+                                                            method: 'post',
+                                                            async: false,
+                                                            success: function (data) {
+                                                                $.yvan.msg("操作成功");
+                                                                return;
+                                                            }
+                                                        });
+                                                    }
+                                                },
+                                                maxlength: 50
+                                            }
+                                        },
+                                        {
+                                            field: 'endDateStr', title: '结束时间', minWidth: 120, maxWidth: 200, align: 'left', editor: {
+                                                xtype: 'datebox',
+                                                required: true,
+                                                onChange: function (value) {
+                                                    console.log(value)
+                                                    var row = $grid1.rowData();
+                                                    var startDateStr = row.startDateStr;
+                                                    var endDateStr = row.endDateStr;
+                                                    if (startDateStr > endDateStr) {
+                                                        $.yvan.msg('开始时间必须小于等于结束时间');
+                                                        return;
+                                                    } else {
+                                                        $.yvan.ajax({
+                                                            url: api('/OutUser/updateOutUser'),
+                                                            data: {
+                                                                tuId: row.tuId,
+                                                                startDate: row.startDateStr,
+                                                                endDate: row.endDateStr
+                                                            },
+                                                            method: 'post',
+                                                            async: false,
+                                                            success: function (data) {
+                                                                $.yvan.msg("操作成功");
+                                                                return;
+                                                            }
+                                                        });
+                                                    }
+                                                },
+                                                maxlength: 50
+                                            }
+                                        },
+                                        {field: 'staffName', title: '修改人', maxWidth: 200, align: 'left',},
+                                    ]
+                                ]
+                        }
+                }
+            };
+        };
+    }
+);

whepi-doc/login.sql

@@ -221,6 +221,8 @@ CREATE TABLE out_user  (
   time              int(11) NOT NULL DEFAULT 0 COMMENT '总共时间(天)',
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
+  user_create       bigint(20) NOT NULL DEFAULT 0 COMMENT '新增人',
+  user_update       bigint(20) NOT NULL DEFAULT 0 COMMENT '修改人',
   PRIMARY KEY (tu_id) USING BTREE,
   UNIQUE INDEX phone(phone, tu_type, name) USING BTREE
 ) ENGINE = InnoDB default charset=utf8mb4 comment = '进出扫码特殊人员';

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

@@ -46,6 +46,14 @@ public class OutUser {
     @TableField("time")
     private Integer time;
 
+    @ApiModelProperty("新增人")
+    @TableField("user_create")
+    private Long userCreate;
+
+    @ApiModelProperty("修改人")
+    @TableField("user_update")
+    private Long userUpdate;
+
     @TableField(exist = false)
     private DateTime timeCreate;
 
@@ -72,4 +80,7 @@ public class OutUser {
 
     @TableField(exist = false)
     private String doorplate;
+
+    @TableField(exist = false)
+    private String staffName;
 }

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

@@ -257,6 +257,7 @@ public class ScanAdminController {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         o.setStartDate(sdf.parse(startDate));
         o.setEndDate(sdf.parse(endDate));
+        o.setUserUpdate(JwtHelper.getUserId());
         return Model.newSuccess(outUserMapper.updateById(o));
     }
 
@@ -267,6 +268,7 @@ public class ScanAdminController {
         OutUser o = outUserMapper.selectById(tuId);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         o.setStartDate(sdf.parse(startDate));
+        o.setUserUpdate(JwtHelper.getUserId());
         return Model.newSuccess(outUserMapper.updateById(o));
     }
 
@@ -305,6 +307,8 @@ public class ScanAdminController {
         outUser.setStartDate(new Date());
         outUser.setEndDate(new Date());
         outUser.setTime(1);
+        outUser.setUserCreate(JwtHelper.getUserId());
+        outUser.setUserUpdate(JwtHelper.getUserId());
         return Model.newSuccess(outUserMapper.insert(outUser));
     }
 
@@ -324,6 +328,8 @@ public class ScanAdminController {
         outUser.setStartDate(new Date());
         outUser.setEndDate(new Date());
         outUser.setTime(1);
+        outUser.setUserCreate(JwtHelper.getUserId());
+        outUser.setUserUpdate(JwtHelper.getUserId());
         return Model.newSuccess(outUserMapper.insert(outUser));
     }
 
@@ -343,6 +349,8 @@ public class ScanAdminController {
         outUser.setStartDate(new Date());
         outUser.setEndDate(new Date());
         outUser.setTime(1);
+        outUser.setUserCreate(JwtHelper.getUserId());
+        outUser.setUserUpdate(JwtHelper.getUserId());
         return Model.newSuccess(outUserMapper.insert(outUser));
     }
 
@@ -362,6 +370,8 @@ public class ScanAdminController {
         outUser.setStartDate(new Date());
         outUser.setEndDate(new Date());
         outUser.setTime(1);
+        outUser.setUserCreate(JwtHelper.getUserId());
+        outUser.setUserUpdate(JwtHelper.getUserId());
         return Model.newSuccess(outUserMapper.insert(outUser));
     }
 

whepi-web/src/main/resources/mapper/OutUserMapper.xml

@@ -4,13 +4,14 @@
 
     <select id="getAllOutUser" resultType="com.bofeng.entity.OutUser">
         select u.tu_id,ur.user_id as userId,su.uptown_name as uptownName,uu.ridgepole,uu.unit,u.name,u.phone,suh.doorplate,
-        DATE_FORMAT(u.start_date,'%Y-%m-%d') as startDateStr,DATE_FORMAT(u.end_date,'%Y-%m-%d') as endDateStr
+        DATE_FORMAT(u.start_date,'%Y-%m-%d') as startDateStr,DATE_FORMAT(u.end_date,'%Y-%m-%d') as endDateStr,sur.staff_name as staffName
         from out_user u
         left join sys_uptown_home uh on uh.phone = u.phone and uh.linkman = u.name
         left join sys_user_role ur on ur.property_id = uh.house_id and ur.role_id = 1
         left join sys_uptown_house suh on suh.house_id = uh.house_id
         left join sys_uptown_unit uu on uu.unit_id = suh.unit_id
         left join sys_uptown su on su.uptown_id = uu.uptown_id
+        left join sys_user sur on sur.user_id = u.user_update
         <where>
             <if test="queryProperties != null and queryProperties != ''">
                 (
@@ -33,13 +34,14 @@
 
     <select id="getAllOutUserLY" resultType="com.bofeng.entity.OutUser">
         select u.tu_id,ur.user_id as userId,su.uptown_name as uptownName,CONCAT(uu.ridgepole,uu.unit) as unit,u.name,u.phone,suh.doorplate,
-        DATE_FORMAT(u.start_date,'%Y-%m-%d') as startDateStr,DATE_FORMAT(u.end_date,'%Y-%m-%d') as endDateStr
+        DATE_FORMAT(u.start_date,'%Y-%m-%d') as startDateStr,DATE_FORMAT(u.end_date,'%Y-%m-%d') as endDateStr,sur.staff_name as staffName
         from out_user u
         left join sys_uptown_home uh on uh.phone = u.phone and uh.linkman = u.name
         left join sys_user_role ur on ur.property_id = uh.house_id and ur.role_id = 1
         left join sys_uptown_house suh on suh.house_id = uh.house_id
         left join sys_uptown_unit uu on uu.unit_id = suh.unit_id
         left join sys_uptown su on su.uptown_id = uu.uptown_id
+        left join sys_user sur on sur.user_id = u.user_update
         <where>
             <if test="queryProperties != null and queryProperties != ''">
                 (