去除不同报价方案，不能添加相同【客户-路线-车型】数据

wujianwei

2026-04-01 c11e6f07b031eea6c7de4c5508b8dbf0ee01d2c7

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

@@ -282,7 +282,7 @@
            tmsDispatchOrder.setCloseRemark(tmsDispatchOrder.getCloseRemark());
            tmsDispatchOrder.setCloseWhy(tmsDispatchOrder.getCloseWhy());
            int result = tmsDispatchOrderMapper.updateTmsDispatchOrder(tmsDispatchOrder);
            

            if (result > 0) {
                TmsDispatchOrderLog log = new TmsDispatchOrderLog();
                log.setHeadId(tmsDispatchOrder.getId());
@@ -306,17 +306,17 @@
                .set(TmsDispatchOrder::getCustomsServiceProviderId, tmsDispatchOrder.getCustomsServiceProviderId())
                .set(TmsDispatchOrder::getCustomsServiceProviderName, tmsDispatchOrder.getCustomsServiceProviderName())
        );
        

        if (result > 0) {
            TmsDispatchOrderLog log = new TmsDispatchOrderLog();
            log.setHeadId(tmsDispatchOrder.getId());
            log.setCreateBy(SecurityUtils.getUsername());
            log.setCreateTime(DateUtils.getNowDate());
            log.setNode("填写委托报关信息");
            

            tmsDispatchOrderLogService.insertTmsDispatchOrderLog(log);
        }
        

        return result;
    }

@@ -328,18 +328,18 @@
                .set(TmsDispatchOrder::getLoadingServiceProviderId, tmsDispatchOrder.getLoadingServiceProviderId())
                .set(TmsDispatchOrder::getLoadingServiceProviderName, tmsDispatchOrder.getLoadingServiceProviderName())
        );
        

        if (result > 0) {
            TmsDispatchOrderLog log = new TmsDispatchOrderLog();
            log.setHeadId(tmsDispatchOrder.getId());
            log.setCreateBy(SecurityUtils.getUsername());
            log.setCreateTime(DateUtils.getNowDate());
            log.setNode("填写委托装卸信息");
            
    


            tmsDispatchOrderLogService.insertTmsDispatchOrderLog(log);
        }
        

        return result;
    }

@@ -353,7 +353,7 @@
        DriverDispatchVo vo = new DriverDispatchVo();
        vo.setDriverId(deviceId);
        vo.setInStatusList(Arrays.asList(0, 1, 2,4));
        vo.setInTdoStatusList(Arrays.asList(1, 2));
        vo.setInTdoStatusList(Arrays.asList(1, 2,6,7));
        List<DriverDispatchVo> driverDispatchVos = tmsDispatchOrderMapper.selectAssignedItineraryList(vo);
        if (driverDispatchVos != null && !driverDispatchVos.isEmpty()){
            driverDispatchVos.forEach(item ->{
@@ -383,7 +383,7 @@

        DriverDispatchVo vo = new DriverDispatchVo();
        vo.setDriverId(deviceId);
        vo.setInStatusList(Arrays.asList(3,5));
        vo.setInStatusList(Arrays.asList(2,3,5));
//        vo.setInTdoStatusList(Arrays.asList(1, 2));
        List<DriverDispatchVo> driverDispatchVos = tmsDispatchOrderMapper.selectAssignedItineraryList(vo);
        if (driverDispatchVos != null && !driverDispatchVos.isEmpty()){
@@ -395,6 +395,44 @@

        return AjaxResult.success(driverDispatchVos);
    }

    @Override
    public Map<String, Object> assignedItineraryLogListPage(Integer pageNum, Integer pageSize) {
        Integer deviceId = userService.getDeviceId(SecurityUtils.getUserId());
        Map<String, Object> result = new HashMap<>();
        if (deviceId == null) {
            result.put("rows", Collections.emptyList());
            result.put("total", 0);
            return result;
        }

        DriverDispatchVo vo = new DriverDispatchVo();
        vo.setDriverId(deviceId);
       // vo.setInStatusList(Arrays.asList(3, 5));

        // 先查总数
        List<DriverDispatchVo> allList = tmsDispatchOrderMapper.selectAssignedItineraryList(vo);
        int total = allList != null ? allList.size() : 0;

        // 手动分页（SQL 已加 ORDER BY）
        int fromIndex = (pageNum - 1) * pageSize;
        List<DriverDispatchVo> pageList;
        if (allList == null || fromIndex >= total) {
            pageList = Collections.emptyList();
        } else {
            int toIndex = Math.min(fromIndex + pageSize, total);
            pageList = allList.subList(fromIndex, toIndex);
        }

        if (!pageList.isEmpty()) {
            pageList.forEach(item -> item.setStatusStr("完成行程"));
        }

        result.put("rows", pageList);
        result.put("total", total);
        return result;
    }

    @Override
    public AjaxResult selectAssignedItineraryDetail(Integer dispatchId) {
        Integer deviceId = userService.getDeviceId(SecurityUtils.getUserId());
@@ -589,7 +627,7 @@
        StringBuilder failureMsg = new StringBuilder();
        StringBuilder failureDescription = new StringBuilder();
        int line = 1;
        

        // 创建导入日志对象
        TmsDispatchOrderImportLog importLog = new TmsDispatchOrderImportLog();
        importLog.setImportTime(DateUtils.getNowDate());
@@ -597,7 +635,7 @@
        importLog.setOperator(SecurityUtils.getUsername());
        importLog.setCreateBy(SecurityUtils.getUsername());
        importLog.setCreateTime(DateUtils.getNowDate());
        

        for (TmsDispatchOrderImport tmsDispatchOrderImport : list){
            try
            {
@@ -771,10 +809,10 @@
                failureNum++;
                String msg = "<br/>" +  "调度单第"+line+"行导入失败：";
                failureMsg.append(msg + e.getMessage());
                

                // 记录失败说明，包含行号和失败原因
                failureDescription.append("第" + line + "行：" + e.getMessage()).append("\n");
                

                log.error(msg, e);
            }finally {
                line++;
@@ -785,7 +823,7 @@
        importLog.setSuccessCount(list.size() - failureNum);
        importLog.setFailureCount(failureNum);
        importLog.setFailureDescription(failureDescription.toString());
        

        // 保存导入日志
        try {
            tmsDispatchOrderImportLogService.insertTmsDispatchOrderImportLog(importLog);
@@ -821,7 +859,7 @@
        tmsDispatchOrder.setCreateBy(SecurityUtils.getUsername());
        tmsDispatchOrder.setCreateTime(DateUtils.getNowDate());
        int result = tmsDispatchOrderMapper.insertTmsDispatchOrder(tmsDispatchOrder);
        

        if (result > 0) {
            TmsDispatchOrderLog log = new TmsDispatchOrderLog();
            log.setHeadId(tmsDispatchOrder.getId());
@@ -830,7 +868,7 @@
            log.setNode("新增调度单");
            tmsDispatchOrderLogService.insertTmsDispatchOrderLog(log);
        }
        

        return result;
    }
    @Override
@@ -870,7 +908,7 @@

        tmsDispatchOrder.setUpdateTime(DateUtils.getNowDate());
        int result = tmsDispatchOrderMapper.updateTmsDispatchOrder(tmsDispatchOrder);
        

        if (result > 0) {
            TmsDispatchOrderLog log = new TmsDispatchOrderLog();
            log.setHeadId(tmsDispatchOrder.getId());
@@ -879,7 +917,7 @@
            log.setNode("编辑调度单");
            tmsDispatchOrderLogService.insertTmsDispatchOrderLog(log);
        }
        

        return result;
    }
    @Override
@@ -947,17 +985,17 @@
                        .set(TmsDispatchOrder::getContactName,tmsDispatchOrder.getContactName())
                        .set(TmsDispatchOrder::getContactPhone,tmsDispatchOrder.getContactPhone())
        );
        

        if (result > 0) {
            TmsDispatchOrderLog log = new TmsDispatchOrderLog();
            log.setHeadId(tmsDispatchOrder.getId());
            log.setCreateBy(SecurityUtils.getUsername());
            log.setCreateTime(DateUtils.getNowDate());
            log.setNode("承运单打印");
           

            tmsDispatchOrderLogService.insertTmsDispatchOrderLog(log);
        }
        

        return result;
    }