Merge branch 'repair' of http://122.51.230.86:3000/dianliang/lanan-system into repair

2024-11-27 15:12:21 +08:00 · 2024-11-27 15:12:21 +08:00 · 60356c6c17
commit 60356c6c17
parent 24da7a0d3f c0a85a7f75
5 changed files with 105 additions and 1 deletions
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java
@ -379,6 +379,14 @@ public class DlRepairSoServiceImpl extends ServiceImpl<DlRepairSoMapper, DlRepai
        remark += "确认领料" + String.join(";", nameAndCount);
        // 记录日志
        recordsService.saveRepairRecord(byId.getTicketId(), null, RecordTypeEnum.LL.getCode(), remark, image);
+
+        // 更新工单主表时间
+        if (ObjectUtil.isNotEmpty(so) && ObjectUtil.isNotEmpty(so.getTwId())){
+            DlTicketWares ticketWares = ticketWaresService.getById(so.getTwId());
+            if (ObjectUtil.isNotEmpty(ticketWares) && ObjectUtil.isNotEmpty(ticketWares.getTicketId())){
+                ticketsService.refreshUpdateTime(ticketWares.getTicketId());
+            }
+        }
    }

    /**
@ -420,6 +428,14 @@ public class DlRepairSoServiceImpl extends ServiceImpl<DlRepairSoMapper, DlRepai
        remark += "确认退料" + String.join(",", nameAndCount);
        // 记录日志
        recordsService.saveRepairRecord(byId.getTicketId(), null, RecordTypeEnum.TL.getCode(), remark, image);
+
+        // 更新工单主表时间
+        if (ObjectUtil.isNotEmpty(newSo) && ObjectUtil.isNotEmpty(newSo.getTwId())){
+            DlTicketWares ticketWares = ticketWaresService.getById(newSo.getTwId());
+            if (ObjectUtil.isNotEmpty(ticketWares) && ObjectUtil.isNotEmpty(ticketWares.getTicketId())){
+                ticketsService.refreshUpdateTime(ticketWares.getTicketId());
+            }
+        }
    }

    /**
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java
@ -262,4 +262,13 @@ public interface DlRepairTicketsService extends IService<DlRepairTickets> {
     * @param id id
     **/
    CustomerAndCarVO getCusAndCarById(String id);
+
+    /**
+     * 用于刷新工单的更新时间
+     *
+     * @author 小李
+     * @date 10:31 2024/11/27
+     * @param id 工单ID
+    **/
+    void refreshUpdateTime(String id);
 }
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
@ -443,6 +443,10 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
        List<DictDataRespDTO> recordTypeList = dictDataApi.getDictDataList(DICT_REPAIR_RECORDS_TYPE);
        Map<String, String> typeMap = recordTypeList.stream().collect(Collectors.toMap(DictDataRespDTO::getValue, DictDataRespDTO::getLabel));
        result.setRecords(records.stream().peek(item -> item.setType(typeMap.get(item.getType()))).collect(Collectors.toList()));
+
+        // 更新主表时间
+        refreshUpdateTime(id);
+
        return result;
    }

@ -506,6 +510,9 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
        repairOrderInfoService.updateById(repairOrderInfo);
        // 记录日志
        repairRecordsService.saveRepairRecord(one.getGoodsId(), null, RecordTypeEnum.JS.getCode(), "线下支付结算", null);
+
+        // 更新工单主表时间
+        refreshUpdateTime(repairTicketsRespVO.getId());
    }

    /**
@ -603,6 +610,10 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
    @Override
    @DSTransactional
    public void print(HttpServletResponse response, String id) {
+
+        // 更新工单时间
+        refreshUpdateTime(id);
+
        // 开始之前先计算一次工单
        boolean flag = computeTicket(id);
        if (!flag) {
@ -1027,6 +1038,9 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
        DictDataRespDTO dictDataRespDTO = dataList.stream().filter(item -> item.getValue().equals(worker.getWorkType())).findFirst().orElse(null);
        String message = String.format("您的爱车%s已由%s %s接单了", tickets.getCarNo(), (dictDataRespDTO != null ? dictDataRespDTO.getLabel() : "维修工"), worker.getUserName());
        repairWorkerService.sentMessageToCus(id, message, false);
+
+        // 更新工单主表时间
+        refreshUpdateTime(id);
    }

    /**
@ -1071,6 +1085,9 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
            //最后记录操作日志--指派施工
            repairRecordsService.saveRepairRecord(reqVO.getId(), null, code, remark, null);
        }
+
+        // 更新工单主表时间
+        refreshUpdateTime(reqVO.getId());
    }

    /**
@ -1231,6 +1248,9 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
            );
            repairWorkerService.sentMessageToCus(tickets.getId(), newMessage, false);
        }
+
+        // 更新工单主表时间
+        refreshUpdateTime(respVO.getId());
    }

    private String createMessage(String who, String no, String projectName, String type, String finishType, String nextName) {
@ -1281,6 +1301,8 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
        dlRepairTickets.setId(id);
        dlRepairTickets.setPartShow(show);
        baseMapper.updateById(dlRepairTickets);
+
+        refreshUpdateTime(id);
    }

    /**
@ -1354,6 +1376,9 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
        DictDataRespDTO repairType = dictDataApi.getDictData("repair_type", tickets.getRepairType());
        String message = String.format("您的爱车%s已%s完成", tickets.getCarNo(), (repairType != null ? repairType.getLabel() : "维修保养"));
        repairWorkerService.sentMessageToCus(tickets.getId(), message, true);
+
+        // 更新工单主表状态
+        refreshUpdateTime(respVO.getId());
    }

    /**
@ -1445,6 +1470,9 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe

        // 记录日志
        repairRecordsService.saveRepairRecord(respVO.getId(), null, RecordTypeEnum.JSGD.getCode(), respVO.getRemark(), respVO.getImage());
+
+        // 更新工单时间
+        refreshUpdateTime(respVO.getId());
    }

    /**
@ -1554,6 +1582,9 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
        String recordStr = noticeCusVO.getName()
                + "通知客户取车:" + message;
        repairRecordsService.saveRepairRecord(noticeCusVO.getId(), null, RecordTypeEnum.TZQC.getCode(), recordStr, null);
+
+        // 更新工单主表时间
+        refreshUpdateTime(noticeCusVO.getId());
    }

    /**
@ -1662,6 +1693,9 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
        repairOrderInfoService.updateById(orderInfo);
        Long time2 = System.currentTimeMillis();
        System.out.println("时间差："+(time2-time1));
+
+        // 更新主表时间
+        refreshUpdateTime(ticketId);
        return true;
    }

@ -1839,6 +1873,8 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe

        // 记录日志
        repairRecordsService.saveRepairRecord(respVO.getId(), null, RecordTypeEnum.JC.getCode(), respVO.getRemark(), respVO.getImage());
+
+        refreshUpdateTime(respVO.getId());
    }

    /**
@ -1862,6 +1898,23 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
        customerAndCarVO.setCarInfo(BeanUtil.toBean(carMain, CarMainReqVO.class));
        return customerAndCarVO;
    }
+
+    /**
+     * 用于刷新工单的更新时间
+     *
+     * @author 小李
+     * @date 10:31 2024/11/27
+     * @param id 工单ID
+     **/
+    @Override
+    public void refreshUpdateTime(String id){
+        if (ObjectUtil.isNotEmpty(id)){
+            baseMapper.update(new LambdaUpdateWrapper<DlRepairTickets>()
+                    .set(DlRepairTickets::getUpdateTime, LocalDateTime.now())
+                    .eq(DlRepairTickets::getId, id)
+            );
+        }
+    }
 }


--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTitemServiceImpl.java
@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.tickets.service.impl;

+import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.module.tickets.entity.DlRepairTitem;
 import cn.iocoder.yudao.module.tickets.mapper.DlRepairTitemMapper;
 import cn.iocoder.yudao.module.tickets.service.DlRepairTicketsService;
@ -56,7 +57,7 @@ public class DlRepairTitemServiceImpl extends ServiceImpl<DlRepairTitemMapper, D
     **/
    @Override
    public List<DlRepairTitem> getProjectList(String ticketId){
-        return baseMapper.selectList(new LambdaQueryWrapper<DlRepairTitem>().and(item -> {
+            return baseMapper.selectList(new LambdaQueryWrapper<DlRepairTitem>().and(item -> {
            item.eq(DlRepairTitem::getItemType, "01")
                    .eq(DlRepairTitem::getTicketId, ticketId);
        }));
@ -70,6 +71,10 @@ public class DlRepairTitemServiceImpl extends ServiceImpl<DlRepairTitemMapper, D
     */
    @Override
    public DlRepairTitem updateRepairAndSale(DlRepairTitem dlRepairTitem) {
+        // 刷新主表时间
+        if (ObjectUtil.isNotEmpty(dlRepairTitem.getTicketId())){
+            repairTicketsService.refreshUpdateTime(dlRepairTitem.getTicketId());
+        }
        baseMapper.updateRepairAndSale(dlRepairTitem);
        return dlRepairTitem;
    }
@ -156,6 +161,8 @@ public class DlRepairTitemServiceImpl extends ServiceImpl<DlRepairTitemMapper, D
     **/
    @Override
    public List<DlRepairTitemRespVO> getProjList(String ticketId,String isOpen) {
+        // 更新工单主表时间
+        repairTicketsService.refreshUpdateTime(ticketId);
        return dlRepairTitemMapper.selectProjList(ticketId,isOpen);
    }
 }
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlTicketWaresServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlTicketWaresServiceImpl.java
@ -243,6 +243,11 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
        if (CollectionUtil.isNotEmpty(ids)) {
            ids.forEach(id -> repairWorkerService.sentMessage(id, "您有新的配件申请单需要审核"));
        }
+
+        // 更新工单主表时间
+        if (ObjectUtil.isNotEmpty(respVO.getTicketId())){
+            repairTicketsService.refreshUpdateTime(respVO.getTicketId());
+        }
    }

    /**
@ -255,6 +260,11 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
    @Override
    @DSTransactional
    public void removeTicketWares(String id) {
+        // 更新工单主表时间
+        DlTicketWares ticketWares = baseMapper.selectById(id);
+        if (ObjectUtil.isNotEmpty(ticketWares) && ObjectUtil.isNotEmpty(ticketWares.getTicketId())){
+            repairTicketsService.refreshUpdateTime(ticketWares.getTicketId());
+        }
        // 删除主表
        baseMapper.deleteById(id);
        // 删除子表
@ -505,6 +515,11 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
        // 通知维修工
        // 查维修工的userId
        repairWorkerService.sentMessage(respVO.getRepairId(), type.equals("02") ? "您有新的领料单需要确认" : "您有新的退料单需要确认");
+
+        // 刷新工单主表时间
+        if (ObjectUtil.isNotEmpty(respVO.getTicketId())){
+            repairTicketsService.refreshUpdateTime(respVO.getTicketId());
+        }
    }

    /**
@ -569,6 +584,10 @@ public class DlTicketWaresServiceImpl extends ServiceImpl<DlTicketWaresMapper, D
            twItemService.saveBatch(list);
        }

+        // 更新工单主表时间
+        if (ObjectUtil.isNotEmpty(respVO.getTicketId())){
+            repairTicketsService.refreshUpdateTime(respVO.getTicketId());
+        }
    }

    /**