凌云集团更改公司

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

@@ -104,13 +104,54 @@ define(function (require) {
             xtype: 'datebox',
             labelWidth: 'auto',
             width: 200,
+          },],[
+          {
+            name: 'msStatus',
+            xtype: 'combobox',
+            label: '个人上报状态',
+            data: [{id: '', text: '全部'}, {id: '1', text: '未上报'}, {id: '2', text: '正常'}, {id: '3', text: '异常'}],
+            value: '',
+            onChange: function (value) {
+              queryGrid1();
+            },
+          },
+          {
+            name: 'isContact',
+            xtype: 'combobox',
+            label: '家人确诊或接触',
+            width: 200,
+            data: [{id: '', text: '全部'}, {id: '0', text: '否'}, {id: '1', text: '是'}],
+            value: '',
+            onChange: function (value) {
+              queryGrid1();
+            },
+          },
+          {
+            name: 'isSuspected',
+            xtype: 'combobox',
+            label: '家人健康异常',
+            data: [{id: '', text: '全部'}, {id: '0', text: '否'}, {id: '1', text: '是'}],
+            value: '',
+            onChange: function (value) {
+              queryGrid1();
+            },
+          },
+          {
+            name: 'isTrip',
+            xtype: 'combobox',
+            label: '是否出行',
+            data: [{id: '', text: '全部'}, {id: '0', text: '否'}, {id: '1', text: '是'}],
+            value: '',
+            onChange: function (value) {
+              queryGrid1();
+            },
           },
         ]]
       };
 
       return {
         north: {
-          height: 88,
+          height: 132,
           /* split: true,
            border: false,*///底框是否可变动
           items: [
@@ -171,7 +212,12 @@ define(function (require) {
                         $.yvan.msg('请选择导出时间');
                         return
                       }
-                      window.open(api('/sweepCode/exSelectLingyunUser?queryProperties='+queryProperties+"&unitId="+unitId + "&date="+date));
+                      var msStatus = $form.formGet().msStatus;
+                      var isContact = $form.formGet().isContact;
+                      var isSuspected = $form.formGet().isSuspected;
+                      var isTrip = $form.formGet().isTrip;
+                      window.open(api('/sweepCode/exSelectLingyunUser?queryProperties='+queryProperties+"&unitId="+unitId + "&date="+date+
+                      '&msStatus='+msStatus+'&isContact='+isContact+'&isSuspected='+isSuspected+'&isTrip='+isTrip));
                     }
                   },
                   {
@@ -237,9 +283,10 @@ define(function (require) {
                         }
                       }
                     },
+                    {field: 'reportStatus', title: '上报', hidden: true},
                     {
-                      field: 'reportStatus', title: '个人上报状态', maxWidth: 100, align: 'center', formatter: function (value) {
-                        if (value == 0) {
+                      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>";

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

@@ -86,13 +86,53 @@ define(function (require) {
             xtype: 'datebox',
             labelWidth: 'auto',
             width: 250,
+          },],[
+          {
+            name: 'msStatus',
+            xtype: 'combobox',
+            label: '个人上报状态',
+            data: [{id: '', text: '全部'}, {id: '1', text: '未上报'}, {id: '2', text: '正常'}, {id: '3', text: '异常'}],
+            value: '',
+            onChange: function (value) {
+              queryGrid1();
+            },
+          },
+          {
+            name: 'isContact',
+            xtype: 'combobox',
+            label: '家人确诊或接触',
+            data: [{id: '', text: '全部'}, {id: '0', text: '否'}, {id: '1', text: '是'}],
+            value: '',
+            onChange: function (value) {
+              queryGrid1();
+            },
+          },
+          {
+            name: 'isSuspected',
+            xtype: 'combobox',
+            label: '家人健康异常',
+            data: [{id: '', text: '全部'}, {id: '0', text: '否'}, {id: '1', text: '是'}],
+            value: '',
+            onChange: function (value) {
+              queryGrid1();
+            },
+          },
+          {
+            name: 'isTrip',
+            xtype: 'combobox',
+            label: '是否出行',
+            data: [{id: '', text: '全部'}, {id: '0', text: '否'}, {id: '1', text: '是'}],
+            value: '',
+            onChange: function (value) {
+              queryGrid1();
+            },
           },
         ]]
       };
 
       return {
         north: {
-          height: 88,
+          height: 132,
           /* split: true,
            border: false,*///底框是否可变动
           items: [
@@ -152,7 +192,12 @@ define(function (require) {
                         $.yvan.msg('请选择导出时间');
                         return
                       }
-                      window.open(api('/sweepCode/exSelectLingyunUser?queryProperties='+queryProperties+"&unitId=0&date="+date));
+                      var msStatus = $form.formGet().msStatus;
+                      var isContact = $form.formGet().isContact;
+                      var isSuspected = $form.formGet().isSuspected;
+                      var isTrip = $form.formGet().isTrip;
+                      window.open(api('/sweepCode/exSelectLingyunUser?queryProperties='+queryProperties+"&unitId=0&date="+date+
+                        '&msStatus='+msStatus+'&isContact='+isContact+'&isSuspected='+isSuspected+'&isTrip='+isTrip));
                     }
                   },
                   {
@@ -218,9 +263,10 @@ define(function (require) {
                         }
                       }
                     },
+                    {field: 'reportStatus', title: '上报', hidden: true},
                     {
-                      field: 'reportStatus', title: '个人上报状态', maxWidth: 100, align: 'center', formatter: function (value) {
-                        if (value == 0) {
+                      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>";

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

@@ -104,13 +104,53 @@ define(function (require) {
             xtype: 'datebox',
             labelWidth: 'auto',
             width: 200,
+          },],[
+          {
+            name: 'msStatus',
+            xtype: 'combobox',
+            label: '个人上报状态',
+            data: [{id: '', text: '全部'}, {id: '1', text: '未上报'}, {id: '2', text: '正常'}, {id: '3', text: '异常'}],
+            value: '',
+            onChange: function (value) {
+              queryGrid1();
+            },
+          },
+          {
+            name: 'isContact',
+            xtype: 'combobox',
+            label: '家人确诊或接触',
+            data: [{id: '', text: '全部'}, {id: '0', text: '否'}, {id: '1', text: '是'}],
+            value: '',
+            onChange: function (value) {
+              queryGrid1();
+            },
+          },
+          {
+            name: 'isSuspected',
+            xtype: 'combobox',
+            label: '家人健康异常',
+            data: [{id: '', text: '全部'}, {id: '0', text: '否'}, {id: '1', text: '是'}],
+            value: '',
+            onChange: function (value) {
+              queryGrid1();
+            },
+          },
+          {
+            name: 'isTrip',
+            xtype: 'combobox',
+            label: '是否出行',
+            data: [{id: '', text: '全部'}, {id: '0', text: '否'}, {id: '1', text: '是'}],
+            value: '',
+            onChange: function (value) {
+              queryGrid1();
+            },
           },
         ]]
       };
 
       return {
         north: {
-          height: 88,
+          height: 132,
           /* split: true,
            border: false,*///底框是否可变动
           items: [
@@ -171,7 +211,12 @@ define(function (require) {
                         $.yvan.msg('请选择导出时间');
                         return
                       }
-                      window.open(api('/sweepCode/exSelectLingyunUser?queryProperties='+queryProperties+"&unitId="+unitId + "&date="+date));
+                      var msStatus = $form.formGet().msStatus;
+                      var isContact = $form.formGet().isContact;
+                      var isSuspected = $form.formGet().isSuspected;
+                      var isTrip = $form.formGet().isTrip;
+                      window.open(api('/sweepCode/exSelectLingyunUser?queryProperties='+queryProperties+"&unitId="+unitId + "&date="+date+
+                        '&msStatus='+msStatus+'&isContact='+isContact+'&isSuspected='+isSuspected+'&isTrip='+isTrip));
                     }
                   },
                   {
@@ -237,9 +282,10 @@ define(function (require) {
                         }
                       }
                     },
+                    {field: 'reportStatus', title: '上报', hidden: true},
                     {
-                      field: 'reportStatus', title: '个人上报状态', maxWidth: 100, align: 'center', formatter: function (value) {
-                        if (value == 0) {
+                      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>";

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

@@ -21,7 +21,7 @@
     {
       "id": "ENT10004",
       "text": "二类特殊人员管理",
-      "href": "/app/whepi/scan/specialPersonnelLY7.js",
+      "href": "/app/whepi/scan/specialPersonnelLY2.js",
       "iconCls": "icon-blank fa fa-align-justify",
       "state": "close",
       "children": []

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

@@ -280,9 +280,9 @@ define(function (require) {
                                             title: '禁止提示',
                                             align: 'left',
                                         },
-                                        {field: 'longitude', title: '经度', maxWidth: 200, align: 'left',},
-                                        {field: 'latitude', title: '纬度', maxWidth: 200, align: 'left',},
-                                        {field: 'address', title: '详细地址', maxWidth: 200, align: 'left',},
+                                        // {field: 'longitude', title: '经度', maxWidth: 200, align: 'left',},
+                                        // {field: 'latitude', title: '纬度', maxWidth: 200, align: 'left',},
+                                        // {field: 'address', title: '详细地址', maxWidth: 200, align: 'left',},
                                     ]
                                 ]
                         }

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

@@ -280,9 +280,9 @@ define(function (require) {
                                             title: '禁止提示',
                                             align: 'left',
                                         },
-                                        {field: 'longitude', title: '经度', maxWidth: 200, align: 'left',},
-                                        {field: 'latitude', title: '纬度', maxWidth: 200, align: 'left',},
-                                        {field: 'address', title: '详细地址', maxWidth: 200, align: 'left',},
+                                        // {field: 'longitude', title: '经度', maxWidth: 200, align: 'left',},
+                                        // {field: 'latitude', title: '纬度', maxWidth: 200, align: 'left',},
+                                        // {field: 'address', title: '详细地址', maxWidth: 200, align: 'left',},
                                     ]
                                 ]
                         }

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

@@ -280,9 +280,9 @@ define(function (require) {
                                             title: '禁止提示',
                                             align: 'left',
                                         },
-                                        {field: 'longitude', title: '经度', maxWidth: 200, align: 'left',},
-                                        {field: 'latitude', title: '纬度', maxWidth: 200, align: 'left',},
-                                        {field: 'address', title: '详细地址', maxWidth: 200, align: 'left',},
+                                        // {field: 'longitude', title: '经度', maxWidth: 200, align: 'left',},
+                                        // {field: 'latitude', title: '纬度', maxWidth: 200, align: 'left',},
+                                        // {field: 'address', title: '详细地址', maxWidth: 200, align: 'left',},
                                     ]
                                 ]
                         }

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

@@ -84,15 +84,15 @@ public class SysUptownHouse implements Serializable {
     @TableField(exist = false)
     private Integer goStatus;
 
-    @ExcelProperty(value = {"经度"}, index = 11)
+//    @ExcelProperty(value = {"经度"}, index = 11)
     @TableField(exist = false)
     private String longitude;
 
-    @ExcelProperty(value = {"纬度"}, index = 12)
+//    @ExcelProperty(value = {"纬度"}, index = 12)
     @TableField(exist = false)
     private String latitude;
 
-    @ExcelProperty(value = {"详细地址"}, index = 13)
+//    @ExcelProperty(value = {"详细地址"}, index = 13)
     @TableField(exist = false)
     private String address;
 

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

@@ -82,15 +82,15 @@ public class SysUptownHouseLY implements Serializable {
     @TableField(exist = false)
     private Integer goStatus;
 
-    @ExcelProperty(value = {"经度"}, index = 9)
+//    @ExcelProperty(value = {"经度"}, index = 9)
     @TableField(exist = false)
     private String longitude;
 
-    @ExcelProperty(value = {"纬度"}, index = 10)
+//    @ExcelProperty(value = {"纬度"}, index = 10)
     @TableField(exist = false)
     private String latitude;
 
-    @ExcelProperty(value = {"详细地址"}, index = 11)
+//    @ExcelProperty(value = {"详细地址"}, index = 11)
     @TableField(exist = false)
     private String address;
 

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

@@ -173,7 +173,7 @@ public class SweepCodeService {
                 }
                 if (excelRiBaoLYBM4.getReportStatus() == 0) {
                     excelRiBaoLYBM4.setReportStatusDesc("未上报");
-                } else if (excelRiBaoLYBM4.getReportStatus() == 1) {
+                } else if (excelRiBaoLYBM4.getMsStatus() == 1) {
                     excelRiBaoLYBM4.setReportStatusDesc("正常");
                 } else {
                     excelRiBaoLYBM4.setReportStatusDesc("异常");

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

@@ -114,10 +114,18 @@ public class ScanAdminController {
     public void exSelectLingyunUser(HttpParameterParser parser,HttpServletResponse resp,
                                     @Pd(name = "queryProperties", required = false, defaultValue = "") String queryProperties,
                                     @Pd(name = "unitId", required = false, defaultValue = "0") Long unitId,
+                                    @Pd(name = "msStatus", required = false, defaultValue = "0") Integer msStatus,
+                                    @Pd(name = "isContact", required = false, defaultValue = "0") Integer isContact,
+                                    @Pd(name = "isSuspected", required = false, defaultValue = "0") Integer isSuspected,
+                                    @Pd(name = "isTrip", required = false, defaultValue = "0") Integer isTrip,
                                     @Pd(name = "date") String date) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         Map<String, Object> map = new HashMap<>();
         map.put("queryProperties", queryProperties);
+        map.put("msStatus", msStatus);
+        map.put("isContact", isContact);
+        map.put("isSuspected", isSuspected);
+        map.put("isTrip", isTrip);
         Long userId = JwtHelper.getUserId();
         if (userId > 7000 && userId < 8000) {
             unitId = userId;

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

@@ -57,8 +57,44 @@
                 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 test="reportStatus == 0">
+                and msr.report_status=0 and mss.temperature > 0
+            </if>
+            <if test="reportStatus == 1">
+                and msr.report_status=1
+            </if>
+            <if test="reportStatus == 2">
+                and (msr.report_status is null or mss.temperature is null or mss.temperature = 0)
+            </if>
+            <if test="reportStatus == 3">
+                and (msr.report_status is null or msr.report_status=0)
+            </if>
+            <if test="msStatus == '1'.toString()">
+                and msr.report_status=0
+            </if>
+             <if test="msStatus == '2'.toString()">
+                and msr.ms_status=1
+            </if>
+             <if test="msStatus == '3'.toString()">
+                and msr.ms_status=2
+            </if>
+            <if test="isContact == '0'.toString()">
+                and mss.is_contact = 0
+            </if>
+            <if test="isContact == '1'.toString()">
+                and mss.is_contact = 1
+            </if>
+            <if test="isSuspected == '0'.toString()">
+                and mss.is_suspected = 0
+            </if>
+            <if test="isSuspected == '1'.toString()">
+                and mss.is_suspected = 1
+            </if>
+            <if test="isTrip == '0'.toString()">
+                and tr.is_trip = 0
+            </if>
+            <if test="isTrip == '1'.toString()">
+                and tr.is_trip = 1
             </if>
         </where>
         order by suu.unit_id asc,suho.linkman
@@ -91,8 +127,17 @@
                 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 test="reportStatus == 0">
+                and msr.report_status=0 and mss.temperature > 0
+            </if>
+            <if test="reportStatus == 1">
+                and msr.report_status=1
+            </if>
+            <if test="reportStatus == 2">
+                and (msr.report_status is null or mss.temperature is null or mss.temperature = 0)
+            </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
@@ -100,7 +145,7 @@
 
     <select id="exSelectLingyunUserPage" resultType="com.bofeng.entity.ExcelRiBaoLYBM4">
         select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum, msr.report_status as reportStatus,
-        msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum,
+        msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum,msr.ms_status as msStatus,
         msr.single_num as singleNum,mss.user_name as userName,mss.grender, mss.age,mss.family_status as familyStatus,
         mss.medical,mss.temperature,mss.cough,mss.is_contact, mss.is_suspected,mss.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult,mss.temperature_score,mss.is_contact as isContact,mss.is_suspected as isSuspected,
         tr.trip_id,tr.is_trip,tr.today_local,tr.today_local_other,tr.work_local,tr.work_local_other, tr.auto_local, tr.auto_addr,ur.user_id as userId
@@ -137,6 +182,33 @@
             <if test="reportStatus == 3">
                 and (msr.report_status is null or msr.report_status=0)
             </if>
+            <if test="msStatus == '1'.toString()">
+                and msr.report_status=0
+            </if>
+            <if test="msStatus == '2'.toString()">
+                and msr.ms_status=1
+            </if>
+            <if test="msStatus == '3'.toString()">
+                and msr.ms_status=2
+            </if>
+            <if test="isContact == '0'.toString()">
+                and mss.is_contact = 0
+            </if>
+            <if test="isContact == '1'.toString()">
+                and mss.is_contact = 1
+            </if>
+            <if test="isSuspected == '0'.toString()">
+                and mss.is_suspected = 0
+            </if>
+            <if test="isSuspected == '1'.toString()">
+                and mss.is_suspected = 1
+            </if>
+            <if test="isTrip == '0'.toString()">
+                and tr.is_trip = 0
+            </if>
+            <if test="isTrip == '1'.toString()">
+                and tr.is_trip = 1
+            </if>
         </where>
         order by suu.unit_id asc,suho.linkman
     </select>