更新

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java

@@ -419,10 +419,10 @@ public class PartnerOwnController extends BaseController {
     //获取检测的数据
     @GetMapping("/inspectionList")
     public CommonResult inspectionList(Long partnerId, String status, String carNum, Integer pageSize, Integer pageNum) throws Exception {
-        ShopMallPartners partners = partnerList.shopInfo();
+//        ShopMallPartners partners = partnerList.shopInfo();
-        if (!partnerId.equals(partners.getPartnerId())) {
+//        if (!partnerId.equals(partners.getPartnerId())) {
-            return null;
+//            return null;
-        }
+//        }
         Page<InspectionInfo> page = new Page<>(pageNum, pageSize);
         IPage<InspectionInfo> inspectionInfos = partnerList.inspectionList(page, partnerId, status, carNum);
         return success(inspectionInfos);
@@ -819,7 +819,7 @@ public class PartnerOwnController extends BaseController {
      * @date 14:52 2024/12/10
      **/
     @GetMapping("/getProjectBelowStandardByIds")
-    public CommonResult<?> getProjectBelowStandardByIds(@RequestParam(value = "ids") Long[] ids,@RequestParam(value = "status") String status,@RequestParam(value = "type") String type) {
+    public CommonResult<?> getProjectBelowStandardByIds(@RequestParam(value = "ids") Long[] ids,@RequestParam(value = "status",required = false) String status,@RequestParam(value = "type",required = false) String type) {
         return success(partnerList.getProjectBelowStandardByIds(ids,status,type));
     }
 

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/OrderInfoServiceImpl.java

@@ -914,7 +914,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         head.add(Collections.singletonList("使用性质"));
         head.add(Collections.singletonList("来源"));
         head.add(Collections.singletonList("代办人电话"));
-        head.add(Collections.singletonList("商品名称"));
+        head.add(Collections.singletonList("检测类型"));
+        head.add(Collections.singletonList("检测项目"));
         head.add(Collections.singletonList("新旧车"));
         // 动态列（检测项目）
         for (DlInspectionProject project : projectList) {
@@ -948,6 +949,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             row.add(item.getCustomerName());
             row.add(item.getWorkerPhone());
             row.add(item.getGoodsTitle());
+            row.add(item.getSkuName());
             row.add(item.getCarStatus());
             // 动态列数据
             //获取所有orderId = item.orderId的数据

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/vo/OrderInfoExportVo.java

@@ -37,6 +37,7 @@ public class OrderInfoExportVo {
     private String payType;
     private Long payMoneyStr;
     private Long orderId;
+    private String skuName;
 
     // 动态列数据
     private Map<String, Object> dynamicColumns = new HashMap<>();

dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml

@@ -228,9 +228,20 @@ where sig.partner_id =#{partnerId}
     from
     inspection_info info
     LEFT JOIN inspection_step_info step ON info.id = step.inspection_info_id
+    LEFT JOIN
+    inspection_work_node iwn ON info.id = iwn.inspection_info_id
     INNER JOIN system_users su on su.id = info.user_id
     INNER JOIN order_info oi on oi.id = info.inspection_order_id
-    WHERE  info.status = #{status} and info.partner_id = #{partnerId}
+    WHERE   info.partner_id = #{partnerId}
+    <!-- 待复检 -->
+    <if test="status == 4">
+        -- AND ii.status = '2'
+        AND iwn.status = '3'
+        AND info.status != '1'
+    </if>
+    <if test="status != 4">
+       AND info.status = #{status}
+    </if>
     <if test="carNum!=null and carNum!=''">
         and info.car_num like concat('%',#{carNum},'%')
     </if>

dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml

@@ -391,6 +391,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             0 AS source_type
             FROM inspection_info ii
             WHERE ii.deleted = 0 AND ii.meet_man_id = #{inspectionInfo.dealUserId}  AND ii.is_meet_car = '0'
+            <!-- 车牌号模糊查询 -->
+            <if test="inspectionInfo.carNum != null">
+                AND ii.car_num LIKE CONCAT('%', #{inspectionInfo.carNum}, '%')
+            </if>
 
             UNION ALL
 
@@ -409,14 +413,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             imco.create_time,
             1 AS source_type
             FROM inspection_meet_car_order imco
-            WHERE imco.deleted = 0 AND imco.meet_man_id = #{inspectionInfo.dealUserId} AND imco.is_meet = '0' ;
+            WHERE imco.deleted = 0 AND imco.meet_man_id = #{inspectionInfo.dealUserId} AND imco.is_meet = '0'
+            <!-- 车牌号模糊查询 -->
+            <if test="inspectionInfo.carNum != null">
+                AND imco.car_num LIKE CONCAT('%', #{inspectionInfo.carNum}, '%')
+            </if>
 
         </if>
         <!-- 接车订单转工单 -->
         <if test="inspectionInfo.status == 8">
             SELECT imco.*
             FROM inspection_meet_car_order imco
-            WHERE imco.deleted = 0 AND imco.inspection_info_id IS NULL AND imco.is_meet = '1';
+            WHERE imco.deleted = 0 AND imco.inspection_info_id IS NULL AND imco.is_meet = '1'
+            <!-- 车牌号模糊查询 -->
+            <if test="inspectionInfo.carNum != null">
+                AND imco.car_num LIKE CONCAT('%', #{inspectionInfo.carNum}, '%')
+            </if>
         </if>
         <!-- 之前的查询，修改为了一个工单只出现一条，不分项目 -->
         <!--    SELECT-->
@@ -542,6 +554,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             WHERE ii.deleted = 0
             AND ii.meet_man_id = #{inspectionInfo.dealUserId}
             AND ii.is_meet_car = '0'
+            <!-- 车牌号模糊查询 -->
+            <if test="inspectionInfo.carNum != null">
+                AND ii.car_num LIKE CONCAT('%', #{inspectionInfo.carNum}, '%')
+            </if>
 
             UNION ALL
 
@@ -550,13 +566,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             WHERE imco.deleted = 0
             AND imco.meet_man_id = #{inspectionInfo.dealUserId}
             AND imco.is_meet = '0'
+            <!-- 车牌号模糊查询 -->
+            <if test="inspectionInfo.carNum != null">
+                AND imco.car_num LIKE CONCAT('%', #{inspectionInfo.carNum}, '%')
+            </if>
             ) AS combined_results
         </if>
         <!-- 接车订单转工单 -->
         <if test="inspectionInfo.status == 8">
             SELECT COUNT(*)
             FROM inspection_meet_car_order imco
-            WHERE imco.deleted = 0 AND imco.inspection_info_id IS NULL AND imco.is_meet = '1';
+            WHERE imco.deleted = 0 AND imco.inspection_info_id IS NULL AND imco.is_meet = '1'
+            <!-- 车牌号模糊查询 -->
+            <if test="inspectionInfo.carNum != null">
+                AND imco.car_num LIKE CONCAT('%', #{inspectionInfo.carNum}, '%')
+            </if>
         </if>
     </select>
 </mapper>

dl-module-inspection/src/main/resources/mapper/payment/OrderInfoMapper.xml

@@ -241,7 +241,7 @@
         SELECT
         oi.id,
         oi.order_no,
-        oi.goods_title,
+        oi.sku_name,
         oi.goods_title,
         oi.goods_type,
         su.nickname AS realName,

dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/DriverInfoServiceImpl.java

@@ -93,7 +93,12 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, DriverI
      */
     @Override
     public int updateDriverInfo(DriverInfo driverInfo) {
-        return baseMapper.updateDriverInfo(driverInfo);
+        // 修改users表
+        AdminUserRespDTO user = adminUserApi.getUser(driverInfo.getUserId());
+        user.setSex(Integer.valueOf(driverInfo.getSex()));
+        user.setMobile(driverInfo.getPhonenumber());
+        adminUserApi.updateUser(user);
+        return baseMapper.updateById(driverInfo);
     }
 
     /**