diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMeetCarOrderController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMeetCarOrderController.java index 9e947607..ad8c9c91 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMeetCarOrderController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMeetCarOrderController.java @@ -33,7 +33,12 @@ public class InspectionMeetCarOrderController { } @GetMapping("/get") - public CommonResult get(Long id){ + public CommonResult get(Long id) { return CommonResult.success(inspectionMeetCarOrderService.getById(id)); } + + @DeleteMapping("/delete") + public CommonResult delete(Long id) { + return CommonResult.success(inspectionMeetCarOrderService.removeById(id)); + } } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionInfo.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionInfo.java index 682d641d..aaffd307 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionInfo.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionInfo.java @@ -34,6 +34,8 @@ public class InspectionInfo extends TenantBaseDO private String buyPhone; private String userAddress; private String unitName; + private Integer customerSourceId; //客户来源id + private Integer businessChannelId; //业务渠道id private Long partnerId; /** 检测工主键 */ @@ -69,6 +71,7 @@ public class InspectionInfo extends TenantBaseDO private Integer recheckCount; /** 重检次数 */ private Integer reinspectCount; + private String businessChannel; //业务渠道 private String otherName; /** 0进行中1已结束 */ diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionMeetCarOrder.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionMeetCarOrder.java index 16369543..7f220e52 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionMeetCarOrder.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionMeetCarOrder.java @@ -67,6 +67,9 @@ public class InspectionMeetCarOrder extends TenantBaseDO { private String skuName; private String otherPhone; private String otherName; + private String businessChannel; //业务渠道 + private Integer customerSourceId; //客户来源id + private Integer businessChannelId; //业务渠道id /** * 接车类型 0接待 1上门取车 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java index d4832e2f..3416c7fa 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java @@ -1548,6 +1548,43 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpllambdaQuery().eq(InspectionStepInfo::getInspectionInfoId, info.getId()).orderByDesc(InspectionStepInfo::getCreateTime).last("LIMIT 1")); + betweenMs = DateUtil.betweenMs(info.getStartTime(), one.getUpdateTime()); + } + // 转换为小时和分钟 + long minutes = betweenMs / (1000 * 60); + long hours = minutes / 60; + long remainMinutes = minutes % 60; + res.setInspectionDuration(hours + "小时" + remainMinutes + "分"); + } + //根据车辆注册日期计算车龄 + if (ObjectUtil.isNotNull(info.getCarRegisterDate())) { + res.setCarAge(DateUtil.betweenYear(info.getCarRegisterDate(), new Date(), true)); + } /*根据工单表中的leadManId查询对应的引车员*/ if (ObjectUtil.isNotNull(info.getLeadManId())) { AdminUserDO leadMan = adminUserService.getById(info.getLeadManId()); diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java index b032d6d9..8876d21c 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionWorkNodeServiceImpl.java @@ -221,9 +221,9 @@ public class InspectionWorkNodeServiceImpl extends ServiceImpl() .eq(DlInspectionProject::getId, workNode.getProjectId())); - // 判断检测项目是否包含制证 + // 判断检测项目是否包含制证 并且是合格 if (ObjectUtil.isNotEmpty(project)) { - if (project.getProjectName().contains("制证")) { + if (project.getProjectName().contains("制证") && "1".equals(inspectionWorkNode.getType())) { flag = false; } } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/vo/InspectionInfoVo.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/vo/InspectionInfoVo.java index a69b4fdb..cfbbe7bb 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/vo/InspectionInfoVo.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/vo/InspectionInfoVo.java @@ -68,6 +68,15 @@ public class InspectionInfoVo { private Date validationTime; // 核销人 private String validationRealName; + private String businessChannel; //业务渠道 + //客户来源 + private String customerSource; + //车辆品牌型号 + private String carModel; + //检测时长 + private String inspectionDuration; + //车龄 + private Long carAge; //优惠金额 private Long couponDiscount = 0L; //实付金额 分 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/vo/OrderTable.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/vo/OrderTable.java index 3915753d..5528257b 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/vo/OrderTable.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/vo/OrderTable.java @@ -41,6 +41,9 @@ public class OrderTable { /** 客户来源 */ private String customerSource; + /** 业务渠道 */ + private String businessChannel; + /** 车辆型号 */ private String carModel; diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml index 39b04ebf..e74689bc 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml @@ -630,6 +630,7 @@ FROM t.customerSource, t.carModel, t.inspectionCount, + t.businessChannel, CASE WHEN t.status = '已完成' AND t.is_pass = 0 THEN '不合格' WHEN t.status = '已完成' AND t.is_pass = 1 THEN '合格' @@ -645,6 +646,7 @@ FROM oi.pay_time AS payTime, -- 新增字段 oi.create_time AS createTime, ii.customer_source AS customerSource, + ii.business_channel AS businessChannel, ii.car_model AS carModel, IFNULL(ii.recheck_count, 0) + IFNULL(ii.reinspect_count, 0) + 1 AS inspectionCount, CASE