积分优化

performance-api/src/main/java/com/clx/performance/vo/app/collect/CollectLineReportVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/collect/CollectLineReportVO.java

-package com.clx.performance.vo.app.collect;
+package com.clx.performance.vo.pc.collect;
 
 import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.ApiModel;

performance-api/src/main/java/com/clx/performance/vo/app/collect/CollectTrafficCongestionVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/collect/CollectTrafficCongestionVO.java

-package com.clx.performance.vo.app.collect;
+package com.clx.performance.vo.pc.collect;
 
 import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.ApiModel;

performance-api/src/main/java/com/clx/performance/vo/app/collect/CollectTruckLeaveVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/collect/CollectTruckLeaveVO.java

-package com.clx.performance.vo.app.collect;
+package com.clx.performance.vo.pc.collect;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

performance-api/src/main/java/com/clx/performance/vo/app/collect/CollectTruckLocationVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/collect/CollectTruckLocationVO.java

-package com.clx.performance.vo.app.collect;
+package com.clx.performance.vo.pc.collect;
 
 import com.clx.performance.enums.collect.CollectTruckLocationEnum;
 import io.swagger.annotations.ApiModel;

performance-api/src/main/java/com/clx/performance/vo/app/collect/CollectTruckRefuelVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/collect/CollectTruckRefuelVO.java

-package com.clx.performance.vo.app.collect;
+package com.clx.performance.vo.pc.collect;
 
 import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.ApiModel;

performance-api/src/main/java/com/clx/performance/vo/app/collect/CollectTruckWaitVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/collect/CollectTruckWaitVO.java

-package com.clx.performance.vo.app.collect;
+package com.clx.performance.vo.pc.collect;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverCollectLineReportController.java

@@ -3,7 +3,7 @@ package com.clx.performance.controller.app;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.app.collect.*;
 import com.clx.performance.service.collect.CollectLineReportService;
-import com.clx.performance.vo.app.collect.CollectLineReportVO;
+import com.clx.performance.vo.pc.collect.CollectLineReportVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverCollectTrafficCongestionController.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.app.collect.CollectTrafficCongestionSaveParam;
 import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
 import com.clx.performance.service.collect.CollectTrafficCongestionService;
-import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+import com.clx.performance.vo.pc.collect.CollectTrafficCongestionVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverCollectTruckLeaveController.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.app.collect.CollectTruckLeaveSaveParam;
 import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
 import com.clx.performance.service.collect.CollectTruckLeaveService;
-import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
+import com.clx.performance.vo.pc.collect.CollectTruckLeaveVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverCollectTruckLocationController.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.app.collect.CollectTruckLocationSaveParam;
 import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
 import com.clx.performance.service.collect.CollectTruckLocationService;
-import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
+import com.clx.performance.vo.pc.collect.CollectTruckLocationVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverCollectTruckRefuelController.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.app.collect.CollectTruckRefuelSaveParam;
 import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
 import com.clx.performance.service.collect.CollectTruckRefuelService;
-import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
+import com.clx.performance.vo.pc.collect.CollectTruckRefuelVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverCollectTruckWaitController.java

@@ -5,7 +5,7 @@ import com.clx.performance.param.app.collect.CollectWaitReportReceiveAddressSave
 import com.clx.performance.param.app.collect.CollectWaitReportSendAddressSaveParam;
 import com.clx.performance.param.app.collect.PageCollectTruckWaitParam;
 import com.clx.performance.service.collect.CollectWaitReportService;
-import com.clx.performance.vo.app.collect.CollectTruckWaitVO;
+import com.clx.performance.vo.pc.collect.CollectTruckWaitVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;

performance-web/src/main/java/com/clx/performance/controller/pc/collect/CarrierDriverCollectLineReportController.java

@@ -4,9 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.app.collect.*;
 import com.clx.performance.param.pc.carrier.*;
 import com.clx.performance.service.collect.CollectLineReportService;
-import com.clx.performance.vo.app.collect.CollectLineReportVO;
+import com.clx.performance.vo.pc.collect.CollectLineReportVO;
 import com.msl.common.base.PageData;
-import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

performance-web/src/main/java/com/clx/performance/controller/pc/collect/CarrierDriverCollectTrafficCongestionController.java

 package com.clx.performance.controller.pc.collect;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.performance.param.app.collect.CollectLineReportSendAddressAuditParam;
 import com.clx.performance.param.app.collect.CollectTrafficCongestionAuditParam;
-import com.clx.performance.param.app.collect.CollectTrafficCongestionSaveParam;
-import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTraficCongestionParam;
 import com.clx.performance.service.collect.CollectTrafficCongestionService;
-import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+import com.clx.performance.vo.pc.collect.CollectTrafficCongestionVO;
 import com.msl.common.base.PageData;
-import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

performance-web/src/main/java/com/clx/performance/controller/pc/collect/CarrierDriverCollectTruckLeaveController.java

 package com.clx.performance.controller.pc.collect;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.performance.param.app.collect.CollectTruckLeaveSaveParam;
-import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLeaveParam;
 import com.clx.performance.service.collect.CollectTruckLeaveService;
-import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
+import com.clx.performance.vo.pc.collect.CollectTruckLeaveVO;
 import com.msl.common.base.PageData;
-import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

performance-web/src/main/java/com/clx/performance/controller/pc/collect/CarrierDriverCollectTruckLocationController.java

 package com.clx.performance.controller.pc.collect;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.performance.param.app.collect.CollectTruckLocationSaveParam;
-import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLocationParam;
 import com.clx.performance.service.collect.CollectTruckLocationService;
-import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
+import com.clx.performance.vo.pc.collect.CollectTruckLocationVO;
 import com.msl.common.base.PageData;
-import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

performance-web/src/main/java/com/clx/performance/controller/pc/collect/CarrierDriverCollectTruckRefuelController.java

 package com.clx.performance.controller.pc.collect;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.performance.param.app.collect.CollectTruckRefuelSaveParam;
-import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckRefuelParam;
 import com.clx.performance.service.collect.CollectTruckRefuelService;
-import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
+import com.clx.performance.vo.pc.collect.CollectTruckRefuelVO;
 import com.msl.common.base.PageData;
-import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

performance-web/src/main/java/com/clx/performance/controller/pc/collect/CarrierDriverCollectTruckWaitController.java

@@ -4,9 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.app.collect.*;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckWaitParam;
 import com.clx.performance.service.collect.CollectWaitReportService;
-import com.clx.performance.vo.app.collect.CollectTruckWaitVO;
+import com.clx.performance.vo.pc.collect.CollectTruckWaitVO;
 import com.msl.common.base.PageData;
-import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

performance-web/src/main/java/com/clx/performance/dao/collect/CollectLineReportDao.java

@@ -2,11 +2,10 @@ package com.clx.performance.dao.collect;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.collect.CollectLineReportMapper;
-import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.collect.CollectLineReport;
 import com.clx.performance.param.app.collect.PageCollectLineReportParam;
 import com.clx.performance.param.pc.carrier.*;
-import com.clx.performance.vo.app.collect.CollectLineReportVO;
+import com.clx.performance.vo.pc.collect.CollectLineReportVO;
 import com.msl.common.dao.BaseDao;
 
 /**

performance-web/src/main/java/com/clx/performance/dao/collect/CollectTrafficCongestionDao.java

@@ -2,11 +2,10 @@ package com.clx.performance.dao.collect;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.collect.CollectTrafficCongestionMapper;
-import com.clx.performance.model.collect.CollectLineReport;
 import com.clx.performance.model.collect.CollectTrafficCongestion;
 import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTraficCongestionParam;
-import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+import com.clx.performance.vo.pc.collect.CollectTrafficCongestionVO;
 import com.msl.common.dao.BaseDao;
 
 /**

performance-web/src/main/java/com/clx/performance/dao/collect/CollectTruckLeaveDao.java

@@ -3,11 +3,9 @@ package com.clx.performance.dao.collect;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.collect.CollectTruckLeaveMapper;
 import com.clx.performance.model.collect.CollectTruckLeave;
-import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
 import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLeaveParam;
-import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
-import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
+import com.clx.performance.vo.pc.collect.CollectTruckLeaveVO;
 import com.msl.common.dao.BaseDao;
 
 /**

performance-web/src/main/java/com/clx/performance/dao/collect/CollectTruckLocationDao.java

@@ -3,11 +3,9 @@ package com.clx.performance.dao.collect;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.collect.CollectTruckLocationMapper;
 import com.clx.performance.model.collect.CollectTruckLocation;
-import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
 import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLocationParam;
-import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
-import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
+import com.clx.performance.vo.pc.collect.CollectTruckLocationVO;
 import com.msl.common.dao.BaseDao;
 
 /**

performance-web/src/main/java/com/clx/performance/dao/collect/CollectTruckRefuelDao.java

@@ -3,11 +3,9 @@ package com.clx.performance.dao.collect;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.collect.CollectTruckRefuelMapper;
 import com.clx.performance.model.collect.CollectTruckRefuel;
-import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
 import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckRefuelParam;
-import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
-import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
+import com.clx.performance.vo.pc.collect.CollectTruckRefuelVO;
 import com.msl.common.dao.BaseDao;
 
 /**

performance-web/src/main/java/com/clx/performance/dao/collect/CollectTruckWaitDao.java

@@ -2,11 +2,10 @@ package com.clx.performance.dao.collect;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.collect.CollectTruckWaitMapper;
-import com.clx.performance.model.collect.CollectLineReport;
 import com.clx.performance.model.collect.CollectTruckWait;
 import com.clx.performance.param.app.collect.PageCollectTruckWaitParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckWaitParam;
-import com.clx.performance.vo.app.collect.CollectTruckWaitVO;
+import com.clx.performance.vo.pc.collect.CollectTruckWaitVO;
 import com.msl.common.dao.BaseDao;
 
 /**

performance-web/src/main/java/com/clx/performance/dao/impl/collect/CollectLineReportDaoImpl.java

@@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.collect.CollectLineReportDao;
 import com.clx.performance.mapper.collect.CollectLineReportMapper;
-import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.collect.CollectLineReport;
 import com.clx.performance.param.app.collect.PageCollectLineReportParam;
 import com.clx.performance.param.pc.carrier.*;
-import com.clx.performance.vo.app.collect.CollectLineReportVO;
+import com.clx.performance.vo.pc.collect.CollectLineReportVO;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 

performance-web/src/main/java/com/clx/performance/dao/impl/collect/CollectTrafficCongestionDaoImpl.java

@@ -4,12 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.collect.CollectTrafficCongestionDao;
 import com.clx.performance.mapper.collect.CollectTrafficCongestionMapper;
-import com.clx.performance.model.collect.CollectLineReport;
 import com.clx.performance.model.collect.CollectTrafficCongestion;
 import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTraficCongestionParam;
-import com.clx.performance.vo.app.OrderChildVO;
-import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+import com.clx.performance.vo.pc.collect.CollectTrafficCongestionVO;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 

performance-web/src/main/java/com/clx/performance/dao/impl/collect/CollectTruckLeaveDaoImpl.java

@@ -7,8 +7,7 @@ import com.clx.performance.mapper.collect.CollectTruckLeaveMapper;
 import com.clx.performance.model.collect.CollectTruckLeave;
 import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLeaveParam;
-import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
-import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
+import com.clx.performance.vo.pc.collect.CollectTruckLeaveVO;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 

performance-web/src/main/java/com/clx/performance/dao/impl/collect/CollectTruckLocationDaoImpl.java

@@ -7,8 +7,7 @@ import com.clx.performance.mapper.collect.CollectTruckLocationMapper;
 import com.clx.performance.model.collect.CollectTruckLocation;
 import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLocationParam;
-import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
-import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
+import com.clx.performance.vo.pc.collect.CollectTruckLocationVO;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 

performance-web/src/main/java/com/clx/performance/dao/impl/collect/CollectTruckRefuelDaoImpl.java

@@ -7,7 +7,7 @@ import com.clx.performance.mapper.collect.CollectTruckRefuelMapper;
 import com.clx.performance.model.collect.CollectTruckRefuel;
 import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckRefuelParam;
-import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
+import com.clx.performance.vo.pc.collect.CollectTruckRefuelVO;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 

performance-web/src/main/java/com/clx/performance/dao/impl/collect/CollectTruckWaitDaoImpl.java

@@ -4,11 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.collect.CollectTruckWaitDao;
 import com.clx.performance.mapper.collect.CollectTruckWaitMapper;
-import com.clx.performance.model.collect.CollectLineReport;
 import com.clx.performance.model.collect.CollectTruckWait;
 import com.clx.performance.param.app.collect.PageCollectTruckWaitParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckWaitParam;
-import com.clx.performance.vo.app.collect.CollectTruckWaitVO;
+import com.clx.performance.vo.pc.collect.CollectTruckWaitVO;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 

performance-web/src/main/java/com/clx/performance/mapper/collect/CollectLineReportMapper.java

@@ -7,7 +7,7 @@ import com.clx.performance.model.collect.CollectLineReport;
 import com.clx.performance.param.app.collect.PageCollectLineReportParam;
 import com.clx.performance.param.pc.carrier.*;
 import com.clx.performance.sqlProvider.collect.CollectLineReportSqlProvider;
-import com.clx.performance.vo.app.collect.CollectLineReportVO;
+import com.clx.performance.vo.pc.collect.CollectLineReportVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.SelectProvider;

performance-web/src/main/java/com/clx/performance/mapper/collect/CollectTrafficCongestionMapper.java

@@ -7,7 +7,7 @@ import com.clx.performance.model.collect.CollectTrafficCongestion;
 import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTraficCongestionParam;
 import com.clx.performance.sqlProvider.collect.CollectTrafficCongestionSqlProvider;
-import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+import com.clx.performance.vo.pc.collect.CollectTrafficCongestionVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.SelectProvider;

performance-web/src/main/java/com/clx/performance/mapper/collect/CollectTruckLeaveMapper.java

@@ -7,7 +7,7 @@ import com.clx.performance.model.collect.CollectTruckLeave;
 import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLeaveParam;
 import com.clx.performance.sqlProvider.collect.CollectTruckLeaveSqlProvider;
-import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
+import com.clx.performance.vo.pc.collect.CollectTruckLeaveVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.SelectProvider;

performance-web/src/main/java/com/clx/performance/mapper/collect/CollectTruckLocationMapper.java

@@ -7,7 +7,7 @@ import com.clx.performance.model.collect.CollectTruckLocation;
 import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLocationParam;
 import com.clx.performance.sqlProvider.collect.CollectTruckLocationSqlProvider;
-import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
+import com.clx.performance.vo.pc.collect.CollectTruckLocationVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.SelectProvider;

performance-web/src/main/java/com/clx/performance/mapper/collect/CollectTruckRefuelMapper.java

@@ -7,7 +7,7 @@ import com.clx.performance.model.collect.CollectTruckRefuel;
 import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckRefuelParam;
 import com.clx.performance.sqlProvider.collect.CollectTruckRefuelSqlProvider;
-import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
+import com.clx.performance.vo.pc.collect.CollectTruckRefuelVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.SelectProvider;

performance-web/src/main/java/com/clx/performance/mapper/collect/CollectTruckWaitMapper.java

@@ -7,7 +7,7 @@ import com.clx.performance.model.collect.CollectTruckWait;
 import com.clx.performance.param.app.collect.PageCollectTruckWaitParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckWaitParam;
 import com.clx.performance.sqlProvider.collect.CollectTruckWaitSqlProvider;
-import com.clx.performance.vo.app.collect.CollectTruckWaitVO;
+import com.clx.performance.vo.pc.collect.CollectTruckWaitVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.SelectProvider;

performance-web/src/main/java/com/clx/performance/service/collect/CollectLineReportService.java

@@ -3,7 +3,7 @@ package com.clx.performance.service.collect;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.app.collect.*;
 import com.clx.performance.param.pc.carrier.*;
-import com.clx.performance.vo.app.collect.CollectLineReportVO;
+import com.clx.performance.vo.pc.collect.CollectLineReportVO;
 
 public interface CollectLineReportService {
 

performance-web/src/main/java/com/clx/performance/service/collect/CollectTrafficCongestionService.java

@@ -5,7 +5,7 @@ import com.clx.performance.param.app.collect.CollectTrafficCongestionAuditParam;
 import com.clx.performance.param.app.collect.CollectTrafficCongestionSaveParam;
 import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTraficCongestionParam;
-import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+import com.clx.performance.vo.pc.collect.CollectTrafficCongestionVO;
 
 public interface CollectTrafficCongestionService {
 

performance-web/src/main/java/com/clx/performance/service/collect/CollectTruckLeaveService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.app.collect.CollectTruckLeaveSaveParam;
 import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLeaveParam;
-import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
+import com.clx.performance.vo.pc.collect.CollectTruckLeaveVO;
 
 public interface CollectTruckLeaveService {
 

performance-web/src/main/java/com/clx/performance/service/collect/CollectTruckLocationService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.app.collect.CollectTruckLocationSaveParam;
 import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLocationParam;
-import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
+import com.clx.performance.vo.pc.collect.CollectTruckLocationVO;
 
 public interface CollectTruckLocationService {
 

performance-web/src/main/java/com/clx/performance/service/collect/CollectTruckRefuelService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.app.collect.CollectTruckRefuelSaveParam;
 import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckRefuelParam;
-import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
+import com.clx.performance.vo.pc.collect.CollectTruckRefuelVO;
 
 public interface CollectTruckRefuelService {
 

performance-web/src/main/java/com/clx/performance/service/collect/CollectWaitReportService.java

@@ -6,7 +6,7 @@ import com.clx.performance.param.app.collect.CollectWaitReportReceiveAddressSave
 import com.clx.performance.param.app.collect.CollectWaitReportSendAddressSaveParam;
 import com.clx.performance.param.app.collect.PageCollectTruckWaitParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckWaitParam;
-import com.clx.performance.vo.app.collect.CollectTruckWaitVO;
+import com.clx.performance.vo.pc.collect.CollectTruckWaitVO;
 
 public interface CollectWaitReportService {
 

performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectLineReportServiceImpl.java

@@ -11,7 +11,7 @@ import com.clx.performance.param.app.collect.*;
 import com.clx.performance.param.pc.carrier.*;
 import com.clx.performance.service.collect.CollectLineReportService;
 import com.clx.performance.struct.collect.CollectLineReportStruct;
-import com.clx.performance.vo.app.collect.CollectLineReportVO;
+import com.clx.performance.vo.pc.collect.CollectLineReportVO;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -19,7 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.List;
 import java.util.Objects;
 
 @Slf4j

performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectTrafficCongestionServiceImpl.java

@@ -11,7 +11,7 @@ import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTraficCongestionParam;
 import com.clx.performance.service.collect.CollectTrafficCongestionService;
 import com.clx.performance.struct.collect.CollectTrafficCongestionStruct;
-import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+import com.clx.performance.vo.pc.collect.CollectTrafficCongestionVO;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import lombok.extern.slf4j.Slf4j;

performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectTruckLeaveServiceImpl.java

@@ -10,7 +10,7 @@ import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLeaveParam;
 import com.clx.performance.service.collect.CollectTruckLeaveService;
 import com.clx.performance.struct.collect.CollectTruckLeaveStruct;
 import com.clx.performance.utils.LocalDateTimeUtils;
-import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
+import com.clx.performance.vo.pc.collect.CollectTruckLeaveVO;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import lombok.extern.slf4j.Slf4j;

performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectTruckLocationServiceImpl.java

@@ -4,13 +4,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.dao.collect.CollectTruckLocationDao;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.model.collect.CollectTruckLocation;
-import com.clx.performance.model.collect.CollectTruckRefuel;
 import com.clx.performance.param.app.collect.CollectTruckLocationSaveParam;
 import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLocationParam;
 import com.clx.performance.service.collect.CollectTruckLocationService;
 import com.clx.performance.struct.collect.CollectTruckLocationStruct;
-import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
+import com.clx.performance.vo.pc.collect.CollectTruckLocationVO;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import lombok.extern.slf4j.Slf4j;

performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectTruckRefuelServiceImpl.java

@@ -12,7 +12,7 @@ import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckRefuelParam;
 import com.clx.performance.service.collect.CollectTruckRefuelService;
 import com.clx.performance.struct.collect.CollectTruckRefuelStruct;
-import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
+import com.clx.performance.vo.pc.collect.CollectTruckRefuelVO;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import lombok.extern.slf4j.Slf4j;

performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectWaitReportServiceImpl.java

@@ -6,7 +6,6 @@ import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.collect.CollectTruckWaitDao;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.model.OrderChild;
-import com.clx.performance.model.collect.CollectLineReport;
 import com.clx.performance.model.collect.CollectTruckWait;
 import com.clx.performance.param.app.collect.CollectLineReportTruckWaitAuditParam;
 import com.clx.performance.param.app.collect.CollectWaitReportReceiveAddressSaveParam;
@@ -15,7 +14,7 @@ import com.clx.performance.param.app.collect.PageCollectTruckWaitParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckWaitParam;
 import com.clx.performance.service.collect.CollectWaitReportService;
 import com.clx.performance.struct.collect.CollectTruckWaitStruct;
-import com.clx.performance.vo.app.collect.CollectTruckWaitVO;
+import com.clx.performance.vo.pc.collect.CollectTruckWaitVO;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import lombok.extern.slf4j.Slf4j;

performance-web/src/main/java/com/clx/performance/sqlProvider/collect/CollectLineReportSqlProvider.java

@@ -4,7 +4,7 @@ package com.clx.performance.sqlProvider.collect;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.param.app.collect.PageCollectLineReportParam;
 import com.clx.performance.param.pc.carrier.*;
-import com.clx.performance.vo.app.collect.CollectLineReportVO;
+import com.clx.performance.vo.pc.collect.CollectLineReportVO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;

performance-web/src/main/java/com/clx/performance/sqlProvider/collect/CollectTrafficCongestionSqlProvider.java

@@ -4,7 +4,7 @@ package com.clx.performance.sqlProvider.collect;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTraficCongestionParam;
-import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+import com.clx.performance.vo.pc.collect.CollectTrafficCongestionVO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;

performance-web/src/main/java/com/clx/performance/sqlProvider/collect/CollectTruckLeaveSqlProvider.java

@@ -4,7 +4,7 @@ package com.clx.performance.sqlProvider.collect;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLeaveParam;
-import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
+import com.clx.performance.vo.pc.collect.CollectTruckLeaveVO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;

performance-web/src/main/java/com/clx/performance/sqlProvider/collect/CollectTruckLocationSqlProvider.java

@@ -4,13 +4,11 @@ package com.clx.performance.sqlProvider.collect;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckLocationParam;
-import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
+import com.clx.performance.vo.pc.collect.CollectTruckLocationVO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;
 
-import java.util.Objects;
-
 public class CollectTruckLocationSqlProvider {
 
     public String pageLocation(@Param("page") Page<CollectTruckLocationVO> page, @Param("param") PageCollectTruckLocationParam param) {

performance-web/src/main/java/com/clx/performance/sqlProvider/collect/CollectTruckRefuelSqlProvider.java

@@ -4,7 +4,7 @@ package com.clx.performance.sqlProvider.collect;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckRefuelParam;
-import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
+import com.clx.performance.vo.pc.collect.CollectTruckRefuelVO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;

performance-web/src/main/java/com/clx/performance/sqlProvider/collect/CollectTruckWaitSqlProvider.java

@@ -4,7 +4,7 @@ package com.clx.performance.sqlProvider.collect;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.param.app.collect.PageCollectTruckWaitParam;
 import com.clx.performance.param.pc.carrier.CarrierPageCollectTruckWaitParam;
-import com.clx.performance.vo.app.collect.CollectTruckWaitVO;
+import com.clx.performance.vo.pc.collect.CollectTruckWaitVO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;

performance-web/src/main/java/com/clx/performance/struct/collect/CollectLineReportStruct.java

 package com.clx.performance.struct.collect;
 
 import com.clx.performance.model.collect.CollectLineReport;
-import com.clx.performance.vo.app.collect.CollectLineReportVO;
+import com.clx.performance.vo.pc.collect.CollectLineReportVO;
 import com.msl.common.utils.DateStructUtil;
 import org.mapstruct.Mapper;
 

performance-web/src/main/java/com/clx/performance/struct/collect/CollectTrafficCongestionStruct.java

 package com.clx.performance.struct.collect;
 
 import com.clx.performance.model.collect.CollectTrafficCongestion;
-import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+import com.clx.performance.vo.pc.collect.CollectTrafficCongestionVO;
 import com.msl.common.utils.DateStructUtil;
 import org.mapstruct.Mapper;
 

performance-web/src/main/java/com/clx/performance/struct/collect/CollectTruckLeaveStruct.java

 package com.clx.performance.struct.collect;
 
 import com.clx.performance.model.collect.CollectTruckLeave;
-import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
+import com.clx.performance.vo.pc.collect.CollectTruckLeaveVO;
 import com.msl.common.utils.DateStructUtil;
 import org.mapstruct.Mapper;
 

performance-web/src/main/java/com/clx/performance/struct/collect/CollectTruckLocationStruct.java

 package com.clx.performance.struct.collect;
 
 import com.clx.performance.model.collect.CollectTruckLocation;
-import com.clx.performance.model.collect.CollectTruckRefuel;
-import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
-import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
+import com.clx.performance.vo.pc.collect.CollectTruckLocationVO;
 import com.msl.common.utils.DateStructUtil;
 import org.mapstruct.Mapper;
 

performance-web/src/main/java/com/clx/performance/struct/collect/CollectTruckRefuelStruct.java

 package com.clx.performance.struct.collect;
 
 import com.clx.performance.model.collect.CollectTruckRefuel;
-import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
+import com.clx.performance.vo.pc.collect.CollectTruckRefuelVO;
 import com.msl.common.utils.DateStructUtil;
 import org.mapstruct.Mapper;
 

performance-web/src/main/java/com/clx/performance/struct/collect/CollectTruckWaitStruct.java

 package com.clx.performance.struct.collect;
 
 import com.clx.performance.model.collect.CollectTruckWait;
-import com.clx.performance.vo.app.collect.CollectTruckWaitVO;
+import com.clx.performance.vo.pc.collect.CollectTruckWaitVO;
 import com.msl.common.utils.DateStructUtil;
 import org.mapstruct.Mapper;