From 9ec0a61f90ac2464eebc643bfe2d93ac9ba6e569 Mon Sep 17 00:00:00 2001
From: cgf <2156125618@qq.com>
Date: 星期六, 23 八月 2025 10:59:18 +0800
Subject: [PATCH] 折扣已完成现有需求2025/08/09
---
service-job/src/main/java/com/java110/job/cmd/importCarInout/QueryCarInout.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/cmd/importCarInout/QueryCarInout.java b/service-job/src/main/java/com/java110/job/cmd/importCarInout/QueryCarInout.java
index 0d4f071..de276d3 100644
--- a/service-job/src/main/java/com/java110/job/cmd/importCarInout/QueryCarInout.java
+++ b/service-job/src/main/java/com/java110/job/cmd/importCarInout/QueryCarInout.java
@@ -10,6 +10,8 @@
import com.java110.dto.machine.CarInoutDto;
import com.java110.dto.user.UserDownloadFileDto;
import com.java110.intf.common.ICarInoutInnerServiceSMO;
+import com.java110.intf.common.ICarInoutV1InnerServiceSMO;
+import com.java110.po.car.CarInoutFeeHistoryPo;
import com.java110.po.car.CarInoutPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.BeanConvertUtil;
@@ -19,7 +21,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
+import org.springframework.util.CollectionUtils;
+import javax.annotation.Resource;
import java.text.ParseException;
import java.util.List;
@@ -28,6 +32,8 @@
@Autowired
private ICarInoutInnerServiceSMO iCarInoutInnerServiceSMOImpl;
+ @Resource
+ private ICarInoutV1InnerServiceSMO carInoutV1InnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
@@ -42,7 +48,15 @@
carInoutDto.setTotal(i);
carInoutDto.setRecords((int) Math.ceil((double) i / (double) reqJson.getInteger("row")));
List<ApiCarInoutDataVo> carInoutDtos = iCarInoutInnerServiceSMOImpl.queryCarInouts2(carInoutDto);
-
+ for(ApiCarInoutDataVo apiCarInoutDataVo : carInoutDtos){
+ CarInoutFeeHistoryPo carInoutFeeHistoryPo = new CarInoutFeeHistoryPo();
+ carInoutFeeHistoryPo.setInoutId(apiCarInoutDataVo.getInoutId());
+ List<CarInoutFeeHistoryPo> list = carInoutV1InnerServiceSMOImpl.queryCarInoutFeeHistoryList(carInoutFeeHistoryPo);
+ if(!CollectionUtils.isEmpty(list)){
+ apiCarInoutDataVo.setCarInoutFeeHistory(list.get(0));
+ }
+ }
+ i = carInoutDtos.size();
ApiCarInoutVo carInoutVo = new ApiCarInoutVo();
carInoutVo.setTotal(i);
--
Gitblit v1.8.0