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 fd285c66..9dfdfa25 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 @@ -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(); - if (!partnerId.equals(partners.getPartnerId())) { - return null; - } +// ShopMallPartners partners = partnerList.shopInfo(); +// if (!partnerId.equals(partners.getPartnerId())) { +// return null; +// } Page page = new Page<>(pageNum, pageSize); IPage 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)); } diff --git a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/OrderInfoServiceImpl.java b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/OrderInfoServiceImpl.java index eb70cc14..13409e73 100644 --- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/OrderInfoServiceImpl.java +++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/OrderInfoServiceImpl.java @@ -914,7 +914,8 @@ public class OrderInfoServiceImpl extends ServiceImpl dynamicColumns = new HashMap<>(); 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 444dbcdc..27c0aba3 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml +++ b/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} + + + -- AND ii.status = '2' + AND iwn.status = '3' + AND info.status != '1' + + + AND info.status = #{status} + and info.car_num like concat('%',#{carNum},'%') diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml index c8dd6e38..ae2b473a 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml +++ b/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' + + + AND ii.car_num LIKE CONCAT('%', #{inspectionInfo.carNum}, '%') + 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' + + + AND imco.car_num LIKE CONCAT('%', #{inspectionInfo.carNum}, '%') + 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' + + + AND imco.car_num LIKE CONCAT('%', #{inspectionInfo.carNum}, '%') + @@ -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' + + + AND ii.car_num LIKE CONCAT('%', #{inspectionInfo.carNum}, '%') + 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' + + + AND imco.car_num LIKE CONCAT('%', #{inspectionInfo.carNum}, '%') + ) AS combined_results 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' + + + AND imco.car_num LIKE CONCAT('%', #{inspectionInfo.carNum}, '%') + diff --git a/dl-module-inspection/src/main/resources/mapper/payment/OrderInfoMapper.xml b/dl-module-inspection/src/main/resources/mapper/payment/OrderInfoMapper.xml index f29a921c..dce67178 100644 --- a/dl-module-inspection/src/main/resources/mapper/payment/OrderInfoMapper.xml +++ b/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, diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/DriverInfoServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/DriverInfoServiceImpl.java index a389b931..1bb81820 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/DriverInfoServiceImpl.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/DriverInfoServiceImpl.java @@ -93,7 +93,12 @@ public class DriverInfoServiceImpl extends ServiceImpl