Merge remote-tracking branch 'origin/master'

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

@@ -167,6 +167,10 @@ define(function (require) {
                     {field: 'phone', title: '联系电话', maxWidth: 200, align: 'left',},
                     {field: 'doorplate', title: '工号', maxWidth: 200, align: 'left',},
                     {field: 'bingqingDesc', title: '病情表述', maxWidth: 200, align: 'left',},
+                    {field: 'workLoalDesc', title: '工作驻地', maxWidth: 200, align: 'left',},
+                    {field: 'todayLoalDesc', title: '今晚住地', maxWidth: 200, align: 'left',},
+                    {field: 'isTripDesc', title: '是否出行', maxWidth: 200, align: 'left',},
+                    {field: 'tripDetDesc', title: '出行详细', align: 'left',},
                   ]
                 ]
             }

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

@@ -231,7 +231,7 @@ public class ExcelRiBaoLYBM4 {
             bingqingDesc += "单间隔离、";
         }
 
-        bingqingDesc = bingqingDesc + "体温：" + temperatureStr + "、";
+        bingqingDesc = bingqingDesc + "体温：" + getTemperatureStr() + "、";
 
         if (cough == 1) {
             bingqingDesc += "偶尔短暂咳嗽、";
@@ -281,6 +281,7 @@ public class ExcelRiBaoLYBM4 {
         return bingqingDesc;
     }
 
+    @ExcelProperty(value = "工作驻地", index = 5)
     private String workLoalDesc = "";
 
     public String getWorkLoalDesc() {
@@ -295,6 +296,8 @@ public class ExcelRiBaoLYBM4 {
         }
         return workLoalDesc;
     }
+
+    @ExcelProperty(value = "今晚住地", index = 6)
     private String todayLoalDesc = "";
 
     public String getTodayLoalDesc() {
@@ -310,6 +313,7 @@ public class ExcelRiBaoLYBM4 {
         return workLoalDesc;
     }
 
+    @ExcelProperty(value = "是否出行", index = 7)
     private String isTripDesc = "";
 
     public String getIsTripDesc() {
@@ -320,7 +324,7 @@ public class ExcelRiBaoLYBM4 {
         }
         return isTripDesc;
     }
-
+    @ExcelProperty(value = "出行详细", index = 1)
     private String tripDetDesc = "";
 
 }

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

@@ -2,12 +2,11 @@ package com.bofeng.service;
 
 
 import com.bofeng.JwtHelper;
+import com.bofeng.dao.MsSuspectedMapper;
 import com.bofeng.dao.OutScanEstateMapper;
 import com.bofeng.dao.RbMapper;
 import com.bofeng.dao.SweepCodeMapper;
-import com.bofeng.entity.ExcelRiBaoLYBM4;
-import com.bofeng.entity.OutScanEstate;
-import com.bofeng.entity.SysUptownHouse;
+import com.bofeng.entity.*;
 import com.yvan.PageDb;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,7 +25,10 @@ public class SweepCodeService {
     private OutScanEstateMapper outScanEstateMapper;
     @Autowired
     private RbMapper rbMapper;
-
+    @Autowired
+    private MsSuspectedMapper msSuspectedMapper;
+    @Autowired
+    private MsReportService msReportService;
 
     public List<SysUptownHouse> selectCode(PageDb pageDb, Map<String, Object> queryParam) {
         List<SysUptownHouse> sysUptownHouses = sweepCodeMapper.selectCode(pageDb,queryParam);
@@ -51,6 +53,23 @@ public class SweepCodeService {
         }
         queryParam.put("uptownId", 1238790987234L);
         List<ExcelRiBaoLYBM4> sysUptownHouses = rbMapper.exSelectLingyunUserPage(pageDb,queryParam);
+        if (sysUptownHouses != null && sysUptownHouses.size() > 0) {
+            String tripDet;
+            for (ExcelRiBaoLYBM4 excelRiBaoLYBM4 : sysUptownHouses) {
+                tripDet = "";
+                //出行详细
+                List<MsTripDet> listDet = msSuspectedMapper.selectTripSuspected(excelRiBaoLYBM4.getTripId());
+                if (listDet != null && listDet.size() > 0) {
+                    for (MsTripDet msTripDet : listDet) {
+                        tripDet += "出发地：" + msReportService.getLocalOther(msTripDet.getStartLocal(), msTripDet.getStartLocalOther()) + ",";
+                        tripDet += "目的地：" + msReportService.getLocalOther(msTripDet.getEndLocal(), msTripDet.getEndLocalOther()) + ",";
+                        tripDet += "出行方式：" + msReportService.getTripType(msTripDet.getTripType()) + ",";
+                        tripDet += "车次/航班/车牌：" + msTripDet.getTripTypeDesp() + ",";
+                    }
+                    excelRiBaoLYBM4.setTripDetDesc(tripDet.substring(0, tripDet.length() - 1));
+                }
+            }
+        }
         return sysUptownHouses;
     }
 
@@ -61,6 +80,24 @@ public class SweepCodeService {
         }
         queryParam.put("uptownId", 1238790987234L);
         List<ExcelRiBaoLYBM4> sysUptownHouses = rbMapper.exSelectLingyunUser(queryParam);
+
+        if (sysUptownHouses != null && sysUptownHouses.size() > 0) {
+            String tripDet;
+            for (ExcelRiBaoLYBM4 excelRiBaoLYBM4 : sysUptownHouses) {
+                tripDet = "";
+                //出行详细
+                List<MsTripDet> listDet = msSuspectedMapper.selectTripSuspected(excelRiBaoLYBM4.getTripId());
+                if (listDet != null && listDet.size() > 0) {
+                    for (MsTripDet msTripDet : listDet) {
+                        tripDet += "出发地：" + msReportService.getLocalOther(msTripDet.getStartLocal(), msTripDet.getStartLocalOther()) + ",";
+                        tripDet += "目的地：" + msReportService.getLocalOther(msTripDet.getEndLocal(), msTripDet.getEndLocalOther()) + ",";
+                        tripDet += "出行方式：" + msReportService.getTripType(msTripDet.getTripType()) + ",";
+                        tripDet += "车次/航班/车牌：" + msTripDet.getTripTypeDesp() + ",";
+                    }
+                    excelRiBaoLYBM4.setTripDetDesc(tripDet.substring(0, tripDet.length() - 1));
+                }
+            }
+        }
         return sysUptownHouses;
     }
 

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

@@ -25,12 +25,14 @@
         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.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult,
+        tr.trip_id,tr.is_trip,tr.today_local,tr.today_local_other,tr.work_local,tr.work_local_other
         from sys_uptown_house suh
         inner join sys_uptown_home suho on suho.house_id=suh.house_id
         INNER JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId}
         left join ms_report msr on msr.house_id = suh.house_id and msr.report_date = curdate()
         left join ms_suspected mss on mss.report_id=msr.report_id
+        left join ms_trip tr on mss.suspected_id=trip_id
         <where>
             <if test="unitId!=null and uptownId!='' and unitId!= '0'.toString()">
                 and suu.unit_id=#{unitId}
@@ -47,12 +49,14 @@
         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.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult,
+        tr.trip_id,tr.is_trip,tr.today_local,tr.today_local_other,tr.work_local,tr.work_local_other
         from sys_uptown_house suh
         inner join sys_uptown_home suho on suho.house_id=suh.house_id
         INNER JOIN sys_uptown_unit suu ON suu.unit_id = suh.unit_id and suu.uptown_id=#{uptownId}
         left join ms_report msr on msr.house_id = suh.house_id and msr.report_date = curdate()
         left join ms_suspected mss on mss.report_id=msr.report_id
+        left join ms_trip tr on mss.suspected_id=trip_id
         <where>
             <if test="unitId!=null and uptownId!='' and unitId!= '0'.toString()">
                 and suu.unit_id=#{unitId}