国内转运 excel 导出功能

@@ -3,7 +3,6 @@ package com.tianbo.analysis.annotation;
 import com.tianbo.analysis.dao.COMPANYUSERMapper;
 import com.tianbo.analysis.dao.COMPANYUSERMapper;
 import com.tianbo.analysis.model.COMPANYUSER;
 import com.tianbo.analysis.model.COMPANYUSER;
 import com.tianbo.analysis.model.ResultJson;
 import com.tianbo.analysis.model.ResultJson;
-import org.apache.commons.codec.digest.DigestUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.*;
 import org.aspectj.lang.annotation.*;

@@ -122,4 +122,38 @@ public class DomTransController {
 
 
         return new ResultJson("200","success",result);
         return new ResultJson("200","success",result);
     }
     }
+
+    @ApiOperation(value = "excel导出数据",notes = "awba转运前主单，awbh转运前分单,flightDate,flightNo转运前航班信息")
+    @GetMapping("excelDom")
+    @UserPermissionCheck
+    public ResultJson<List<DomTransController>> excelDom(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
+                                                           int pageNum,
+                                                   @RequestParam(value = "pageSize",required = false,defaultValue = "10")
+                                                           int pageSize,
+                                                   @RequestParam(value = "originMasterwaybill",required = false) String awba,
+                                                   @RequestParam(value = "originHousewaybill",required = false) String awbh,
+                                                   @RequestParam(value = "originFlightdate",required = false) String flightDate,
+                                                   @RequestParam(value = "originFlightdateEnd",required = false) String originFlightdateEnd,
+                                                   @RequestParam(value = "originFlightno",required = false) String flightNo,
+                                                   @RequestParam(value = "transType",required = false) String transType,
+                                                   @RequestParam(value = "agentName",required = false) String agentName,
+                                                   @CookieValue("username") String username,
+                                                   @CookieValue("userid") String userid){
+        DOMTRANSIT domtransit = new DOMTRANSIT();
+        domtransit.setOriginMasterwaybill(awba);
+        domtransit.setOriginHousewaybill(awbh);
+        domtransit.setOriginFlightno(flightNo);
+        domtransit.setTransitType(transType);
+        domtransit.setAgentName(agentName);
+
+        //todo:权限校验,有管理权限的 显示全部数据
+        if (!"admin".equals(username)){
+            domtransit.setUserName(username);
+        }
+        if(StringUtils.isNotEmpty(flightDate) && StringUtils.isNotEmpty(originFlightdateEnd)){
+            domtransit.setOriginFlightdate(DateUtil.parseDate(flightDate,"yyyy-MM-dd"));
+            domtransit.setOriginFlightdateEnd(DateUtil.parseDate(originFlightdateEnd,"yyyy-MM-dd"));
+        }
+        return new ResultJson("200","success", domTransitService.excelDom(domtransit));
+    }
 }
 }

@@ -16,6 +16,8 @@ public interface DomTransitService {
 
 
     PageInfo<DOMTRANSIT> selectList(DOMTRANSIT record, int pageNum, int pageSize);
     PageInfo<DOMTRANSIT> selectList(DOMTRANSIT record, int pageNum, int pageSize);
 
 
+    List<DOMTRANSIT> excelDom(DOMTRANSIT record);
+
     int updateByPrimaryKeySelective(DOMTRANSIT record);
     int updateByPrimaryKeySelective(DOMTRANSIT record);
 
 
     int updateByPrimaryKey(DOMTRANSIT record);
     int updateByPrimaryKey(DOMTRANSIT record);

@@ -50,6 +50,12 @@ public class DomtransitServiceImpl implements DomTransitService {
     }
     }
 
 
     @Override
     @Override
+    public List<DOMTRANSIT> excelDom(DOMTRANSIT record) {
+        List<DOMTRANSIT> list =  domtransitMapper.selectList(record);
+        return list;
+    }
+
+    @Override
     public int updateByPrimaryKeySelective(DOMTRANSIT record) {
     public int updateByPrimaryKeySelective(DOMTRANSIT record) {
         return domtransitMapper.updateByPrimaryKeySelective(record);
         return domtransitMapper.updateByPrimaryKeySelective(record);
     }
     }