|
@@ -44,6 +44,8 @@ import com.pj.project.tb_fee_statistics.TbFeeStatistics;
|
|
|
import com.pj.project.tb_fee_statistics.TbFeeStatisticsService;
|
|
|
import com.pj.project.tb_goods.TbGoods;
|
|
|
import com.pj.project.tb_goods.TbGoodsService;
|
|
|
+import com.pj.project.tb_mild_car.TbMildCar;
|
|
|
+import com.pj.project.tb_mild_car.TbMildCarService;
|
|
|
import com.pj.project4sp.admin.SpAdmin;
|
|
|
import com.pj.project4sp.global.BusinessException;
|
|
|
import com.pj.project4sp.role.SpRole;
|
|
@@ -99,6 +101,8 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
|
|
|
TbDeductionBindService tbDeductionBindService;
|
|
|
@Resource
|
|
|
TaskService taskService;
|
|
|
+ @Resource
|
|
|
+ private TbMildCarService tbMildCarService;
|
|
|
|
|
|
/**
|
|
|
* 增
|
|
@@ -232,7 +236,8 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
|
|
|
in24Detail.setItemName("大型货车(含9.6米以上货车)");
|
|
|
out24Details.setItemName("大型货车(含9.6米以上货车)");
|
|
|
//4.2~9.6
|
|
|
- if (car.getCarSize() <= partConfig.getMildCarLength() && car.getCarSize() > partConfig.getFreeCarLength()) {
|
|
|
+ TbMildCar tbMildCar = tbMildCarService.findByCarNo(car.getCarNo());
|
|
|
+ if (tbMildCar != null) {
|
|
|
in24Price = partConfig.getMildCarBasePrice();
|
|
|
in24Detail.setItemName("中小型货车(9.6米以下货车)");
|
|
|
out24Details.setItemName("中小型货车(9.6米以下货车)");
|
|
@@ -364,7 +369,7 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
|
|
|
String beginTime = so.getString("beginTime");
|
|
|
String endTime = so.getString("endTime");
|
|
|
String time = "未选时间";
|
|
|
- if (StrUtil.isNotEmpty(beginTime)&&StrUtil.isNotEmpty(endTime)){
|
|
|
+ if (StrUtil.isNotEmpty(beginTime) && StrUtil.isNotEmpty(endTime)) {
|
|
|
time = beginTime + "至" + endTime;
|
|
|
}
|
|
|
Map<String, String> head = new HashMap<>();
|
|
@@ -377,9 +382,9 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
|
|
|
List<ExportFeeDetailDTO> exportList = new ArrayList<>();
|
|
|
List<String> ids = so.getListByComma("ids", String.class);
|
|
|
List<TbFeeDetails> list;
|
|
|
- if (ids!=null&&!ids.isEmpty()){
|
|
|
- list=this.listByIds(ids);
|
|
|
- }else {
|
|
|
+ if (ids != null && !ids.isEmpty()) {
|
|
|
+ list = this.listByIds(ids);
|
|
|
+ } else {
|
|
|
list = this.getList(so);
|
|
|
}
|
|
|
if (list.size() > 2000) {
|
|
@@ -485,8 +490,6 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
public List<TbFeeDetails> findByBusinessCarId(String businessCarId, int feeType) {
|
|
|
QueryWrapper<TbFeeDetails> ew = new QueryWrapper<>();
|
|
|
ew.eq("business_car_id", businessCarId);
|
|
@@ -508,9 +511,9 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
|
|
|
BigDecimal allDayNoTaxFee = new BigDecimal(0);
|
|
|
List<String> ids = so.getListByComma("ids", String.class);
|
|
|
List<TbFeeDetails> feeDetaillist;
|
|
|
- if (ids!=null&&!ids.isEmpty()){
|
|
|
- feeDetaillist=this.listByIds(ids);
|
|
|
- }else {
|
|
|
+ if (ids != null && !ids.isEmpty()) {
|
|
|
+ feeDetaillist = this.listByIds(ids);
|
|
|
+ } else {
|
|
|
feeDetaillist = this.getList(so);
|
|
|
}
|
|
|
List<ExportFeeDetailDTO> printList = new ArrayList<>();
|