From b5670cc0079b79a885a41be00071690251699f6a Mon Sep 17 00:00:00 2001
From: wenc000 <450292408@qq.com>
Date: Wed, 20 May 2020 19:19:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8A=E7=BA=A7=E5=8F=AF?=
 =?UTF-8?q?=E8=AE=A4=E9=A2=86=E4=BC=81=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GridPersonnelController.java              |  16 +
 .../EnterpriseOfGridOperatorServiceImpl.java  |   9 +
 .../gridpersonnel/IGridPersonnelService.java  |   9 +
 .../impl/GridPersonnelServiceImpl.java        |   6 +
 .../gridpersonnel/gridpersonnel-mapper.xml    |   4 +
 .../list-gridpersonnel-mine.html              | 327 ++++++++++++++++++
 6 files changed, 371 insertions(+)
 create mode 100644 src/main/resources/static/route/gridpersonnel/list-gridpersonnel-mine.html

diff --git a/src/main/java/com/cm/inspection/controller/apis/gridpersonnel/GridPersonnelController.java b/src/main/java/com/cm/inspection/controller/apis/gridpersonnel/GridPersonnelController.java
index f6ed4d9..1e065fb 100644
--- a/src/main/java/com/cm/inspection/controller/apis/gridpersonnel/GridPersonnelController.java
+++ b/src/main/java/com/cm/inspection/controller/apis/gridpersonnel/GridPersonnelController.java
@@ -109,4 +109,20 @@ public class GridPersonnelController extends AbstractController {
         return securityComponent.getCurrentUserIdInfo();
     }
 
+    @ApiOperation(value = "我的网格人员分页列表", notes = "我的网格人员分页列表接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "page", value = "当前页码", paramType = "form", dataType = "Integer", defaultValue = "1"),
+            @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "form", dataType = "Integer", defaultValue = "20"),
+            @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "form", dataType = "String"),
+            @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "form", dataType = "String"),
+            @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "form", dataType = "String")
+    })
+    @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+    @GetMapping("listpagegridpersonnelofmine")
+    public SuccessResultList<List<GridPersonnelDTO>> listPageGridPersonnelOfMine(ListPage page) throws SearchException {
+        Map<String, Object> params = requestParams();
+        page.setParams(params);
+        return gridPersonnelService.listPageGridPersonnelOfMine(page);
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/cm/inspection/service/enterpriseofgridoperator/impl/EnterpriseOfGridOperatorServiceImpl.java b/src/main/java/com/cm/inspection/service/enterpriseofgridoperator/impl/EnterpriseOfGridOperatorServiceImpl.java
index a74ddec..69bb34c 100644
--- a/src/main/java/com/cm/inspection/service/enterpriseofgridoperator/impl/EnterpriseOfGridOperatorServiceImpl.java
+++ b/src/main/java/com/cm/inspection/service/enterpriseofgridoperator/impl/EnterpriseOfGridOperatorServiceImpl.java
@@ -185,6 +185,15 @@ public class EnterpriseOfGridOperatorServiceImpl extends BaseService implements
     @Override
     public SuccessResultList<List<EnterpriseOfGridOperatorDTO>> listPageEnterpriseOfGridOperatorByUserId(String userId, ListPage page) {
         page.getParams().put("userId", userId);
+        GridPersonnelDTO gridPersonnelDTO = gridPersonnelService.getGridPersonnelByUserId(userId);
+        if(gridPersonnelDTO == null) {
+            throw new SearchException("");
+        }
+        page.getParams().put("area1", gridPersonnelDTO.getArea1());
+        page.getParams().put("area2", gridPersonnelDTO.getArea2());
+        page.getParams().put("area3", gridPersonnelDTO.getArea3());
+        page.getParams().put("area4", gridPersonnelDTO.getArea4());
+        page.getParams().put("area5", gridPersonnelDTO.getArea5());
         PageHelper.startPage(page.getPage(), page.getRows());
         List<EnterpriseOfGridOperatorDTO> enterpriseOfGridOperatorDTOs = enterpriseOfGridOperatorDao.listEnterpriseOfGridOperatorByUserId(page.getParams());
         PageInfo<EnterpriseOfGridOperatorDTO> pageInfo = new PageInfo<>(enterpriseOfGridOperatorDTOs);
diff --git a/src/main/java/com/cm/inspection/service/gridpersonnel/IGridPersonnelService.java b/src/main/java/com/cm/inspection/service/gridpersonnel/IGridPersonnelService.java
index 7fe8a30..96a234b 100644
--- a/src/main/java/com/cm/inspection/service/gridpersonnel/IGridPersonnelService.java
+++ b/src/main/java/com/cm/inspection/service/gridpersonnel/IGridPersonnelService.java
@@ -155,4 +155,13 @@ public interface IGridPersonnelService {
      * @throws SearchException
      */
     GridPersonnelDTO getGridPersonnelByUserId(String userId) throws SearchException;
+
+    /**
+     * 我的网格人员分页列表
+     *
+     * @param page
+     * @return
+     * @throws SearchException
+     */
+    SuccessResultList<List<GridPersonnelDTO>> listPageGridPersonnelOfMine(ListPage page) throws SearchException;
 }
diff --git a/src/main/java/com/cm/inspection/service/gridpersonnel/impl/GridPersonnelServiceImpl.java b/src/main/java/com/cm/inspection/service/gridpersonnel/impl/GridPersonnelServiceImpl.java
index 4edbfda..fbe010a 100644
--- a/src/main/java/com/cm/inspection/service/gridpersonnel/impl/GridPersonnelServiceImpl.java
+++ b/src/main/java/com/cm/inspection/service/gridpersonnel/impl/GridPersonnelServiceImpl.java
@@ -185,4 +185,10 @@ public class GridPersonnelServiceImpl extends BaseService implements IGridPerson
         return gridPersonnelDao.getGridPersonnel(params);
     }
 
+    @Override
+    public SuccessResultList<List<GridPersonnelDTO>> listPageGridPersonnelOfMine(ListPage page) throws SearchException {
+        page.getParams().put("leaderUserId", securityComponent.getCurrentUser().getUserId());
+        return listPageGridPersonnel(page);
+    }
+
 }
diff --git a/src/main/resources/mybatis/mapper/gridpersonnel/gridpersonnel-mapper.xml b/src/main/resources/mybatis/mapper/gridpersonnel/gridpersonnel-mapper.xml
index bf3cb1f..4817576 100644
--- a/src/main/resources/mybatis/mapper/gridpersonnel/gridpersonnel-mapper.xml
+++ b/src/main/resources/mybatis/mapper/gridpersonnel/gridpersonnel-mapper.xml
@@ -222,6 +222,10 @@
         AND
             t1.user_id LIKE CONCAT(#{userId}, '%')
         </if>
+        <if test="leaderUserId != null and leaderUserId != ''">
+        AND
+            t1.leader_user_id LIKE CONCAT(#{leaderUserId}, '%')
+        </if>
         <if test="level != null">
         AND
             t1.level = #{level}
diff --git a/src/main/resources/static/route/gridpersonnel/list-gridpersonnel-mine.html b/src/main/resources/static/route/gridpersonnel/list-gridpersonnel-mine.html
new file mode 100644
index 0000000..d7746b4
--- /dev/null
+++ b/src/main/resources/static/route/gridpersonnel/list-gridpersonnel-mine.html
@@ -0,0 +1,327 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <base href="/inspection/">
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
+    <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+<div class="layui-fluid layui-anim layui-anim-fadein">
+    <div class="layui-row">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-body">
+                    <div class="test-table-reload-btn" style="margin-bottom: 10px;">
+                        <div class="layui-inline">
+                            <input type="text" id="keywords" class="layui-input search-item" placeholder="输入关键字">
+                        </div>
+                        <button type="button" id="search" class="layui-btn layui-btn-sm">
+                            <i class="fa fa-lg fa-search"></i> 搜索
+                        </button>
+                    </div>
+                    <table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
+                    <!-- 表头按钮组 -->
+                    <script type="text/html" id="headerToolBar">
+                        <div class="layui-btn-group">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="saveEvent">
+                                <i class="fa fa-lg fa-plus"></i> 新增
+                            </button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="updateEvent">
+                                <i class="fa fa-lg fa-edit"></i> 编辑
+                            </button>
+                            <button type="button" class="layui-btn layui-btn-danger layui-btn-sm" lay-event="removeEvent">
+                                <i class="fa fa-lg fa-trash"></i> 删除
+                            </button>
+                        </div>
+                    </script>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="assets/layuiadmin/layui/layui.js"></script>
+<script>
+    layui.config({
+        base: 'assets/layuiadmin/'
+    }).extend({
+        index: 'lib/index'
+    }).use(['index', 'table', 'laydate', 'common'], function() {
+        var $ = layui.$;
+        var $win = $(window);
+        var table = layui.table;
+        var admin = layui.admin;
+        var laydate = layui.laydate;
+        var common = layui.common;
+        var windowWidth = $(window).width();
+        var windowHeight = $(window).height();
+        var resizeTimeout = null;
+        var level = top.restAjax.params(window.location.href).level;
+        var tableUrl = 'api/gridpersonnel/listpagegridpersonnelofmine';
+
+        // 初始化表格
+        function initTable() {
+            table.render({
+                elem: '#dataTable',
+                id: 'dataTable',
+                url: top.restAjax.path(tableUrl, []),
+                width: admin.screen() > 1 ? '100%' : '',
+                height: $win.height() - 90,
+                limit: 20,
+                limits: [20, 40, 60, 80, 100, 200],
+                toolbar: '#headerToolBar',
+                request: {
+                    pageName: 'page',
+                    limitName: 'rows'
+                },
+                cols: [[
+                    {type:'checkbox', fixed: 'left'},
+                    {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
+                    {field: 'userId', width: 200, title: '网格员', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            var selectArray = rowData.split(',');
+                            var value = '';
+                            for(var i = 0, item = selectArray[i]; item = selectArray[i++];) {
+                                var info = item.split('|');
+                                if(value.length > 0) {
+                                    value += ',';
+                                }
+                                value += info[3];
+                            }
+                            return value;
+                        }
+                    },
+                    {field: 'area1DictionaryName', width: 150, title: '1级区域', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'area2DictionaryName', width: 150, title: '2级区域', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'area3DictionaryName', width: 150, title: '3级区域', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'area4DictionaryName', width: 150, title: '4级区域', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'area5DictionaryName', width: 150, title: '5级区域', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'leaderUserId', width: 200, title: '上级领导', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            var selectArray = rowData.split(',');
+                            var value = '';
+                            for(var i = 0, item = selectArray[i]; item = selectArray[i++];) {
+                                var info = item.split('|');
+                                if(value.length > 0) {
+                                    value += ',';
+                                }
+                                value += info[3];
+                            }
+                            return value;
+                        }
+                    },
+                    {field: 'isGridOperator', width: 100, title: '是否网格员', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            if(rowData == 0) {
+                                return '否';
+                            } else if(rowData == 1) {
+                                return '是';
+                            }
+                            return rowData;
+                        }
+                    },
+                    {field: 'level', width: 100, title: '级别', align:'center',
+                        templet: function(row) {
+                            var rowData = row[this.field];
+                            if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
+                                return '-';
+                            }
+                            return rowData + '级';
+                        }
+                    },
+                    {field: 'operation', width: 100, title: '操作', fixed: 'right', align:'center',
+                        templet: function(row) {
+                            if(row.isGridOperator == 1) {
+                                return '<button type="button" class="layui-btn layui-btn-normal layui-btn-sm" lay-event="affiliatedEnterpriseEvent">关联企业</button>';
+                            } else {
+                                return '-';
+                            }
+                        }
+                    }
+                ]],
+                page: true,
+                parseData: function(data) {
+                    return {
+                        'code': 0,
+                        'msg': '',
+                        'count': data.total,
+                        'data': data.rows
+                    };
+                }
+            });
+        }
+        // 重载表格
+        function reloadTable(currentPage) {
+            table.reload('dataTable', {
+                url: top.restAjax.path(tableUrl, []),
+                where: {
+                    keywords: $('#keywords').val(),
+
+                },
+                page: {
+                    curr: currentPage
+                },
+                height: $win.height() - 90,
+            });
+        }
+        // 删除
+        function removeData(ids) {
+            top.dialog.msg(top.dataMessage.delete, {
+                time: 0,
+                btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
+                shade: 0.3,
+                yes: function (index) {
+                    top.dialog.close(index);
+                    var layIndex;
+                    top.restAjax.delete(top.restAjax.path('api/gridpersonnel/removegridpersonnel/{ids}', [ids]), {}, null, function (code, data) {
+                        top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000});
+                        reloadTable();
+                    }, function (code, data) {
+                        top.dialog.msg(data.msg);
+                    }, function () {
+                        layIndex = top.dialog.msg(top.dataMessage.deleting, {icon: 16, time: 0, shade: 0.3});
+                    }, function () {
+                        top.dialog.close(layIndex);
+                    });
+                }
+            });
+        }
+        initTable();
+        // 事件 - 页面变化
+        $win.on('resize', function() {
+            clearTimeout(resizeTimeout);
+            resizeTimeout = setTimeout(function() {
+                reloadTable();
+            }, 500);
+        });
+        // 事件 - 搜索
+        $(document).on('click', '#search', function() {
+            reloadTable(1);
+        });
+        // 事件 - 增删改
+        table.on('toolbar(dataTable)', function(obj) {
+            var layEvent = obj.event;
+            var checkStatus = table.checkStatus('dataTable');
+            var checkDatas = checkStatus.data;
+            if(layEvent === 'saveEvent') {
+                layer.open({
+                    type: 2,
+                    title: false,
+                    closeBtn: 0,
+                    area: ['100%', '100%'],
+                    shadeClose: true,
+                    anim: 2,
+                    content: top.restAjax.path('route/gridpersonnel/save-gridpersonnel.html?level={level}', [level]),
+                    end: function() {
+                        reloadTable();
+                    }
+                });
+            } else if(layEvent === 'updateEvent') {
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectEdit);
+                } else if(checkDatas.length > 1) {
+                    top.dialog.msg(top.dataMessage.table.selectOneEdit);
+                } else {
+                    layer.open({
+                        type: 2,
+                        title: false,
+                        closeBtn: 0,
+                        area: ['100%', '100%'],
+                        shadeClose: true,
+                        anim: 2,
+                        content: top.restAjax.path('route/gridpersonnel/update-gridpersonnel.html?gridPersonnelId={gridPersonnelId}&level={level}', [checkDatas[0].gridPersonnelId, level]),
+                        end: function() {
+                            reloadTable();
+                        }
+                    });
+                }
+            } else if(layEvent === 'removeEvent') {
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectDelete);
+                } else {
+                    var ids = '';
+                    for(var i = 0, item; item = checkDatas[i++];) {
+                        if(i > 1) {
+                            ids += '_';
+                        }
+                        ids += item['gridPersonnelId'];
+                    }
+                    removeData(ids);
+                }
+            }
+        });
+        table.on('tool(dataTable)', function(obj) {
+            var layEvent = obj.event;
+            var data = obj.data;
+            if(layEvent === 'affiliatedEnterpriseEvent') {
+                var userArray = data.userId.split('\|');
+                var userId = userArray[0];
+                var userDepartmentName = userArray[3];
+                top.dialog.open({
+                    url: top.restAjax.path('route/enterpriseofgridoperator/list-enterpriseofgridoperator.html?userId={userId}', [userId]),
+                    title: userDepartmentName +' 的关联企业',
+                    width: (windowWidth * 0.9) +'px',
+                    height: (windowHeight * 0.9) +'px'
+                });
+            }
+        })
+    });
+</script>
+</body>
+</html>
\ No newline at end of file