From 68b27795ae929f5300fc6fb301b31aada74a2e2f Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 10 三月 2026 15:26:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchFeeSummaryViServiceImpl.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchFeeSummaryViServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchFeeSummaryViServiceImpl.java
index 499a9a6..3c1b306 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchFeeSummaryViServiceImpl.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchFeeSummaryViServiceImpl.java
@@ -7,17 +7,14 @@
import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.core.service.BaseService;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.DownloadExportUtil;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.tms.domain.TmsDispatchFeeSummaryVi;
-import com.ruoyi.tms.domain.TmsPayableFeeItem;
-import com.ruoyi.tms.domain.TmsReceivableFeeItem;
-import com.ruoyi.tms.domain.TmsTrip;
-import com.ruoyi.tms.mapper.TmsDispatchFeeSummaryViMapper;
-import com.ruoyi.tms.mapper.TmsPayableFeeItemMapper;
-import com.ruoyi.tms.mapper.TmsReceivableFeeItemMapper;
+import com.ruoyi.tms.domain.*;
+import com.ruoyi.tms.mapper.*;
import com.ruoyi.tms.service.ITmsDispatchFeeSummaryViService;
+import com.ruoyi.tms.service.ITmsDispatchOrderService;
import com.ruoyi.tms.service.ITmsReceivableFeeService;
import com.ruoyi.tms.service.ITmsTripService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +25,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -43,6 +41,10 @@
private TmsReceivableFeeItemMapper tmsReceivableFeeItemMapper;
@Resource
private TmsPayableFeeItemMapper tmsPayableFeeItemMapper;
+ @Resource
+ private TmsDispatchOrderMapper tmsDispatchOrderMapper;
+ @Resource
+ private TmsDispatchFeeSummaryViLogMapper logMapper;
@Override
public Page<TmsDispatchFeeSummaryVi> list(PageDomain pageDomain,TmsDispatchFeeSummaryVi bo) {
Page<TmsDispatchFeeSummaryVi> pageParam = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
@@ -178,5 +180,15 @@
}
}
-
+ @Override
+ public int note(TmsDispatchFeeSummaryVi bo) {
+ tmsDispatchOrderMapper.updateTmsDispatchOrder(new TmsDispatchOrder(){{setId(bo.getDispatchId().intValue());
+ setNotes(bo.getRemark());}});
+ TmsDispatchFeeSummaryViLog tmsDispatchFeeSummaryViLog = new TmsDispatchFeeSummaryViLog();
+ tmsDispatchFeeSummaryViLog.setNotes(bo.getRemark());
+ tmsDispatchFeeSummaryViLog.setHeadId(bo.getDispatchId().intValue());
+ tmsDispatchFeeSummaryViLog.setCreateBy(SecurityUtils.getUsername());
+ tmsDispatchFeeSummaryViLog.setCreateTime(new Date());
+ return logMapper.insertTmsDispatchFeeSummaryViLog(tmsDispatchFeeSummaryViLog);
+ }
}
--
Gitblit v1.8.0