tijiao

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

@@ -67,17 +67,27 @@ define(function (require) {
             name: 'queryProperties',
             prompt: "用户名称/电话号码",
             labelWidth: 'auto',
-            events: {keydown: enterQueryGrid1}, width: 350
+            events: {keydown: enterQueryGrid1}, width: 200
           },
           {xtype: 'hidden', name: 'unitId'},
           {
+            name: 'reportStatus',
+            xtype: 'combobox',
+            label: '是否上报',
+            data: [{id: '', text: '全部'}, {id: '0', text: '有数据未上报否'}, {id: '1', text: '已上报'}, {id: '2', text: '无数据'}],
+            value: '',
+            onChange: function (value) {
+              queryGrid1();
+            },
+          },
+          {
             xtype: 'searchbox',
             label: '部门',
+            labelWidth: 'auto',
             name: 'unit',
             prompt: "部门",
-            width: '400px',
+            width: 250,
             widget: widgets.selectTableUnit,// 弹出框方法
-            labelWidth: '120px',
             onChange: function (value) {
               if (!isNotNullOrEmpty(value)) {
                 $form.formSet({
@@ -93,7 +103,7 @@ define(function (require) {
             prompt: '导出时间',
             xtype: 'datebox',
             labelWidth: 'auto',
-            width: 250,
+            width: 200,
           },
         ]]
       };

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

@@ -70,6 +70,16 @@ define(function (require) {
             events: {keydown: enterQueryGrid1}, width: 350
           },
           {
+            name: 'reportStatus',
+            xtype: 'combobox',
+            label: '是否上报',
+            data: [{id: '', text: '全部'}, {id: '3', text: '否'}, {id: '1', text: '是'}],
+            value: '',
+            onChange: function (value) {
+              queryGrid1();
+            },
+          },
+          {
             name: 'date',
             label: '导出时间',
             prompt: '导出时间',

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

@@ -54,7 +54,9 @@
                 and (suho.linkman like concat('%',#{queryProperties},'%')
                 or suho.phone like concat('%',#{queryProperties},'%'))
             </if>
-
+            <if test="reportStatus != null and reportStatus != ''">
+                and msr.report_status=#{reportStatus}
+            </if>
         </where>
         order by suu.unit_id asc,suho.linkman
     </select>
@@ -86,6 +88,15 @@
                 and (suho.linkman like concat('%',#{queryProperties},'%')
                 or suho.phone like concat('%',#{queryProperties},'%'))
             </if>
+            <if test="reportStatus != null and reportStatus != '' and reportStatus != 2">
+                and msr.report_status=#{reportStatus}
+            </if>
+            <if test="reportStatus == 2">
+                and msr.report_status is null
+            </if>
+            <if test="reportStatus == 3">
+                and msr.report_status is null or msr.report_status=0
+            </if>
         </where>
         order by suu.unit_id asc,suho.linkman
     </select>