凌云集团更改公司

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

@@ -67,7 +67,8 @@ define(function (require) {
                 }
               }
             },
-            {field: 'tripDetDesc', title: '出行详细', align: 'left'}
+            {field: 'tripDetDesc', title: '出行详细', align: 'left'},
+            {field: 'isContactDesc', title: '家人确诊或接触', align: 'left'}
 
           ]],
         }

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

@@ -231,6 +231,7 @@ define(function (require) {
                     {field: 'autoAddr', title: '定位地址', maxWidth: 200, align: 'left',},
                     {field: 'isTripDesc', title: '是否出行', maxWidth: 200, align: 'left',},
                     {field: 'tripDetDesc', title: '出行详细', align: 'left',},
+                    {field: 'isContactDesc', title: '家人确诊或接触', align: 'left',},
                   ]
                 ]
             }

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

@@ -105,7 +105,7 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
     @Select(
             "select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum, msr.report_status as reportStatus,msr.ms_status as msStatus,\n" +
                     "msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum, msr.report_date as reportDate,\n" +
-                    "msr.single_num as singleNum,mss.user_name as userName,mss.grender, mss.age,mss.family_status as familyStatus,\n" +
+                    "msr.single_num as singleNum,mss.user_name as userName,mss.grender, mss.is_contact, mss.age,mss.family_status as familyStatus,\n" +
                     "mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult,\n" +
                     "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\n" +
                     "from ms_report msr\n" +

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

@@ -243,9 +243,9 @@ public class ExcelRiBaoLYBM4 {
             bingqingDesc += "解除隔离、";
         }
 
-        if (isContact == 1) {
-            bingqingDesc += "家庭成员中有新冠肺炎疫情或有过病例接触史人员、";
-        }
+//        if (isContact == 1) {
+//            bingqingDesc += "家庭成员中有新冠肺炎疫情或有过病例接触史人员、";
+//        }
         if (singleRoom == 1) {
             bingqingDesc += "单间隔离、";
         }
@@ -373,4 +373,7 @@ public class ExcelRiBaoLYBM4 {
     @ExcelProperty(value = "出行详细", index = 1)
     private String tripDetDesc = "";
 
+    @ExcelProperty(value = "家人确诊或接触", index = 8)
+    private String isContactDesc = "";
+
 }

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

@@ -56,6 +56,11 @@ public class SweepCodeService {
         if (sysUptownHouses != null && sysUptownHouses.size() > 0) {
             String tripDet;
             for (ExcelRiBaoLYBM4 excelRiBaoLYBM4 : sysUptownHouses) {
+                if (excelRiBaoLYBM4.getIsContact() == 0) {
+                    excelRiBaoLYBM4.setIsContactDesc("否");
+                } else if (excelRiBaoLYBM4.getIsContact() == 1) {
+                    excelRiBaoLYBM4.setIsContactDesc("是");
+                }
                 tripDet = "";
                 //出行详细
                 List<MsTripDet> listDet = msSuspectedMapper.selectTripSuspected(excelRiBaoLYBM4.getTripId());
@@ -102,6 +107,11 @@ public class SweepCodeService {
         if (sysUptownHouses != null && sysUptownHouses.size() > 0) {
             String tripDet;
             for (ExcelRiBaoLYBM4 excelRiBaoLYBM4 : sysUptownHouses) {
+                if (excelRiBaoLYBM4.getIsContact() == 0) {
+                    excelRiBaoLYBM4.setIsContactDesc("否");
+                } else if (excelRiBaoLYBM4.getIsContact() == 1) {
+                    excelRiBaoLYBM4.setIsContactDesc("是");
+                }
                 tripDet = "";
                 //出行详细
                 List<MsTripDet> listDet = msSuspectedMapper.selectTripSuspected(excelRiBaoLYBM4.getTripId());

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

@@ -102,7 +102,7 @@
         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.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.temperature_score,mss.is_contact,
+        mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult,mss.temperature_score,mss.is_contact as isContact,
         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
         from sys_uptown_house suh
         inner join sys_uptown_home suho on suho.house_id=suh.house_id