diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java index b10a6b04..f8088267 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java @@ -370,4 +370,14 @@ public class InspectionInfoController extends BaseController { public CommonResult getCountByType(@RequestParam("partnerId")Integer partnerId){ return success(inspectionInfoService.getCountByType(partnerId)); } + + /** + * 接车拍照 + * @param inspectionWorkNode + * @return + */ + @PostMapping("/meetCarPhoto") + public CommonResult meetCarPhoto(@RequestBody InspectionWorkNode inspectionWorkNode){ + return success(inspectionInfoService.meetCarPhoto(inspectionWorkNode)); + } } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java index 7d28acc1..ae927a45 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java @@ -489,9 +489,12 @@ public class PartnerOwnController extends BaseController { * * @return */ - @GetMapping("/ifAppointment") - public CommonResult ifAppointment() { - return success(permissionApi.hasDictTypeRole("ins_appointment_role")); + @GetMapping("/ifHasRole") + public CommonResult ifHasRole(String dictType) { + if (ObjectUtil.isEmpty(dictType)) { + return success(false); + } + return success(permissionApi.hasDictTypeRole(dictType)); } //获取上门取车数据 diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionAppointment.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionAppointment.java index bb6c949a..bdb64535 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionAppointment.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionAppointment.java @@ -8,6 +8,8 @@ import cn.iocoder.yudao.annotation.Excel; import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; import lombok.Data; +import java.util.Date; + /** * 【请填写功能名称】对象 inspection_appointment * @@ -70,6 +72,9 @@ public class InspectionAppointment extends TenantBaseDO private String carIdNo; private Long pickCarId; private String isRead; + // 车辆注册时间 + private Date carRegisterDate; + private String address; @TableField(exist = false) private String skuName; } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java index 4b5e841b..28849d25 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionInfoService.java @@ -147,4 +147,10 @@ public interface IInspectionInfoService extends IService * @date 16:22 2024/12/18 **/ Map getCountByType(Integer partnerId); + + /** + * 接车拍照 + * @param inspectionWorkNode + */ + Boolean meetCarPhoto(InspectionWorkNode inspectionWorkNode); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java index bc98d7b4..a831e13d 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java @@ -254,7 +254,7 @@ public class InspectionInfoServiceImpl extends ServiceImpl 0) { + if (ObjectUtil.isNotEmpty(inspectionInfo.getLeadManId())) { + inspectionSocket.sendMessage("接工单", inspectionInfo.getLeadManId().toString()); + } + if (ObjectUtil.isNotEmpty(inspectionInfo.getMeetManId())) { + inspectionSocket.sendMessage("接工单", inspectionInfo.getMeetManId().toString()); + } + } + return i; } /** @@ -787,4 +799,35 @@ public class InspectionInfoServiceImpl extends ServiceImpllambdaUpdate() + .eq(InspectionInfo::getId, inspectionWorkNode.getInspectionInfoId()) + .set(InspectionInfo::getIsMeetCar, "1")); + return true; + } + }