修改字段名

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

@@ -55,11 +55,11 @@ define(function (require) {
             },
             {field: 'temperature', title: '温度', maxWidth: 100, align: 'right',},
             {field: 'bingqingDesc', title: '病情表述', maxWidth: 300, align: 'left',},
-            {field: 'isContactDesc', title: '家人确诊或接触', align: 'left',formatter: function (value) {
-                if (value == "否") {
-                  return "<span style='color: green;'>否<span>";
+            {field: 'isContactDesc', title: '密切接触人员', align: 'left',formatter: function (value) {
+                if (value == "正常") {
+                  return "<span style='color: green;'>正常<span>";
                 } else {
-                  return "<span style='color: red;'>是<span>";
+                  return "<span style='color: red;'>异常<span>";
                 }
               }
             },

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

@@ -195,11 +195,11 @@ define(function (require) {
                     {field: 'phone', title: '联系电话', maxWidth: 200, align: 'left',},
                     {field: 'doorplate', title: '工号', maxWidth: 200, align: 'left',},
                     {field: 'bingqingDesc', title: '病情表述', align: 'left',},
-                    {field: 'isContactDesc', title: '家人确诊或接触', align: 'left',formatter: function (value) {
-                        if (value == "否") {
-                          return "<span style='color: green;'>否<span>";
+                    {field: 'isContactDesc', title: '密切接触人员', align: 'left',formatter: function (value) {
+                        if (value == "正常") {
+                          return "<span style='color: green;'>正常<span>";
                         } else {
-                          return "<span style='color: red;'>是<span>";
+                          return "<span style='color: red;'>异常<span>";
                         }
                       }
                     },

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

@@ -55,11 +55,11 @@ define(function (require) {
             },
             {field: 'temperature', title: '温度', maxWidth: 100, align: 'right',},
             {field: 'bingqingDesc', title: '病情表述', maxWidth: 300, align: 'left',},
-            {field: 'isContactDesc', title: '家人确诊或接触', align: 'left',formatter: function (value) {
-                if (value == "否") {
-                  return "<span style='color: green;'>否<span>";
+            {field: 'isContactDesc', title: '密切接触人员', align: 'left',formatter: function (value) {
+                if (value == "正常") {
+                  return "<span style='color: green;'>正常<span>";
                 } else {
-                  return "<span style='color: red;'>是<span>";
+                  return "<span style='color: red;'>异常span>";
                 }
               }
             },

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

@@ -55,11 +55,11 @@ define(function (require) {
             },
             {field: 'temperature', title: '温度', maxWidth: 100, align: 'right',},
             {field: 'bingqingDesc', title: '病情表述', maxWidth: 300, align: 'left',},
-            {field: 'isContactDesc', title: '家人确诊或接触', align: 'left',formatter: function (value) {
-                if (value == "否") {
-                  return "<span style='color: green;'>否<span>";
+            {field: 'isContactDesc', title: '密切接触人员', align: 'left',formatter: function (value) {
+                if (value == "正常") {
+                  return "<span style='color: green;'>正常<span>";
                 } else {
-                  return "<span style='color: red;'>是<span>";
+                  return "<span style='color: red;'>异常<span>";
                 }
               }
             },

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

@@ -56,11 +56,11 @@ define(function (require) {
             {field: 'temperature', title: '温度', maxWidth: 100, align: 'right',},
             {field: 'bingqingDesc', title: '病情表述', maxWidth: 300, align: 'left',},
             {
-              field: 'isContactDesc', title: '家人确诊或接触', align: 'left', formatter: function (value) {
-                if (value == "否") {
-                  return "<span style='color: green;'>否<span>";
+              field: 'isContactDesc', title: '密切接触人员', align: 'left', formatter: function (value) {
+                if (value == "正常") {
+                  return "<span style='color: green;'>正常<span>";
                 } else {
-                  return "<span style='color: red;'>是<span>";
+                  return "<span style='color: red;'>异常<span>";
                 }
               }
             },

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

@@ -172,8 +172,8 @@ define(function (require) {
           {
             name: 'isContact',
             xtype: 'combobox',
-            label: '家人确诊或接触',
-            data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
+            label: '密切接触人员',
+            data: [{id: '', text: '全部'}, {id: '1', text: '正常'}, {id: '2', text: '异常'}],
             value: '',
             onChange: function (value) {
               queryGrid1();
@@ -378,11 +378,11 @@ define(function (require) {
                     },
 
                     {field: 'bingqingDesc', title: '病情表述', align: 'left',},
-                    {field: 'isContactDesc', title: '家人确诊或接触', align: 'left',formatter: function (value) {
-                        if (value == "否") {
-                          return "<span style='color: green;'>否<span>";
+                    {field: 'isContactDesc', title: '密切接触人员', align: 'left',formatter: function (value) {
+                        if (value == "正常") {
+                          return "<span style='color: green;'>正常<span>";
                         } else {
-                          return "<span style='color: red;'>是<span>";
+                          return "<span style='color: red;'>异常<span>";
                         }
                       }
                     },

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

@@ -152,8 +152,8 @@ define(function (require) {
           {
             name: 'isContact',
             xtype: 'combobox',
-            label: '家人确诊或接触',
-            data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
+            label: '密切接触人员',
+            data: [{id: '', text: '全部'}, {id: '1', text: '正常'}, {id: '2', text: '异常'}],
             value: '',
             onChange: function (value) {
               queryGrid1();
@@ -354,11 +354,11 @@ define(function (require) {
                     },
 
                     {field: 'bingqingDesc', title: '病情表述', maxWidth: 200, align: 'left',},
-                    {field: 'isContactDesc', title: '家人确诊或接触', align: 'left',formatter: function (value) {
-                        if (value == "否") {
-                          return "<span style='color: green;'>否<span>";
+                    {field: 'isContactDesc', title: '密切接触人员', align: 'left',formatter: function (value) {
+                        if (value == "正常") {
+                          return "<span style='color: green;'>正常<span>";
                         } else {
-                          return "<span style='color: red;'>是<span>";
+                          return "<span style='color: red;'>异常<span>";
                         }
                       }
                     },

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

@@ -172,8 +172,8 @@ define(function (require) {
           {
             name: 'isContact',
             xtype: 'combobox',
-            label: '家人确诊或接触',
-            data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
+            label: '密切接触人员',
+            data: [{id: '', text: '全部'}, {id: '1', text: '正常'}, {id: '2', text: '异常'}],
             value: '',
             onChange: function (value) {
               queryGrid1();
@@ -377,11 +377,11 @@ define(function (require) {
 
 
                     {field: 'bingqingDesc', title: '病情表述', align: 'left',},
-                    {field: 'isContactDesc', title: '家人确诊或接触', align: 'left',formatter: function (value) {
-                        if (value == "否") {
-                          return "<span style='color: green;'>否<span>";
+                    {field: 'isContactDesc', title: '密切接触人员', align: 'left',formatter: function (value) {
+                        if (value == "正常") {
+                          return "<span style='color: green;'>正常<span>";
                         } else {
-                          return "<span style='color: red;'>是<span>";
+                          return "<span style='color: red;'>异常<span>";
                         }
                       }
                     },

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

@@ -227,11 +227,11 @@ define(function (require) {
                       }
                     },
                     {field: 'bingqingDesc', title: '病情表述', align: 'left',},
-                    {field: 'isContactDesc', title: '家人确诊或接触', align: 'left',formatter: function (value) {
-                        if (value == "否") {
-                          return "<span style='color: green;'>否<span>";
+                    {field: 'isContactDesc', title: '密切接触人员', align: 'left',formatter: function (value) {
+                        if (value == "正常") {
+                          return "<span style='color: green;'>正常<span>";
                         } else {
-                          return "<span style='color: red;'>是<span>";
+                          return "<span style='color: red;'>异常<span>";
                         }
                       }
                     },

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

@@ -330,11 +330,11 @@ define(function (require) {
                             }
                           },
                           {field: 'bingqingDesc', title: '病情表述', align: 'left',},
-                          {field: 'isContactDesc', title: '家人确诊或接触', align: 'left',formatter: function (value) {
-                              if (value == "否") {
-                                return "<span style='color: green;'>否<span>";
+                          {field: 'isContactDesc', title: '密切接触人员', align: 'left',formatter: function (value) {
+                              if (value == "正常") {
+                                return "<span style='color: green;'>正常<span>";
                               } else {
-                                return "<span style='color: red;'>是<span>";
+                                return "<span style='color: red;'>异常<span>";
                               }
                             }
                           },

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

@@ -311,11 +311,11 @@ define(function (require) {
                             }
                           },
                           {field: 'bingqingDesc', title: '病情表述', align: 'left',},
-                          {field: 'isContactDesc', title: '家人确诊或接触', align: 'left',formatter: function (value) {
-                              if (value == "否") {
-                                return "<span style='color: green;'>否<span>";
+                          {field: 'isContactDesc', title: '密切接触人员', align: 'left',formatter: function (value) {
+                              if (value == "正常") {
+                                return "<span style='color: green;'>正常<span>";
                               } else {
-                                return "<span style='color: red;'>是<span>";
+                                return "<span style='color: red;'>异常<span>";
                               }
                             }
                           },

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

@@ -118,8 +118,8 @@ define(function (require) {
           {
             name: 'isContact',
             xtype: 'combobox',
-            label: '家人确诊或接触',
-            data: [{id: '', text: '全部'}, {id: '1', text: '否'}, {id: '2', text: '是'}],
+            label: '密切接触人员',
+            data: [{id: '', text: '全部'}, {id: '1', text: '正常'}, {id: '2', text: '异常'}],
             value: '',
             onChange: function (value) {
               queryGrid1();
@@ -267,11 +267,11 @@ define(function (require) {
                     {field: 'phone', title: '联系电话', maxWidth: 200, align: 'left',},
                     {field: 'doorplate', title: '工号', maxWidth: 200, align: 'left',},
                     {field: 'bingqingDesc', title: '病情表述', align: 'left',},
-                    {field: 'isContactDesc', title: '家人确诊或接触', align: 'left',formatter: function (value) {
-                        if (value == "否") {
-                          return "<span style='color: green;'>否<span>";
+                    {field: 'isContactDesc', title: '密切接触人员', align: 'left',formatter: function (value) {
+                        if (value == "正常") {
+                          return "<span style='color: green;'>正常<span>";
                         } else {
-                          return "<span style='color: red;'>是<span>";
+                          return "<span style='color: red;'>异常<span>";
                         }
                       }
                     },

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

@@ -1,7 +1,6 @@
 package com.bofeng.entity;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotations.TableField;
 import com.google.common.base.Strings;
 import com.yvan.platform.Conv;
 import lombok.Getter;
@@ -367,7 +366,7 @@ public class ExcelRiBaoHCBM4 {
 
     private String tripDetDesc = "";
 
-    @ExcelProperty(value = "家人确诊或接触", index = 5)
+    @ExcelProperty(value = "密切接触人员", index = 5)
     private String isContactDesc = "";
 
     @ExcelProperty(value = "家人健康异常", index = 6)

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

@@ -390,7 +390,7 @@ public class ExcelRiBaoLYBM4 {
     @ExcelProperty(value = "出行详细", index = 13)
     private String tripDetDesc = "";
 
-    @ExcelProperty(value = "家人确诊或接触", index = 8)
+    @ExcelProperty(value = "密切接触人员", index = 8)
     private String isContactDesc = "";
 
     @ExcelProperty(value = "家人健康异常", index = 9)

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

@@ -1,7 +1,6 @@
 package com.bofeng.entity;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotations.TableField;
 import com.google.common.base.Strings;
 import com.yvan.platform.Conv;
 import lombok.Getter;
@@ -377,7 +376,7 @@ public class ExcelRiBaoZJBM4 {
     @ExcelProperty(value = "出行详细", index = 12)
     private String tripDetDesc = "";
 
-    @ExcelProperty(value = "家人确诊或接触", index = 7)
+    @ExcelProperty(value = "密切接触人员", index = 7)
     private String isContactDesc = "";
 
     @ExcelProperty(value = "家人健康异常", index = 8)

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

@@ -17,7 +17,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.ParseException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -67,9 +66,9 @@ public class SweepCodeService {
             String tripDet;
             for (ExcelRiBaoLYBM4 excelRiBaoLYBM4 : sysUptownHouses) {
                 if (excelRiBaoLYBM4.getIsContact() == 0) {
-                    excelRiBaoLYBM4.setIsContactDesc("否");
+                    excelRiBaoLYBM4.setIsContactDesc("正常");
                 } else if (excelRiBaoLYBM4.getIsContact() == 1) {
-                    excelRiBaoLYBM4.setIsContactDesc("是");
+                    excelRiBaoLYBM4.setIsContactDesc("异常");
                 }
                 if (excelRiBaoLYBM4.getIsSuspected() == 0) {
                     excelRiBaoLYBM4.setIsSuspectedDesc("否");
@@ -108,9 +107,9 @@ public class SweepCodeService {
             String tripDet;
             for (ExcelRiBaoLYBM4 excelRiBaoLYBM4 : sysUptownHouses) {
                 if (excelRiBaoLYBM4.getIsContact() == 0) {
-                    excelRiBaoLYBM4.setIsContactDesc("否");
+                    excelRiBaoLYBM4.setIsContactDesc("正常");
                 } else if (excelRiBaoLYBM4.getIsContact() == 1) {
-                    excelRiBaoLYBM4.setIsContactDesc("是");
+                    excelRiBaoLYBM4.setIsContactDesc("异常");
                 }
                 if (excelRiBaoLYBM4.getIsSuspected() == 0) {
                     excelRiBaoLYBM4.setIsSuspectedDesc("否");
@@ -144,9 +143,9 @@ public class SweepCodeService {
             String tripDet;
             for (ExcelRiBaoLYBM4 excelRiBaoLYBM4 : sysUptownHouses) {
                 if (excelRiBaoLYBM4.getIsContact() == 0) {
-                    excelRiBaoLYBM4.setIsContactDesc("否");
+                    excelRiBaoLYBM4.setIsContactDesc("正常");
                 } else if (excelRiBaoLYBM4.getIsContact() == 1) {
-                    excelRiBaoLYBM4.setIsContactDesc("是");
+                    excelRiBaoLYBM4.setIsContactDesc("异常");
                 }
                 if (excelRiBaoLYBM4.getIsSuspected() == 0) {
                     excelRiBaoLYBM4.setIsSuspectedDesc("否");
@@ -177,9 +176,9 @@ public class SweepCodeService {
             String tripDet;
             for (ExcelRiBaoLYBM4 excelRiBaoLYBM4 : sysUptownHouses) {
                 if (excelRiBaoLYBM4.getIsContact() == 0) {
-                    excelRiBaoLYBM4.setIsContactDesc("否");
+                    excelRiBaoLYBM4.setIsContactDesc("正常");
                 } else if (excelRiBaoLYBM4.getIsContact() == 1) {
-                    excelRiBaoLYBM4.setIsContactDesc("是");
+                    excelRiBaoLYBM4.setIsContactDesc("异常");
                 }
                 if (excelRiBaoLYBM4.getIsSuspected() == 0) {
                     excelRiBaoLYBM4.setIsSuspectedDesc("否");
@@ -211,9 +210,9 @@ public class SweepCodeService {
             String tripDet;
             for (ExcelRiBaoLYBM4 excelRiBaoLYBM4 : sysUptownHouses) {
                 if (excelRiBaoLYBM4.getIsContact() == 0) {
-                    excelRiBaoLYBM4.setIsContactDesc("否");
+                    excelRiBaoLYBM4.setIsContactDesc("正常");
                 } else if (excelRiBaoLYBM4.getIsContact() == 1) {
-                    excelRiBaoLYBM4.setIsContactDesc("是");
+                    excelRiBaoLYBM4.setIsContactDesc("异常");
                 }
                 if (excelRiBaoLYBM4.getIsSuspected() == 0) {
                     excelRiBaoLYBM4.setIsSuspectedDesc("否");
@@ -265,9 +264,9 @@ public class SweepCodeService {
             String tripDet;
             for (ExcelRiBaoHCBM4 excelRiBaoLYBM4 : sysUptownHouses) {
                 if (excelRiBaoLYBM4.getIsContact() == 0) {
-                    excelRiBaoLYBM4.setIsContactDesc("否");
+                    excelRiBaoLYBM4.setIsContactDesc("正常");
                 } else if (excelRiBaoLYBM4.getIsContact() == 1) {
-                    excelRiBaoLYBM4.setIsContactDesc("是");
+                    excelRiBaoLYBM4.setIsContactDesc("异常");
                 }
                 if (excelRiBaoLYBM4.getIsSuspected() == 0) {
                     excelRiBaoLYBM4.setIsSuspectedDesc("否");