tijiao

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

@@ -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;
     }