From 330dad2bcb7a4fb2a43c0e486653e1e5b404301e Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Mon, 28 Oct 2024 10:40:30 +0800
Subject: [PATCH 1/5] =?UTF-8?q?try=20catch=20=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/InspectionInfoServiceImpl.java       |  6 ++-
 .../impl/RescueDriverInfoServiceImpl.java     | 44 ++++++++++---------
 2 files changed, 29 insertions(+), 21 deletions(-)

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 2e68139d..6f7c0163 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
@@ -205,8 +205,12 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
             CustomerMain customerMain = new CustomerMain();
             customerMain.setDataFrom("01");
             customerMainService.saveOrUpdate(customerMain);
+            try {
+                customerInfoService.insertPartnerCustomerInfo(customerInfo);
+            }catch (Exception ignored){
+
+            }
 
-            customerInfoService.insertPartnerCustomerInfo(customerInfo);
         }
         //追加订单明细记录
         orderInfoDetailService.save(new OrderInfoDetail(orderInfo.getId(),"线下订单创建",new Date(),0L,"1"));
diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverInfoServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverInfoServiceImpl.java
index 372f0a7a..fa7dcb22 100644
--- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverInfoServiceImpl.java
+++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverInfoServiceImpl.java
@@ -590,31 +590,35 @@ public class RescueDriverInfoServiceImpl extends ServiceImpl<RescueDriverInfoMap
         //处理redis
         DriverInfo driverInfo = driverInfoService.getById(rescueInfo.getDriverId());
         AdminUserRespDTO user = userService.getUser(driverInfo.getUserId());
+        try{
+            // 收集客户信息
+            PartnerCustomerInfo customerInfo = new PartnerCustomerInfo();
+            customerInfo.setCustomerName(rescueInfo.getConnectionName());
+            customerInfo.setCustomerPhone(rescueInfo.getConnectionPhone());
+            customerInfo.setUserId(rescueInfo.getUserId());
 
-        // 收集客户信息
-        PartnerCustomerInfo customerInfo = new PartnerCustomerInfo();
-        customerInfo.setCustomerName(rescueInfo.getConnectionName());
-        customerInfo.setCustomerPhone(rescueInfo.getConnectionPhone());
-        customerInfo.setUserId(rescueInfo.getUserId());
+            // 收集客户车辆信息
+            List<ShopUserCar> userCarList = new ArrayList<>();
+            ShopUserCar userCar = new ShopUserCar();
+            userCar.setCarNo(rescueInfo.getLicenseNum());
+            userCar.setCarModel(rescueInfo.getCarType());
+            userCar.setCarBrand(rescueInfo.getCarBrand());
+            userCar.setUserId(user.getId());
+            userCarList.add(userCar);
 
-        // 收集客户车辆信息
-        List<ShopUserCar> userCarList = new ArrayList<>();
-        ShopUserCar userCar = new ShopUserCar();
-        userCar.setCarNo(rescueInfo.getLicenseNum());
-        userCar.setCarModel(rescueInfo.getCarType());
-        userCar.setCarBrand(rescueInfo.getCarBrand());
-        userCar.setUserId(user.getId());
-        userCarList.add(userCar);
+            customerInfo.setUserCarList(userCarList);
 
-        customerInfo.setUserCarList(userCarList);
+            // 设置客户来源
+            CustomerMain customerMain = new CustomerMain();
+            customerMain.setDataFrom("02");
+            customerMainService.saveOrUpdate(customerMain);
 
-        // 设置客户来源
-        CustomerMain customerMain = new CustomerMain();
-        customerMain.setDataFrom("02");
-        customerMainService.saveOrUpdate(customerMain);
+            // 调用插入客户信息的方法
+            customerInfoService.insertPartnerCustomerInfo(customerInfo);
+        }catch (Exception ignored){
+
+        }
 
-        // 调用插入客户信息的方法
-        customerInfoService.insertPartnerCustomerInfo(customerInfo);
 
 
         //所在顶级机构

From e7bd033a7804fee7785a2bf40641c3923ed851ac Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Mon, 28 Oct 2024 11:30:45 +0800
Subject: [PATCH 2/5] =?UTF-8?q?try=20catch=20=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspection/service/impl/InspectionInfoServiceImpl.java      | 1 -
 .../partner/service/impl/PartnerCustomerInfoServiceImpl.java    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

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 6f7c0163..b03566c8 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
@@ -200,7 +200,6 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
             customerInfo.setCustomerName(user.getNickname());
             customerInfo.setSex("0");
             customerInfo.setUserAge(user.getUserAge());
-
             // 设置客户来源
             CustomerMain customerMain = new CustomerMain();
             customerMain.setDataFrom("01");
diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/service/impl/PartnerCustomerInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/service/impl/PartnerCustomerInfoServiceImpl.java
index 11155c96..09520af2 100644
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/service/impl/PartnerCustomerInfoServiceImpl.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/service/impl/PartnerCustomerInfoServiceImpl.java
@@ -126,7 +126,7 @@ public class PartnerCustomerInfoServiceImpl extends ServiceImpl<PartnerCustomerI
      * @return 结果
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
+
     public int insertPartnerCustomerInfo(PartnerCustomerInfo partnerCustomerInfo) throws Exception {
         // 获取当前商户信息
         ShopMallPartners partners = partnerService.shopInfo();

From 814ad0fde457ac171b35fd4804419501f8628b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Mon, 28 Oct 2024 11:38:00 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2sql=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/stockOperate/DlRepairSoMapper.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoMapper.xml b/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoMapper.xml
index 06abc89b..3f1476ad 100644
--- a/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoMapper.xml
+++ b/dl-module-repair/src/main/resources/mapper/stockOperate/DlRepairSoMapper.xml
@@ -43,6 +43,7 @@
                so.so_status,
                so.remark,
                so.corp_id,
+               so.main_id,
                so.corp_name,
                so.dept_id,
                so.create_time,
@@ -67,7 +68,7 @@
             and so.so_status = #{map.soStatus}
         </if>
         <if test="map.soStatus == null">
-            and so.so_status != '06'
+            and (so.so_status != '06' or so.so_status is null)
         </if>
         <if test="map.searchTimeArray != null and map.searchTimeArray.length > 0">
             and (so.create_time between #{map.searchTimeArray[0]} and #{map.searchTimeArray[1]})
@@ -84,6 +85,9 @@
         <if test="map.userId != null and map.userId != ''">
             and (so.user_id = #{map.userId})
         </if>
+        <if test="map.mainId != null and map.mainId != ''">
+            and so.main_id = #{map.mainId}
+        </if>
         order by so.create_time desc
     </select>
     <select id="selectCountNum" resultType="java.lang.Integer">

From cac8ac030fdd9764a254fa3b9948f103b3cb0400 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Mon, 28 Oct 2024 16:46:15 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=97=B6=E4=B8=8A=E4=BC=A0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=AD=BE=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/module/custom/vo/CustomerMainPageReqVO.java       | 2 ++
 .../src/main/resources/mapper/custom/CustomerMainMapper.xml | 6 ++++++
 .../tickets/service/impl/DlRepairTicketsServiceImpl.java    | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainPageReqVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainPageReqVO.java
index 2f61d4be..291f06d0 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainPageReqVO.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainPageReqVO.java
@@ -13,5 +13,7 @@ import lombok.ToString;
 public class CustomerMainPageReqVO extends CustomerMain {
     /**系统标识*/
     private String systemCode;
+    /** 工单查询时条件*/
+    private String phoneOrCar;
 
 }
\ No newline at end of file
diff --git a/dl-module-base/src/main/resources/mapper/custom/CustomerMainMapper.xml b/dl-module-base/src/main/resources/mapper/custom/CustomerMainMapper.xml
index 80311869..91712365 100644
--- a/dl-module-base/src/main/resources/mapper/custom/CustomerMainMapper.xml
+++ b/dl-module-base/src/main/resources/mapper/custom/CustomerMainMapper.xml
@@ -43,6 +43,7 @@
         base_customer_main main
         LEFT JOIN base_customer_item item ON main.id = item.cus_id AND item.deleted = 0
         LEFT JOIN dl_member_level memberLevel ON main.member_level_id = memberLevel.id
+        LEFT JOIN base_car_main car ON main.user_id = car.user_id
         <where>
             main.deleted = 0
             <if test="entity.cusName != null and entity.cusName != ''">
@@ -57,6 +58,11 @@
             <if test="entity.phoneNumber != null and entity.phoneNumber != ''">
                 AND main.phone_number LIKE concat('%',#{entity.phoneNumber},'%')
             </if>
+            <if test="entity.phoneOrCar != null and entity.phoneOrCar != ''">
+                AND main.phone_number = #{entity.phoneOrCar}
+                OR car.license_number = #{entity.phoneOrCar}
+                OR car.vin = #{entity.phoneOrCar}
+            </if>
         </where>
         GROUP BY main.id
         ORDER BY main.create_time DESC
diff --git 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
index fc7a20c9..ea7da9ae 100644
--- 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
@@ -271,7 +271,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
         }
         repairOrderInfoService.saveOrderInfo(repairOrderInfo);
         //最后记录操作日志--创建工单
-        repairRecordsService.saveRepairRecord(ticketsRespVO.getId(), null, RecordTypeEnum.CJGD.getCode(), "创建工单", null);
+        repairRecordsService.saveRepairRecord(ticketsRespVO.getId(), null, RecordTypeEnum.CJGD.getCode(), "创建工单", ticketsRespVO.getImage());
         return ticketsRespVO;
     }
 

From 56255899769c071dfb2152e46fd37e209d5d57c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Mon, 28 Oct 2024 18:03:32 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=85=8D=E4=BB=B6=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BB=93=E7=AE=A1=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B=E5=BE=85?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/iocoder/yudao/module/tickets/vo/DlTicketWaresReqVO.java | 3 +++
 .../src/main/resources/mapper/tickets/DlTicketWaresMapper.xml  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlTicketWaresReqVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlTicketWaresReqVO.java
index 01657475..70fb6a45 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlTicketWaresReqVO.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/vo/DlTicketWaresReqVO.java
@@ -25,4 +25,7 @@ public class DlTicketWaresReqVO extends DlTicketWares {
 
     /** 查看可以退料的数据时为tru */
     private Boolean isBack;
+
+    /** 查看待审核的数据时为true */
+    private Boolean isToBeReviewed;
 }
diff --git a/dl-module-repair/src/main/resources/mapper/tickets/DlTicketWaresMapper.xml b/dl-module-repair/src/main/resources/mapper/tickets/DlTicketWaresMapper.xml
index 9dcf92d0..3269b989 100644
--- a/dl-module-repair/src/main/resources/mapper/tickets/DlTicketWaresMapper.xml
+++ b/dl-module-repair/src/main/resources/mapper/tickets/DlTicketWaresMapper.xml
@@ -63,6 +63,9 @@
         <if test="map.userRole != null">
             and (
                 <choose>
+                    <when test="map.userRole == 5 and map.isToBeReviewed">
+                        dtw.status = '01'
+                    </when>
                     <when test="map.userRole == 5 and map.isBack == null">
                         dtw.status not in ('01', '05', '03')
                     </when>