Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,121 @@
+define(function (require) {
+        return function (context) {
+
+            var $grid1, $form;
+
+            // 输入搜索文本后点击回车按钮查询列表
+            function enterQueryGrid1(e) {
+                if (e.keyCode === 13) {
+                    var tmp = $(this).val();
+                    $form.formSet({queryProperties: tmp});
+                    queryGrid1();
+                }
+            }
+
+            //　检索条件查询
+            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: 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 () {
+
+                                        }
+                                    },
+                                    {
+                                        text: '生成隔离人员解除隔离审批表', iconCls: 'fa fa-plus-circle fa-lg', onClick: function () {
+
+                                        }
+                                    }
+
+                                ]
+                            },
+                            multiselect: true, /// 表格多选
+                            idField: 'userId',
+                            editable: true,
+                            editOnSelected: true,
+                            autoSizeColumns: true,
+                            columns:
+                                [
+                                    [
+                                        {field: 'userId', title: '用户ID', hidden: true},
+                                        {field: 'linkman', title: '用户名', maxWidth: 200, align: 'left',},
+                                        {field: 'uptownName', title: '小区名称', maxWidth: 200, align: 'left',},
+                                        {field: 'phone', title: '电话', maxWidth: 200, align: 'left',},
+                                        {field: 'dept', title: '部门', maxWidth: 200, align: 'left',},
+
+                                    ]
+                                ]
+                        }
+                }
+            };
+        };
+    }
+);

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

@@ -48,6 +48,14 @@
           "iconCls": "icon-blank fa fa-align-justify",
           "state": "close",
           "children": []
+        },
+        {
+          "id": "ENT100025",
+          "text": "用户管理",
+          "href": "/app/whepi/lingyun/lingyunUser.js",
+          "iconCls": "icon-blank fa fa-align-justify",
+          "state": "close",
+          "children": []
         }
       ]
     },

whepi-ui/templates/home/ribao.ftl

@@ -15,7 +15,8 @@
         </div>
         <div class="weui-tab__panel">
             <div id="rb_nav1" class="weui-tab__bd-item ri_bao_weui_tab_bd_item_active">
-                <div id="notOpenRibao">
+                <div class="weui-panel weui-panel_access">
+                    <div id="notOpenRibao">
                     <div class="weui-cells weui-cells_form">
                         <div class="weui-cell weui-cell_vcode" style="height: 7vh">
                             <div class="weui-cell__hd">
@@ -47,7 +48,7 @@
                            onclick="addReport()">上报</a>
                     </div>
                 </div>
-                <div id="ribao" class="weui-btn-area" style="display: none">
+                    <div id="ribao" class="weui-btn-area" style="display: none">
                     <div style="text-align: center;">基本信息</div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between;">
                         <input id="js_input_user_name" class="weui-input" autofocus="" type="text" placeholder="请输入姓名"
@@ -328,6 +329,7 @@
                            style="margin-top: 0;width: 30%;">提交</a>
                     </div>
                 </div>
+                </div>
                 </br>
                 </br>
             </div>

whepi-web/src/main/java/com/bofeng/dao/SweepCodeMapper.java

@@ -12,5 +12,6 @@ import java.util.Map;
 @Repository
 public interface SweepCodeMapper {
     List<SysUptownHouse> selectCode(PageDb pageDb, Map<String, Object> queryParam);
+    List<SysUptownHouse> selectLingyunUser(PageDb pageDb, Map<String, Object> queryParam);
     List<SysUptownHouse> export(Map<String, Object> queryParam);
 }

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

@@ -97,6 +97,12 @@ public class SysUptownHouse implements Serializable {
     @TableField(exist = false)
     private String jcStatus;
 
+    @TableField(exist = false)
+    private String dept;
+
+    @TableField(exist = false)
+    private Long userId;
+
 
 
 }

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

@@ -29,6 +29,12 @@ public class SweepCodeService {
     }
 
 
+    public List<SysUptownHouse> selectLingyunUser(PageDb pageDb, Map<String, Object> queryParam) {
+        List<SysUptownHouse> sysUptownHouses = sweepCodeMapper.selectLingyunUser(pageDb,queryParam);
+        return sysUptownHouses;
+    }
+
+
     public List<SysUptownHouse> export(Map<String, Object> queryParam) {
         List<SysUptownHouse> sysUptownHouses = sweepCodeMapper.export(queryParam);
         if(sysUptownHouses.size() != 0){

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

@@ -67,6 +67,14 @@ public class ScanAdminController {
         return Model.newSuccess(pageDb,sysUptownHouses);
     }
 
+    @ApiOperation("凌云用户管理")
+    @PostMapping("/whepi/sweepCode/selectLingyunUser")
+    public Model<List<SysUptownHouse>> selectLingyunUser(PageDb pageDb,HttpParameterParser parser) {
+//        HttpServletResponse response,HttpServletRequest request
+        List<SysUptownHouse> sysUptownHouses = sweepCodeService.selectLingyunUser(pageDb,parser.getMap());
+        return Model.newSuccess(pageDb,sysUptownHouses);
+    }
+
     @ApiOperation("导出")
     @PostMapping("/whepi/sweepCode/export")
     @SneakyThrows

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

@@ -38,6 +38,26 @@
         </where>
      order by c.time_update desc
     </select>
+    <select id="selectLingyunUser" resultType="com.bofeng.entity.SysUptownHouse">
+     select
+     b.user_id,
+     a.linkman,
+     a.phone,
+     e.uptown_name,
+     concat(d.ridgepole,d.unit) as dept
+     from sys_uptown_home a
+     inner join sys_user_role b on a.house_id = b.property_id and b.role_id =1
+     inner join sys_uptown_house c on c.house_id = b.property_id
+     inner join sys_uptown_unit d on c.unit_id = d.unit_id
+     inner join sys_uptown e on e.uptown_id = d.uptown_id and e.uptown_id = 1238790987234
+        <where>
+         <if test="queryProperties != null and queryProperties != ''">
+          e.uptown_name like concat('%',#{queryProperties},'%')
+          or a.linkman like concat('%',#{queryProperties},'%')
+          or a.phone like concat('%',#{queryProperties},'%')
+         </if>
+        </where>
+    </select>
     <select id="export" resultType="com.bofeng.entity.SysUptownHouse">
      select DISTINCT
      a.uptown_name,