Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

zhangback

2026-03-10 68b27795ae929f5300fc6fb301b31aada74a2e2f

 tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchFeeSummaryViServiceImpl.java

@@ -7,16 +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;
@@ -27,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;
@@ -42,11 +41,37 @@
    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());
        LambdaQueryWrapper<TmsDispatchFeeSummaryVi> wrapper = new LambdaQueryWrapper<>();
        if (StringUtils.isNotEmpty(bo.getOrderTimeBegin()) && StringUtils.isNotEmpty(bo.getOrderTimeEnd())){
            wrapper.between(TmsDispatchFeeSummaryVi::getOrderTime, bo.getOrderTimeBegin(), bo.getOrderTimeEnd());
        }
        wrapper.like(StringUtils.isNotEmpty(bo.getDispatchNo()),TmsDispatchFeeSummaryVi::getDispatchNo, bo.getDispatchNo());
        wrapper.like(StringUtils.isNotEmpty(bo.getCustomerName()),TmsDispatchFeeSummaryVi::getCustomerName, bo.getCustomerName());
        wrapper.like(StringUtils.isNotEmpty(bo.getProjectName()),TmsDispatchFeeSummaryVi::getProjectName, bo.getProjectName());

        wrapper.like(StringUtils.isNotEmpty(bo.getAddress()),TmsDispatchFeeSummaryVi::getShipperRegionLabel, bo.getAddress());
        wrapper.like(StringUtils.isNotEmpty(bo.getAddress()),TmsDispatchFeeSummaryVi::getShipperAddress, bo.getAddress());
        wrapper.like(StringUtils.isNotEmpty(bo.getAddress()),TmsDispatchFeeSummaryVi::getReceiverAddress, bo.getAddress());
        wrapper.like(StringUtils.isNotEmpty(bo.getAddress()),TmsDispatchFeeSummaryVi::getReceiverRegionLabel, bo.getAddress());

        wrapper.like(StringUtils.isNotEmpty(bo.getProviderName()),TmsDispatchFeeSummaryVi::getProviderName, bo.getProviderName());
        wrapper.like(StringUtils.isNotEmpty(bo.getCustomsServiceProviderName()),TmsDispatchFeeSummaryVi::getCustomsServiceProviderName, bo.getCustomsServiceProviderName());
        wrapper.like(StringUtils.isNotEmpty(bo.getLoadingServiceProviderName()),TmsDispatchFeeSummaryVi::getLoadingServiceProviderName, bo.getLoadingServiceProviderName());

        wrapper.eq(StringUtils.isNotEmpty(bo.getRequiredVehicleTypes()),TmsDispatchFeeSummaryVi::getRequiredVehicleTypes, bo.getRequiredVehicleTypes());
        wrapper.eq(bo.getStatus() != null,TmsDispatchFeeSummaryVi::getStatus, bo.getStatus());
        wrapper.eq(StringUtils.isNotEmpty(bo.getActualVehicleType()),TmsDispatchFeeSummaryVi::getActualVehicleType, bo.getActualVehicleType());


        wrapper.notIn(TmsDispatchFeeSummaryVi::getStatus, 0,5);
        wrapper.orderByDesc(TmsDispatchFeeSummaryVi::getDispatchId);
        pageParam = baseMapper.selectPage(pageParam,wrapper);
        List<TmsDispatchFeeSummaryVi> records = pageParam.getRecords();
        records.forEach(item -> {
@@ -155,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);
    }
}