From d81fa731c5b055e8ca936ba0d78aae433c440988 Mon Sep 17 00:00:00 2001
From: xyc <3422692813@qq.com>
Date: Tue, 20 May 2025 14:19:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspection/controller/InspectionFileController.java      | 4 ++++
 .../yudao/module/inspection/entity/InspectionInfo.java       | 1 +
 .../inspection/service/impl/InspectionInfoServiceImpl.java   | 5 -----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionFileController.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionFileController.java
index 70c5f627..f5836d18 100644
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionFileController.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionFileController.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.inspection.controller;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
@@ -69,6 +70,9 @@ public class InspectionFileController extends BaseController {
      */
     @GetMapping("/listByPermission")
     public CommonResult listByPermission(InspectionFile inspectionFile) throws Exception {
+        if (ObjectUtil.isEmpty(inspectionFile.getServicePackageId())){
+            inspectionFile.setServicePackageId("jiance");
+        }
         //判断当前登陆人的角色是否是可以查看文件
         boolean ifFile = permissionApi.hasDictTypeRole(inspectionFile.getDictType());
         if (ifFile) {
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 6b86b13d..39a0cfa7 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
@@ -151,6 +151,7 @@ public class InspectionInfo extends TenantBaseDO
     //2024-03-27新增字段
     //其他联系人手机号
     private String otherPhone;
+//    private String otherName;
     private String driverLicenesImg;
     //是否线上支付0否1是
     private String isPayOnline;
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 c53bb339..ff7d076d 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
@@ -207,11 +207,6 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
             InspectionAppointment appointment1 = inspectionAppointmentService.getById(inspectionInfo.getAppointmentId());
             if (ObjectUtil.isNotEmpty(appointment1.getOrderId())) {
                 // 需要核销订单表
-                //修改订单的核销时间
-//                orderInfoService.update(Wrappers.<OrderInfo>lambdaUpdate()
-//                        .eq(OrderInfo::getId, appointment1.getOrderId())
-//                        .set(OrderInfo::getValidationTime, new Date()));
-
                 // 查询订单
                 orderInfo = orderInfoService.getById(appointment1.getOrderId());
             } else {