凌云集团更改公司

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

@@ -119,7 +119,7 @@ define(function (require) {
             name: 'isContact',
             xtype: 'combobox',
             label: '家人确诊或接触',
-            data: [{id: '', text: '全部'}, {id: '0', text: '否'}, {id: '1', text: '是'}],
+            data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
             value: '',
             onChange: function (value) {
               queryGrid1();
@@ -129,7 +129,7 @@ define(function (require) {
             name: 'isSuspected',
             xtype: 'combobox',
             label: '家人健康异常',
-            data: [{id: '', text: '全部'}, {id: '0', text: '否'}, {id: '1', text: '是'}],
+            data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
             value: '',
             onChange: function (value) {
               queryGrid1();
@@ -139,7 +139,7 @@ define(function (require) {
             name: 'isTrip',
             xtype: 'combobox',
             label: '是否出行',
-            data: [{id: '', text: '全部'}, {id: '0', text: '否'}, {id: '1', text: '是'}],
+            data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
             value: '',
             onChange: function (value) {
               queryGrid1();

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

@@ -101,7 +101,7 @@ define(function (require) {
             name: 'isContact',
             xtype: 'combobox',
             label: '家人确诊或接触',
-            data: [{id: '', text: '全部'}, {id: '0', text: '否'}, {id: '1', text: '是'}],
+            data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
             value: '',
             onChange: function (value) {
               queryGrid1();
@@ -111,7 +111,7 @@ define(function (require) {
             name: 'isSuspected',
             xtype: 'combobox',
             label: '家人健康异常',
-            data: [{id: '', text: '全部'}, {id: '0', text: '否'}, {id: '1', text: '是'}],
+            data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
             value: '',
             onChange: function (value) {
               queryGrid1();
@@ -121,7 +121,7 @@ define(function (require) {
             name: 'isTrip',
             xtype: 'combobox',
             label: '是否出行',
-            data: [{id: '', text: '全部'}, {id: '0', text: '否'}, {id: '1', text: '是'}],
+            data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
             value: '',
             onChange: function (value) {
               queryGrid1();

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

@@ -119,7 +119,7 @@ define(function (require) {
             name: 'isContact',
             xtype: 'combobox',
             label: '家人确诊或接触',
-            data: [{id: '', text: '全部'}, {id: '0', text: '否'}, {id: '1', text: '是'}],
+            data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
             value: '',
             onChange: function (value) {
               queryGrid1();
@@ -129,7 +129,7 @@ define(function (require) {
             name: 'isSuspected',
             xtype: 'combobox',
             label: '家人健康异常',
-            data: [{id: '', text: '全部'}, {id: '0', text: '否'}, {id: '1', text: '是'}],
+            data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
             value: '',
             onChange: function (value) {
               queryGrid1();
@@ -139,7 +139,7 @@ define(function (require) {
             name: 'isTrip',
             xtype: 'combobox',
             label: '是否出行',
-            data: [{id: '', text: '全部'}, {id: '0', text: '否'}, {id: '1', text: '是'}],
+            data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
             value: '',
             onChange: function (value) {
               queryGrid1();

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

@@ -32,7 +32,7 @@
 
     <select id="exSelectLingyunUser" 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.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult,mss.is_contact,mss.is_suspected,
         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
@@ -70,30 +70,30 @@
                 and (msr.report_status is null or msr.report_status=0)
             </if>
             <if test="msStatus == '1'.toString()">
-                and msr.report_status=0
+                and msr.report_status is null
             </if>
-             <if test="msStatus == '2'.toString()">
-                and msr.ms_status=1
+            <if test="msStatus == '2'.toString()">
+                and msr.report_status=1 and msr.ms_status=1
             </if>
-             <if test="msStatus == '3'.toString()">
-                and msr.ms_status=2
+            <if test="msStatus == '3'.toString()">
+                and msr.report_status=1 and msr.ms_status=2
             </if>
-            <if test="isContact == '0'.toString()">
+            <if test="isContact == '1'.toString()">
                 and mss.is_contact = 0
             </if>
-            <if test="isContact == '1'.toString()">
+            <if test="isContact == '2'.toString()">
                 and mss.is_contact = 1
             </if>
-            <if test="isSuspected == '0'.toString()">
+            <if test="isSuspected == '1'.toString()">
                 and mss.is_suspected = 0
             </if>
-            <if test="isSuspected == '1'.toString()">
+            <if test="isSuspected == '2'.toString()">
                 and mss.is_suspected = 1
             </if>
-            <if test="isTrip == '0'.toString()">
+            <if test="isTrip == '1'.toString()">
                 and tr.is_trip = 0
             </if>
-            <if test="isTrip == '1'.toString()">
+            <if test="isTrip == '2'.toString()">
                 and tr.is_trip = 1
             </if>
         </where>
@@ -183,30 +183,30 @@
                 and (msr.report_status is null or msr.report_status=0)
             </if>
             <if test="msStatus == '1'.toString()">
-                and msr.report_status=0
+                and msr.report_status is null
             </if>
             <if test="msStatus == '2'.toString()">
-                and msr.ms_status=1
+                and msr.report_status=1 and msr.ms_status=1
             </if>
             <if test="msStatus == '3'.toString()">
-                and msr.ms_status=2
+                and msr.report_status=1 and msr.ms_status=2
             </if>
-            <if test="isContact == '0'.toString()">
+            <if test="isContact == '1'.toString()">
                 and mss.is_contact = 0
             </if>
-            <if test="isContact == '1'.toString()">
+            <if test="isContact == '2'.toString()">
                 and mss.is_contact = 1
             </if>
-            <if test="isSuspected == '0'.toString()">
+            <if test="isSuspected == '1'.toString()">
                 and mss.is_suspected = 0
             </if>
-            <if test="isSuspected == '1'.toString()">
+            <if test="isSuspected == '2'.toString()">
                 and mss.is_suspected = 1
             </if>
-            <if test="isTrip == '0'.toString()">
+            <if test="isTrip == '1'.toString()">
                 and tr.is_trip = 0
             </if>
-            <if test="isTrip == '1'.toString()">
+            <if test="isTrip == '2'.toString()">
                 and tr.is_trip = 1
             </if>
         </where>