diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CarMain.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CarMain.java index d065cd44..12a52acb 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CarMain.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CarMain.java @@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; @@ -61,11 +62,13 @@ public class CarMain extends TenantBaseDO { * 年检日期 */ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") private LocalDateTime inspectionDate; /** * 保险日期 */ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") private LocalDateTime insuranceDate; /** * 二级维护时间 @@ -112,6 +115,7 @@ public class CarMain extends TenantBaseDO { * 车辆注册日期 */ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") private LocalDateTime carRegisterDate; /** * 行驶证图片 diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CustomerMain.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CustomerMain.java index 4a78cbcb..00e583fd 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CustomerMain.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CustomerMain.java @@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.*; import java.util.Date; @@ -54,6 +55,7 @@ public class CustomerMain extends TenantBaseDO { /** * 生日 */ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") private Date birthday; /** * 住址 diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderInfoRespVO.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderInfoRespVO.java index 94280d00..50325bec 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderInfoRespVO.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/vo/RepairOrderInfoRespVO.java @@ -1,6 +1,5 @@ package cn.iocoder.yudao.module.order.vo; -import cn.iocoder.yudao.module.company.entity.Company; import cn.iocoder.yudao.module.order.entity.RepairOrderInfo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import io.swagger.v3.oas.annotations.media.Schema; @@ -11,9 +10,15 @@ import lombok.Data; @ExcelIgnoreUnannotated public class RepairOrderInfoRespVO extends RepairOrderInfo { - /** 订单状态（工单的状态） */ + /** 订单状态（工单的维修子状态） */ private String status; + /** 订单状态（工单的主状态） */ + private String mainStatus; + //订单描述 private String description; + + /** 查询订单类型(null-所有 |working-维修中|waitingPay-待支付|waitingComment-待评价) */ + private String selectType; } diff --git a/dl-module-base/src/main/resources/mapper/notice/DlBaseNoticeMapper.xml b/dl-module-base/src/main/resources/mapper/notice/DlBaseNoticeMapper.xml index 02e19db8..39946bb0 100644 --- a/dl-module-base/src/main/resources/mapper/notice/DlBaseNoticeMapper.xml +++ b/dl-module-base/src/main/resources/mapper/notice/DlBaseNoticeMapper.xml @@ -21,7 +21,8 @@ type, status, parent_server, - server + server, + create_time from dl_base_notice dbn where dbn.deleted = '0' diff --git a/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml b/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml index 3872bffb..71a6d781 100644 --- a/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml +++ b/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml @@ -39,7 +39,9 @@ @@ -99,21 +99,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM `inspection_contract` WHERE 1=1 - - and bren like CONCAT('%',#{bren},'%') + + and bren like CONCAT('%',#{vo.bren},'%') - - and brphone like CONCAT('%',#{brphone},'%') + + and brphone like CONCAT('%',#{vo.brphone},'%') - - and wtr like CONCAT('%',#{wtr},'%') + + and wtr like CONCAT('%',#{vo.wtr},'%') - - and wtrphone like CONCAT('%',#{wtrphone},'%') + + and wtrphone like CONCAT('%',#{vo.wtrphone},'%') - - and carnum like CONCAT('%',#{carnum},'%') + + and carnum like CONCAT('%',#{vo.carnum},'%') 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 69e41869..cf88c4c2 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml @@ -16,32 +16,32 @@ smp.work_time, smp.partner_name, smp.sales_num, - ROUND(ST_Distance_Sphere (POINT (#{longitude}, #{latitude}),POINT (smp.longitude, smp.latitude ))) AS distance, + ROUND(ST_Distance_Sphere (POINT (#{vo.longitude}, #{vo.latitude}),POINT (smp.longitude, smp.latitude ))) AS distance, COUNT(sig.id) goodsNum FROM shop_mall_partners smp Inner JOIN shop_inspection_goods sig ON smp.partner_id = sig.partner_id AND sig.is_listing='1' WHERE smp.type = 'jc' and smp.is_banned = '0' and smp.partner_logo is not null - - and ROUND(ST_Distance_Sphere (POINT (#{longitude}, #{latitude}),POINT (smp.longitude, smp.latitude ))) #{distance}*1000 + + and ROUND(ST_Distance_Sphere (POINT (#{vo.longitude}, #{vo.latitude}),POINT (smp.longitude, smp.latitude ))) #{vo.distance}*1000 - - and sig.goods_category_id = #{categoryId} + + and sig.goods_category_id = #{vo.categoryId} - - and (smp.partner_name like concat('%',#{searchValue},'%') or sig.title like concat('%',#{searchValue},'%') ) + + and (smp.partner_name like concat('%',#{vo.searchValue},'%') or sig.title like concat('%',#{vo.searchValue},'%') ) GROUP BY smp.partner_id - + order by distance asc,smp.order_num - + order by smp.average_score desc,smp.order_num - + order by smp.sales_num desc,smp.order_num @@ -91,7 +91,7 @@ FROM inspection_info info INNER JOIN order_info oi ON info.inspection_order_id = oi.id - WHERE oi.partner_id = #{partnerId} and info.end_time like CONCAT(#{timeStr},'%') + WHERE info.end_time like CONCAT(#{timeStr},'%') and info.is_pass ='1' and oi.goods_title like concat('%','双燃料','%') - and inspection_order_id = #{inspectionOrderId} - and user_id = #{userId} - and user_name like concat('%', #{userName}, '%') - and buy_name like concat('%', #{buyName}, '%') - and buy_phone = #{buyPhone} - and user_address = #{userAddress} - and unit_name like concat('%', #{unitName}, '%') - and partner_id = #{partnerId} - and work_id = #{workId} - and worker_name like concat('%', #{workerName}, '%') - and worker_phone = #{workerPhone} - and worker_avatar = #{workerAvatar} - and category_id = #{categoryId} - and car_num = #{carNum} - and car_model = #{carModel} - and car_nature = #{carNature} - and car_status = #{carStatus} - and car_id_no = #{carIdNo} - and is_pass = #{isPass} - and is_retrial = #{isRetrial} - and customer_source = #{customerSource} - and status = #{status} - and start_time = #{startTime} - and end_time = #{endTime} - and make_cert = #{makeCert} - and year = #{year} - and month = #{month} - and day = #{day} - and next_maintenance_date = #{nextMaintenanceDate} - and next_inspection_date = #{nextInspectionDate} - and other_phone = #{otherPhone} - and driver_licenes_img = #{driverLicenesImg} - and is_pay_online = #{isPayOnline} - and is_pick_car = #{isPickCar} + and inspection_order_id = #{vo.inspectionOrderId} + and user_id = #{vo.userId} + and user_name like concat('%', #{vo.userName}, '%') + and buy_name like concat('%', #{vo.buyName}, '%') + and buy_phone = #{vo.buyPhone} + and user_address = #{vo.userAddress} + and unit_name like concat('%', #{vo.unitName}, '%') + and partner_id = #{vo.partnerId} + and work_id = #{vo.workId} + and worker_name like concat('%', #{vo.workerName}, '%') + and worker_phone = #{vo.workerPhone} + and worker_avatar = #{vo.workerAvatar} + and category_id = #{vo.categoryId} + and car_num = #{vo.carNum} + and car_model = #{vo.carModel} + and car_nature = #{vo.carNature} + and car_status = #{vo.carStatus} + and car_id_no = #{vo.carIdNo} + and is_pass = #{vo.isPass} + and is_retrial = #{vo.isRetrial} + and customer_source = #{vo.customerSource} + and status = #{vo.status} + and start_time = #{vo.startTime} + and end_time = #{vo.endTime} + and make_cert = #{vo.makeCert} + and year = #{vo.year} + and month = #{vo.month} + and day = #{vo.day} + and next_maintenance_date = #{vo.nextMaintenanceDate} + and next_inspection_date = #{vo.nextInspectionDate} + and other_phone = #{vo.otherPhone} + and driver_licenes_img = #{vo.driverLicenesImg} + and is_pay_online = #{vo.isPayOnline} + and is_pick_car = #{vo.isPickCar} diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionAppointmentMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionAppointmentMapper.xml index 2155dc9c..3cb46944 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionAppointmentMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionAppointmentMapper.xml @@ -24,11 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionCategoryTemplateMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionCategoryTemplateMapper.xml index 8dc59445..8f72d629 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionCategoryTemplateMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionCategoryTemplateMapper.xml @@ -22,9 +22,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionFileMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionFileMapper.xml index cf01bb96..f02ef38f 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionFileMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionFileMapper.xml @@ -9,17 +9,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and inspection_order_id = #{inspectionOrderId} - and work_id = #{workId} - and worker_name like concat('%', #{workerName}, '%') - and worker_phone = #{workerPhone} - and is_pass = #{isPass} - and status = #{status} - and start_time = #{startTime} - and end_time = #{endTime} - and year = #{year} - and month = #{month} - and day = #{day} + and inspection_order_id = #{vo.inspectionOrderId} + and work_id = #{vo.workId} + and worker_name like concat('%', #{vo.workerName}, '%') + and worker_phone = #{vo.workerPhone} + and is_pass = #{vo.isPass} + and status = #{vo.status} + and start_time = #{vo.startTime} + and end_time = #{vo.endTime} + and year = #{vo.year} + and month = #{vo.month} + and day = #{vo.day} diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionNewsAssociationMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionNewsAssociationMapper.xml index a9b991ba..699a2f9f 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionNewsAssociationMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionNewsAssociationMapper.xml @@ -22,9 +22,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionNewsCommentMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionNewsCommentMapper.xml index 07d3bbe4..5607cc85 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionNewsCommentMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionNewsCommentMapper.xml @@ -23,10 +23,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionPickCarMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionPickCarMapper.xml index 7d346106..a6d40aaf 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/InspectionPickCarMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/InspectionPickCarMapper.xml @@ -31,18 +31,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/dl-module-inspection/src/main/resources/mapper/inspection/ShopInspectionGoodsMapper.xml b/dl-module-inspection/src/main/resources/mapper/inspection/ShopInspectionGoodsMapper.xml index 55c735ba..d0b98301 100644 --- a/dl-module-inspection/src/main/resources/mapper/inspection/ShopInspectionGoodsMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/inspection/ShopInspectionGoodsMapper.xml @@ -14,9 +14,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select * from shop_inspection_goods and partner_id = 888 and id!=888 - and id = #{id} - and title like concat('%', #{title}, '%') - and is_special = #{isSpecial} + and id = #{vo.id} + and title like concat('%', #{vo.title}, '%') + and is_special = #{vo.isSpecial} order by order_num, id desc @@ -52,11 +52,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" INNER JOIN shop_inspection_category sic ON sic.id = sig.goods_category_id - and sig.id = #{id} - and sig.title like concat('%', #{title}, '%') - and sig.goods_category_id = #{goodsCategoryId} - and smp.partner_name like concat('%',#{partnerName},'%') - and sig.partner_id = #{partnerId} + and sig.id = #{vo.id} + and sig.title like concat('%', #{vo.title}, '%') + and sig.goods_category_id = #{vo.goodsCategoryId} + and smp.partner_name like concat('%',#{vo.partnerName},'%') + and sig.partner_id = #{vo.partnerId} ORDER BY FIELD(sig.listing_status,1,2,3,0), create_time desc diff --git a/dl-module-inspection/src/main/resources/mapper/partner/PartnerCustomerInfoMapper.xml b/dl-module-inspection/src/main/resources/mapper/partner/PartnerCustomerInfoMapper.xml index 8c63ac7c..9da421eb 100644 --- a/dl-module-inspection/src/main/resources/mapper/partner/PartnerCustomerInfoMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/partner/PartnerCustomerInfoMapper.xml @@ -46,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + @@ -119,14 +119,14 @@ FROM `order_info` where partner_id =#{partnerId} and goods_type='sc' - - and order_status = #{orderStatus} + + and order_status = #{vo.orderStatus} - - and phonenumber like concat('%',#{phonenumber},'%') + + and phonenumber like concat('%',#{vo.phonenumber},'%') - - and goods_title like concat('%',#{goodsTitle},'%') + + and goods_title like concat('%',#{vo.goodsTitle},'%') order by order_time desc diff --git a/dl-module-inspection/src/main/resources/mapper/shop/ShopCouponMapper.xml b/dl-module-inspection/src/main/resources/mapper/shop/ShopCouponMapper.xml index 81b4870a..3abd7417 100644 --- a/dl-module-inspection/src/main/resources/mapper/shop/ShopCouponMapper.xml +++ b/dl-module-inspection/src/main/resources/mapper/shop/ShopCouponMapper.xml @@ -74,26 +74,26 @@ - and coupon_type = #{couponType} - and bind_moudle = #{bindMoudle} - and bind_goods_ids = #{bindGoodsIds} - and user_id = #{userId} - and coupon_status = #{couponStatus} - + and coupon_type = #{vo.couponType} + and bind_moudle = #{vo.bindMoudle} + and bind_goods_ids = #{vo.bindGoodsIds} + and user_id = #{vo.userId} + and coupon_status = #{vo.couponStatus} + and now() BETWEEN start_time AND expiration_time @@ -124,12 +124,12 @@ + + + diff --git a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSwiperMapper.xml b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSwiperMapper.xml index be301f00..50e7f386 100644 --- a/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSwiperMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/jx/DriveSchoolSwiperMapper.xml @@ -21,19 +21,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, swiper_name, dept_id,swiper_picture, jump_url, list_order, creator, create_time, updater, update_time from drive_school_swiper - + SELECT id, swiper_name, dept_id, swiper_picture, jump_url, list_order, creator, create_time, updater, update_time + FROM drive_school_swiper deleted = 0 - and swiper_name like concat('%', #{swiperName}, '%') - and swiper_picture = #{swiperPicture} - and jump_url = #{jumpUrl} - and dept_id = #{deptId} - and list_order = #{listOrder} + + AND swiper_name LIKE CONCAT('%', #{swiperName}, '%') + + + AND swiper_picture = #{swiperPicture} + + + AND jump_url = #{jumpUrl} + + + AND dept_id = #{deptId} + + + AND list_order = #{listOrder} + - order by list_order asc + ORDER BY list_order ASC + + SELECT id, swiper_name, dept_id, swiper_picture, jump_url, list_order, creator, create_time, updater, update_time + FROM drive_school_swiper + + deleted = 0 + + + AND swiper_name LIKE CONCAT('%', #{driveSchoolSwiper.swiperName}, '%') + + + AND swiper_picture = #{driveSchoolSwiper.swiperPicture} + + + AND jump_url = #{driveSchoolSwiper.jumpUrl} + + + AND dept_id = #{driveSchoolSwiper.deptId} + + + AND list_order = #{driveSchoolSwiper.listOrder} + + + + ORDER BY list_order ASC + + + + diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/controller/UniShopConfigController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/controller/UniShopConfigController.java index 26799651..77ac1ee7 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/controller/UniShopConfigController.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/controller/UniShopConfigController.java @@ -14,6 +14,9 @@ public class UniShopConfigController { @Autowired UniShopConfigService uniShopConfigService; + /** + * 客服中心：获取客服手机号 + */ @GetMapping("/getRepairTel") public CommonResult getRepairTel() { return CommonResult.success(uniShopConfigService.getRepairTel()); diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/mapper/UniShopConfigMapper.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/mapper/UniShopConfigMapper.java index 5092a40a..1f547e46 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/mapper/UniShopConfigMapper.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/mapper/UniShopConfigMapper.java @@ -1,11 +1,12 @@ package cn.iocoder.yudao.module.app.mapper; -import cn.iocoder.yudao.module.project.entity.RepairProject; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @Mapper public interface UniShopConfigMapper { + /** + * 客服中心：获取手机号 + */ public String getRepairTel(); } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/service/UniShopConfigService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/service/UniShopConfigService.java index 588b379e..4afe814f 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/service/UniShopConfigService.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/service/UniShopConfigService.java @@ -2,5 +2,8 @@ package cn.iocoder.yudao.module.app.service; public interface UniShopConfigService { + /** + * 客服中心：获取手机号 + */ public String getRepairTel(); } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/service/impl/UniShopConfigServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/service/impl/UniShopConfigServiceImpl.java index a267d5fd..6e4fa156 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/service/impl/UniShopConfigServiceImpl.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/app/service/impl/UniShopConfigServiceImpl.java @@ -11,6 +11,10 @@ public class UniShopConfigServiceImpl implements UniShopConfigService { @Autowired UniShopConfigMapper uniShopConfigMapper; + + /** + * 客服中心：获取手机号 + */ @Override public String getRepairTel() { return uniShopConfigMapper.getRepairTel(); diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/controller/admin/RepairStatisticsController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/controller/admin/RepairStatisticsController.java new file mode 100644 index 00000000..bedb10de --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/controller/admin/RepairStatisticsController.java @@ -0,0 +1,139 @@ +package cn.iocoder.yudao.module.base.controller.admin; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.module.base.service.RepairStatisticsService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Tag(name = "维修数据统计") +@RestController +@RequestMapping("/repair/statistics") +@Validated +public class RepairStatisticsController { + @Resource + private RepairStatisticsService statisticsService; + + /** + * 客户来源分析饼图 + * + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult + * @author PQZ + * @date 16:15 2024/10/21 + **/ + @GetMapping("/customerSource") + @Operation(summary = "客户来源分析饼图") + public CommonResult customerSource() { + return CommonResult.success(statisticsService.customerSource()); + } + + /** + * 月工单金额走势折线图 + * + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult + * @author PQZ + * @date 16:15 2024/10/21 + **/ + @GetMapping("/ticketMainAmount") + @Operation(summary = "月工单金额走势") + public CommonResult ticketMainAmount() { + return CommonResult.success(statisticsService.ticketMain("amount")); + } + + /** + * 月工单数量走势折线图 + * + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult + * @author PQZ + * @date 16:15 2024/10/21 + **/ + @GetMapping("/ticketMainCount") + @Operation(summary = "月工单数量走势") + public CommonResult ticketMainCount() { + return CommonResult.success(statisticsService.ticketMain("count")); + } + + /** + * 支付渠道统计柱状图 + * + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult + * @author PQZ + * @date 16:15 2024/10/21 + **/ + @GetMapping("/ticketMainPayWay") + @Operation(summary = "支付渠道统计") + public CommonResult ticketMainPayWay() { + return CommonResult.success(statisticsService.ticketMain("payWay")); + } + + /** + * 维修类型相关统计分析饼图 + * + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult + * @author PQZ + * @date 16:15 2024/10/21 + **/ + @GetMapping("/repairTypeStatistics") + @Operation(summary = "维修类型相关统计分析饼图") + public CommonResult repairTypeStatistics() { + return CommonResult.success(statisticsService.repairTypeStatistics()); + } + + /** + * 工单总数、今日工单、工单总金额、今日工单金额 + * + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult + * @author PQZ + * @date 16:15 2024/10/21 + **/ + @GetMapping("/ticketStatistics") + @Operation(summary = "工单总数、今日工单、工单总金额、今日工单金额") + public CommonResult ticketStatistics() { + return CommonResult.success(statisticsService.ticketStatistics()); + } + + /** + * 工单状态数量统计 + * + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult + * @author PQZ + * @date 16:15 2024/10/21 + **/ + @GetMapping("/ticketStatusCount") + @Operation(summary = "工单状态数量统计") + public CommonResult ticketStatusCount() { + return CommonResult.success(statisticsService.ticketStatusCount()); + } + + /** + * 今日工单 + * + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult + * @author PQZ + * @date 16:15 2024/10/21 + **/ + @GetMapping("/listTicketToday") + @Operation(summary = "今日工单") + public CommonResult listTicketToday() { + return CommonResult.success(statisticsService.listTicketToday()); + } + + /** + * 维修工人排行 + * + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult + * @author PQZ + * @date 16:15 2024/10/21 + **/ + @GetMapping("/listWorks") + @Operation(summary = "维修工人排行") + public CommonResult listWorks() { + return CommonResult.success(statisticsService.listWorks()); + } + +} \ No newline at end of file diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/mapper/RepairStatisticsMapper.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/mapper/RepairStatisticsMapper.java new file mode 100644 index 00000000..bd4e7cbb --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/mapper/RepairStatisticsMapper.java @@ -0,0 +1,99 @@ +package cn.iocoder.yudao.module.base.mapper; + +import cn.iocoder.yudao.module.base.vo.RepairStatisticsVO; +import cn.iocoder.yudao.module.base.vo.RepairTicketStatisticsVO; +import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsRespVO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 维修数据统计 + * + * @author pqz + */ +@Mapper +public interface RepairStatisticsMapper { + + /** + * 客户来源统计 + * + * @return java.util.List + * @author PQZ + * @date 13:57 2024/10/21 + **/ + List customerSource(); + + /** + * 月工单数量走势 + * + * @return java.util.List + * @author PQZ + * @date 14:25 2024/10/21 + **/ + List ticketCountTrend(); + + /** + * 月工单金额走势 + * + * @return java.util.List + * @author PQZ + * @date 14:31 2024/10/21 + **/ + List ticketAmountTrend(); + + /** + * 按照支付方式统计 + * + * @return java.util.List + * @author PQZ + * @date 14:41 2024/10/21 + **/ + List paymentWay(); + + /** + * 维修方式统计饼图 + * + * @return java.util.List + * @author PQZ + * @date 14:52 2024/10/21 + **/ + List repairTypeStatistics(); + + /** + * 工单总数、今日工单、工单总金额、今日工单金额 + * + * @return cn.iocoder.yudao.module.base.vo.RepairTicketStatisticsVO + * @author PQZ + * @date 15:31 2024/10/21 + **/ + RepairTicketStatisticsVO ticketStatistics(); + + /** + * 工单状态数量统计 + * + * @return java.util.List + * @author PQZ + * @date 15:44 2024/10/21 + **/ + List ticketStatusCount(); + + /** + * 今日工单 + * + * @return java.util.List + * @author PQZ + * @date 15:50 2024/10/21 + **/ + List listTicketToday(); + + + /** + * 维修工人排行 + * @author PQZ + * @date 16:13 2024/10/21 + * @return java.util.List + **/ + List listWorks(); + +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairStatisticsService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairStatisticsService.java new file mode 100644 index 00000000..dde50d36 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/RepairStatisticsService.java @@ -0,0 +1,85 @@ +package cn.iocoder.yudao.module.base.service; + +import cn.iocoder.yudao.module.base.vo.RepairStatisticsVO; +import cn.iocoder.yudao.module.base.vo.RepairTicketStatisticsVO; +import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsRespVO; + +import java.util.List; +import java.util.Map; + +/** + * 维修数据统计 + * + * @author pqz + */ +public interface RepairStatisticsService { + + /** + * 客户来源分析饼图 + * + * @return java.util.List + * @author PQZ + * @date 14:01 2024/10/21 + **/ + List customerSource(); + + /** + * 月工单数量、金额走势、支付渠道统计 + * @author PQZ + * @date 14:32 2024/10/21 + * @param type 'amount:金额，count：数量'，payWay：支付渠道 + * @return java.util.Map + **/ + Map ticketMain(String type); + + /** + * 维修类型相关统计分析饼图 + * + * @return java.util.Map + * @author PQZ + * @date 13:25 2024/10/21 + **/ + List repairTypeStatistics(); + + + /** + * 工单总数、今日工单、工单总金额、今日工单金额 + * + * @return java.util.Map + * @author PQZ + * @date 13:23 2024/10/21 + **/ + RepairTicketStatisticsVO ticketStatistics(); + + /** + * 工单状态数量统计 + * + * @return java.util.Map + * @author PQZ + * @date 13:28 2024/10/21 + **/ + List ticketStatusCount(); + + + /** + * 今日工单 + * + * @return java.util.List + * @author PQZ + * @date 13:25 2024/10/21 + **/ + List listTicketToday(); + + + + /** + * 维修工人排行 + * + * @return java.util.List + * @author PQZ + * @date 13:26 2024/10/21 + **/ + List listWorks(); + + +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairStatisticsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairStatisticsServiceImpl.java new file mode 100644 index 00000000..816ecd96 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/service/impl/RepairStatisticsServiceImpl.java @@ -0,0 +1,131 @@ +package cn.iocoder.yudao.module.base.service.impl; + +import cn.iocoder.yudao.module.base.mapper.RepairStatisticsMapper; +import cn.iocoder.yudao.module.base.service.RepairStatisticsService; +import cn.iocoder.yudao.module.base.vo.RepairStatisticsVO; +import cn.iocoder.yudao.module.base.vo.RepairTicketStatisticsVO; +import cn.iocoder.yudao.module.tickets.vo.DlRepairTicketsRespVO; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 维修数据统计 + * + * @author pqz + */ +@Service +@Validated +public class RepairStatisticsServiceImpl implements RepairStatisticsService { + + @Resource + private RepairStatisticsMapper statisticsMapper; + + /** + * 客户来源分析饼图 + * + * @return java.util.List + * @author PQZ + * @date 14:01 2024/10/21 + **/ + @Override + public List customerSource() { + return statisticsMapper.customerSource(); + } + + /** + * 月工单数量、金额走势、支付渠道统计 + * + * @return java.util.Map + * @author PQZ + * @date 13:20 2024/10/21 + **/ + @Override + public Map ticketMain(String type) { + Map result = new HashMap<>(); + List tickets; + if ("count".equals(type)) { + //月工单数量走势折线图 + tickets = statisticsMapper.ticketCountTrend(); + } else if ("amount".equals(type)) { + //月工单金额走势折线图 + tickets = statisticsMapper.ticketAmountTrend(); + } else { + //支付渠道柱状图 + tickets = statisticsMapper.paymentWay(); + } + //取出数值 + List data = tickets.stream().map(RepairStatisticsVO::getValue).collect(Collectors.toList()); + //x轴值 + List xData = tickets.stream().map(RepairStatisticsVO::getName).collect(Collectors.toList()); + result.put("data", data); + result.put("xData", xData); + return result; + } + + /** + * 维修类型相关统计分析饼图 + * + * @return java.util.Map + * @author PQZ + * @date 13:25 2024/10/21 + **/ + @Override + public List repairTypeStatistics() { + return statisticsMapper.repairTypeStatistics(); + } + + + /** + * 工单总数、今日工单、工单总金额、今日工单金额 + * + * @return java.util.Map + * @author PQZ + * @date 13:23 2024/10/21 + **/ + @Override + public RepairTicketStatisticsVO ticketStatistics() { + return statisticsMapper.ticketStatistics(); + } + + /** + * 工单状态数量统计 + * + * @return java.util.Map + * @author PQZ + * @date 13:28 2024/10/21 + **/ + @Override + public List ticketStatusCount() { + return statisticsMapper.ticketStatusCount(); + } + + /** + * 今日工单 + * + * @return java.util.List + * @author PQZ + * @date 13:25 2024/10/21 + **/ + @Override + public List listTicketToday() { + return statisticsMapper.listTicketToday(); + } + + /** + * 维修工人排行 + * + * @return java.util.List + * @author PQZ + * @date 13:26 2024/10/21 + **/ + @Override + public List listWorks() { + return statisticsMapper.listWorks(); + } +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairStatisticsVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairStatisticsVO.java new file mode 100644 index 00000000..0cbc2575 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairStatisticsVO.java @@ -0,0 +1,13 @@ +package cn.iocoder.yudao.module.base.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.ToString; + +@Schema(description = "数据统计VO") +@Data +@ToString(callSuper = true) +public class RepairStatisticsVO { + String name; + Integer value; +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairTicketStatisticsVO.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairTicketStatisticsVO.java new file mode 100644 index 00000000..bf6d22e0 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/base/vo/RepairTicketStatisticsVO.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.module.base.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.ToString; + +@Schema(description = "数据统计VO") +@Data +@ToString(callSuper = true) +public class RepairTicketStatisticsVO { + /**工单总数量*/ + Integer totalCount; + /**工单总金额*/ + Double totalAmount; + /**工单今日数量*/ + Integer todayCount; + /**工单今日金额*/ + Double todayAmount; + +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/entity/DlRepairBooking.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/entity/DlRepairBooking.java index bb74c78a..03719d26 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/entity/DlRepairBooking.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/entity/DlRepairBooking.java @@ -64,6 +64,7 @@ public class DlRepairBooking extends TenantBaseDO { /** * 预约时间 */ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime bookingTime; /** diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/impl/RepairProjectServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/impl/RepairProjectServiceImpl.java index 10afa53e..9f60fa49 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/impl/RepairProjectServiceImpl.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/impl/RepairProjectServiceImpl.java @@ -19,7 +19,9 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -86,7 +88,7 @@ public class RepairProjectServiceImpl extends ServiceImpl queryListPage(RepairProjectPageReqVO pageReqVO, Page page) { - return repairProjectMapper.selectListPage(pageReqVO,page); + return repairProjectMapper.selectListPage(pageReqVO, page); } /** @@ -97,28 +99,29 @@ public class RepairProjectServiceImpl extends ServiceImpl getRepairProjectAndCateGory() { List repairProjectAppvos = repairProjectMapper.selectProjectAndCateGory(); - // 提取并去重 typeId - List uniqueTypeIds = repairProjectAppvos.stream() - .map(RepairProjectAppvo::getTypeId) - .distinct() - .collect(Collectors.toList()); - List list = new ArrayList<>(); - for (String uniqueTypeId : uniqueTypeIds) { - RepairProjectAppvo repairProjectAppvo = new RepairProjectAppvo(); - repairProjectAppvo.setTypeId(uniqueTypeId); - if (ObjectUtil.isNotEmpty(uniqueTypeId)) { - List filteredList = repairProjectAppvos.stream() - .filter(appvo -> uniqueTypeId.equals(appvo.getTypeId())) - .collect(Collectors.toList()); - if (CollectionUtil.isNotEmpty(filteredList)) { - repairProjectAppvo.setTypeName(filteredList.get(0).getTypeName()); - repairProjectAppvo.setGroupList(BeanUtil.copyToList(filteredList, RepairProject.class)); - } + +// 使用 LinkedHashMap 按 typeId 分组，排除 typeId 为 null 的条目 + Map> groupedByTypeId = new LinkedHashMap<>(); + for (RepairProjectAppvo appvo : repairProjectAppvos) { + if (ObjectUtil.isNotEmpty(appvo.getTypeId())) { + groupedByTypeId.computeIfAbsent(appvo.getTypeId(), k -> new ArrayList<>()).add(appvo); } - list.add(repairProjectAppvo); } - return list; + + // 创建结果列表 + List resultList = new ArrayList<>(); + for (Map.Entry> entry : groupedByTypeId.entrySet()) { + RepairProjectAppvo repairProjectAppvo = new RepairProjectAppvo(); + repairProjectAppvo.setTypeId(entry.getKey()); + List filteredList = entry.getValue(); + repairProjectAppvo.setTypeName(filteredList.get(0).getTypeName()); + + // 只在最后一次调用 copyToList + repairProjectAppvo.setGroupList(BeanUtil.copyToList(filteredList, RepairProject.class)); + resultList.add(repairProjectAppvo); + } + + return resultList; + } - - } \ No newline at end of file diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java index b01f0f79..9e29197e 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTicketsController.java @@ -45,8 +45,7 @@ public class DlRepairTicketsController { @PostMapping("/create") @Operation(summary = "维修工单表 新增") public CommonResult createTicket(@RequestBody DlRepairTicketsRespVO ticketsRespVO) { - dlRepairTicketsService.createTickets(ticketsRespVO); - return CommonResult.ok(); + return CommonResult.success(dlRepairTicketsService.createTickets(ticketsRespVO)); } /** diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTitemController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTitemController.java index 072e1a0c..f6ca7c1d 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTitemController.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTitemController.java @@ -7,10 +7,7 @@ import cn.iocoder.yudao.module.tickets.vo.DlRepairTitemReqVO; import cn.iocoder.yudao.module.tickets.vo.DlRepairTitemRespVO; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -23,7 +20,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; * @date 18:21 2024/9/13 **/ @RestController -@RequestMapping("/repair/titem") + @RequestMapping("/repair/titem") public class DlRepairTitemController { /** * 服务对象 @@ -61,5 +58,16 @@ public class DlRepairTitemController { public CommonResult getProjectList(@RequestParam("ticketId") String ticketId){ return success(dlRepairTitemService.getProjectList(ticketId)); } + + /** + * 修改维修工单子表的维修人员和销售人员信息(app) + * @param dlRepairTitemReqVO + * @return + */ + @PutMapping("/updateRepairAndSale") + @Operation(summary = "修改维修工单子表的维修人员和销售人员信息") + public CommonResult updateRepairAndSale(@RequestBody DlRepairTitemReqVO dlRepairTitemReqVO){ + return success(dlRepairTitemService.updateRepairAndSale(dlRepairTitemReqVO)); + } } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/mapper/DlRepairTitemMapper.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/mapper/DlRepairTitemMapper.java index 251166c1..a17f4976 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/mapper/DlRepairTitemMapper.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/mapper/DlRepairTitemMapper.java @@ -25,6 +25,12 @@ public interface DlRepairTitemMapper extends BaseMapper { * @param repairTitemRespVO 查询对象 **/ IPage getTItemPage(@Param("map") DlRepairTitemRespVO repairTitemRespVO, Page page); + + /** + * 更新工单子表中维修人员、销售人员信息（app） + * @param dlRepairTitem + */ + void updateRepairAndSale(DlRepairTitem dlRepairTitem); } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java index 97fedb38..bfae38a6 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTicketsService.java @@ -25,7 +25,7 @@ public interface DlRepairTicketsService extends IService { * @author 小李 * @date 11:33 2024/9/20 **/ - void createTickets(DlRepairTicketsRespVO ticketsRespVO); + DlRepairTicketsRespVO createTickets(DlRepairTicketsRespVO ticketsRespVO); /** * 维修工单表 分页 diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTitemService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTitemService.java index 82bd2045..ed7bd6f3 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTitemService.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/DlRepairTitemService.java @@ -34,4 +34,11 @@ public interface DlRepairTitemService extends IService { **/ List getProjectList(String ticketId); + /** + * 更新工单子表中维修人员、销售人员信息（app） + * @param dlRepairTitem + * @return + */ + DlRepairTitem updateRepairAndSale(DlRepairTitem dlRepairTitem); + } 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 f7e69d0f..894022b4 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 @@ -155,7 +155,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl + + + + + + + + + + + + + + diff --git a/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTitemMapper.xml b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTitemMapper.xml index f281ac69..60f6b7bd 100644 --- a/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTitemMapper.xml +++ b/dl-module-repair/src/main/resources/mapper/tickets/DlRepairTitemMapper.xml @@ -3,7 +3,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - SELECT drti.id, drti.ticket_id, drti.item_name, diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/controller/admin/SysAnnouncementController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/controller/admin/SysAnnouncementController.java index d9cd8ae2..6d6e20f8 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/controller/admin/SysAnnouncementController.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/controller/admin/SysAnnouncementController.java @@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.appBase.controller.admin; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.module.rescue.core.controller.BaseController; -import cn.iocoder.yudao.module.rescue.core.page.TableDataInfo; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.module.appBase.domain.SysAnnouncement; diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java index 2330b97d..26b7c4cb 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java @@ -5,7 +5,6 @@ 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; import cn.iocoder.yudao.module.rescue.core.controller.BaseController; -import cn.iocoder.yudao.module.rescue.core.page.TableDataInfo; import cn.iocoder.yudao.module.rescue.domain.RescueInfo; import cn.iocoder.yudao.module.rescue.dto.DriverInfo2Dto; import cn.iocoder.yudao.module.rescue.dto.DriverInfoDto; diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueCarSpendController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueCarSpendController.java index 49db4f28..5539215a 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueCarSpendController.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueCarSpendController.java @@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.rescue.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.rescue.core.controller.BaseController; -import cn.iocoder.yudao.module.rescue.core.page.TableDataInfo; import cn.iocoder.yudao.module.rescue.domain.RescueCarSpend; import cn.iocoder.yudao.module.rescue.service.IRescueCarSpendService; import cn.iocoder.yudao.module.rescue.utils.ExcelUtil; diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueConfigController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueConfigController.java index eb1e8ec6..52e33e12 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueConfigController.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueConfigController.java @@ -2,11 +2,12 @@ package cn.iocoder.yudao.module.rescue.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.rescue.core.controller.BaseController; -import cn.iocoder.yudao.module.rescue.core.page.TableDataInfo; import cn.iocoder.yudao.module.rescue.domain.RescueConfig; import cn.iocoder.yudao.module.rescue.service.IRescueConfigService; import cn.iocoder.yudao.module.rescue.utils.ExcelUtil; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -34,10 +35,12 @@ public class RescueConfigController extends BaseController { */ @PreAuthorize("@ss.hasPermission('rescue:rescueConfig:list')") @GetMapping("/list") - public TableDataInfo list(RescueConfig rescueConfig) { - startPage(); - List list = rescueConfigService.selectRescueConfigList(rescueConfig); - return getDataTable(list); + public CommonResult list(RescueConfig rescueConfig, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + IPage list = rescueConfigService.selectRescueConfigList(page,rescueConfig); + return success(list); } /** @@ -46,10 +49,13 @@ public class RescueConfigController extends BaseController { @PreAuthorize("@ss.hasPermission('rescue:rescueConfig:export')") // @Log(title = "救援司机提成配置", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, RescueConfig rescueConfig) { - List list = rescueConfigService.selectRescueConfigList(rescueConfig); + public void export(HttpServletResponse response, RescueConfig rescueConfig, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + IPage list = rescueConfigService.selectRescueConfigList(page,rescueConfig); ExcelUtil util = new ExcelUtil(RescueConfig.class); - util.exportExcel(response, list, "救援司机提成配置数据"); + util.exportExcel(response, list.getRecords(), "救援司机提成配置数据"); } /** diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueDriverPositionController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueDriverPositionController.java index 7213ec5c..450ab5d0 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueDriverPositionController.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueDriverPositionController.java @@ -2,11 +2,12 @@ package cn.iocoder.yudao.module.rescue.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.rescue.core.controller.BaseController; -import cn.iocoder.yudao.module.rescue.core.page.TableDataInfo; import cn.iocoder.yudao.module.rescue.domain.RescueDriverPosition; import cn.iocoder.yudao.module.rescue.service.IRescueDriverPositionService; import cn.iocoder.yudao.module.rescue.utils.ExcelUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.java.Log; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -32,11 +33,13 @@ public class RescueDriverPositionController extends BaseController { */ @PreAuthorize("@ss.hasPermission('rescue:rescue_driver_position:list')") @GetMapping("/list") - public TableDataInfo list(RescueDriverPosition rescueDriverPosition) + public CommonResult list(RescueDriverPosition rescueDriverPosition, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - startPage(); - List list = rescueDriverPositionService.selectRescueDriverPositionList(rescueDriverPosition); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = rescueDriverPositionService.selectRescueDriverPositionList(page,rescueDriverPosition); + return success(list); } /** @@ -45,11 +48,14 @@ public class RescueDriverPositionController extends BaseController { @PreAuthorize("@ss.hasPermission('rescue:rescue_driver_position:export')") // @Log(title = "救援司机位置记录", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, RescueDriverPosition rescueDriverPosition) + public void export(HttpServletResponse response, RescueDriverPosition rescueDriverPosition, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - List list = rescueDriverPositionService.selectRescueDriverPositionList(rescueDriverPosition); + Page page = new Page<>(pageNum, pageSize); + IPage list = rescueDriverPositionService.selectRescueDriverPositionList(page,rescueDriverPosition); ExcelUtil util = new ExcelUtil(RescueDriverPosition.class); - util.exportExcel(response, list, "救援司机位置记录数据"); + util.exportExcel(response, list.getRecords(), "救援司机位置记录数据"); } /** @@ -100,8 +106,11 @@ public class RescueDriverPositionController extends BaseController { * 查询救援司机位置记录列表 */ @GetMapping("/listByInfoId") - public CommonResult listByInfoId(RescueDriverPosition rescueDriverPosition) { - List list = rescueDriverPositionService.listByInfoId(rescueDriverPosition); + public CommonResult listByInfoId(RescueDriverPosition rescueDriverPosition, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + IPage list = rescueDriverPositionService.listByInfoId(page,rescueDriverPosition); return success(list); } @@ -109,8 +118,11 @@ public class RescueDriverPositionController extends BaseController { * 查询救援司机位置记录列表 */ @GetMapping("/routeInfo") - public CommonResult routeInfo(RescueDriverPosition rescueDriverPosition) { - List res = rescueDriverPositionService.routeInfo(rescueDriverPosition); + public CommonResult routeInfo(RescueDriverPosition rescueDriverPosition, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { + Page page = new Page<>(pageNum, pageSize); + IPage res = rescueDriverPositionService.routeInfo(page,rescueDriverPosition); return success(res); } } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java index 3c949648..efad8bcb 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java @@ -8,7 +8,6 @@ import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.module.constant.UserConstants; import cn.iocoder.yudao.module.rescue.core.controller.BaseController; -import cn.iocoder.yudao.module.rescue.core.page.TableDataInfo; import cn.iocoder.yudao.module.rescue.domain.*; import cn.iocoder.yudao.module.rescue.dto.DriverInfoDto; import cn.iocoder.yudao.module.rescue.dto.SysDictData; @@ -121,13 +120,12 @@ public class RescueInfoSystem extends BaseController { * 查询【请填写功能名称】列表 */ @GetMapping("/list") - public TableDataInfo list(RescueInfo rescueInfo, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + public CommonResult list(RescueInfo rescueInfo, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNum, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { - startPage(); - List rescueInfos = rescueInfoService.selectRescueListSystem(rescueInfo); - TableDataInfo dataTable = getDataTable(rescueInfos); - return dataTable; + Page page = new Page<>(pageNum, pageSize); + IPage rescueInfos = rescueInfoService.selectRescueListSystem(page,rescueInfo); + return success(rescueInfos); } /** diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueRefuelRecordController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueRefuelRecordController.java index 31f3dc35..7315991d 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueRefuelRecordController.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueRefuelRecordController.java @@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.rescue.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.rescue.core.controller.BaseController; -import cn.iocoder.yudao.module.rescue.core.page.TableDataInfo; import cn.iocoder.yudao.module.rescue.domain.RescueRefuelRecord; import cn.iocoder.yudao.module.rescue.service.IRescueRefuelRecordService; import cn.iocoder.yudao.module.rescue.utils.ExcelUtil; diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/SysConfigController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/SysConfigController.java index 45056e53..17e9f970 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/SysConfigController.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/SysConfigController.java @@ -3,10 +3,11 @@ package cn.iocoder.yudao.module.rescue.controller.admin; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.module.rescue.core.controller.BaseController; -import cn.iocoder.yudao.module.rescue.core.page.TableDataInfo; import cn.iocoder.yudao.module.rescue.domain.SysConfig; import cn.iocoder.yudao.module.rescue.service.ISysConfigService; import cn.iocoder.yudao.module.rescue.utils.ExcelUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.security.access.prepost.PreAuthorize; @@ -34,21 +35,26 @@ public class SysConfigController extends BaseController */ @PreAuthorize("@ss.hasPermi('system:config:list')") @GetMapping("/list") - public TableDataInfo list(SysConfig config) + public CommonResult list(SysConfig config, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - startPage(); - List list = configService.selectConfigList(config); - return getDataTable(list); + Page page = new Page<>(pageNum, pageSize); + IPage list = configService.selectConfigList(page,config); + return success(list); } // @Log(title = "参数管理", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:config:export')") @PostMapping("/export") - public void export(HttpServletResponse response, SysConfig config) + public void export(HttpServletResponse response, SysConfig config, + @RequestParam(value = "pageNum" ,required = false ,defaultValue = "1") Integer pageNum, + @RequestParam(value ="pageSize" ,required = false ,defaultValue = "10") Integer pageSize) { - List list = configService.selectConfigList(config); + Page page = new Page<>(pageNum, pageSize); + IPage list = configService.selectConfigList(page,config); ExcelUtil util = new ExcelUtil(SysConfig.class); - util.exportExcel(response, list, "参数数据"); + util.exportExcel(response, list.getRecords(), "参数数据"); } /** diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueConfigMapper.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueConfigMapper.java index d904e10a..297299e0 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueConfigMapper.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueConfigMapper.java @@ -3,7 +3,10 @@ package cn.iocoder.yudao.module.rescue.mapper; import cn.iocoder.yudao.module.rescue.domain.RescueConfig; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,7 +33,7 @@ public interface RescueConfigMapper * @param rescueConfig 救援司机提成配置 * @return 救援司机提成配置集合 */ - public List selectRescueConfigList(RescueConfig rescueConfig); + public IPage selectRescueConfigList(Page page, @Param("vo") RescueConfig rescueConfig); /** * 新增救援司机提成配置 diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueDriverPositionMapper.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueDriverPositionMapper.java index 699cf4f6..43e030ae 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueDriverPositionMapper.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueDriverPositionMapper.java @@ -2,7 +2,10 @@ package cn.iocoder.yudao.module.rescue.mapper; import cn.iocoder.yudao.module.rescue.domain.RescueDriverPosition; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,6 +32,6 @@ public interface RescueDriverPositionMapper extends BaseMapper selectRescueDriverPositionList(RescueDriverPosition rescueDriverPosition); + public IPage selectRescueDriverPositionList(Page page, @Param("vo") RescueDriverPosition rescueDriverPosition); } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueSysConfigMapper.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueSysConfigMapper.java index a1e04dae..4540b8ee 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueSysConfigMapper.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/mapper/RescueSysConfigMapper.java @@ -1,7 +1,10 @@ package cn.iocoder.yudao.module.rescue.mapper; import cn.iocoder.yudao.module.rescue.domain.SysConfig; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -36,6 +39,14 @@ public interface RescueSysConfigMapper { */ public List selectConfigList(SysConfig config); + /** + * 查询参数配置列表 + * + * @param config 参数配置信息 + * @return 参数配置集合 + */ + public IPage selectConfigListIPage(Page page, @Param("vo") SysConfig config); + /** * 根据键名查询参数配置信息 * diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueConfigService.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueConfigService.java index 7030308e..27324aa8 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueConfigService.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueConfigService.java @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.rescue.service; import cn.iocoder.yudao.module.rescue.domain.RescueConfig; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -27,7 +29,7 @@ public interface IRescueConfigService * @param rescueConfig 救援司机提成配置 * @return 救援司机提成配置集合 */ - public List selectRescueConfigList(RescueConfig rescueConfig); + public IPage selectRescueConfigList(Page page, RescueConfig rescueConfig); /** * 新增救援司机提成配置 diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueDriverPositionService.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueDriverPositionService.java index f014a945..6663215b 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueDriverPositionService.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueDriverPositionService.java @@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.rescue.service; import cn.iocoder.yudao.module.rescue.domain.RescueDriverPosition; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; @@ -30,7 +32,7 @@ public interface IRescueDriverPositionService extends IService selectRescueDriverPositionList(RescueDriverPosition rescueDriverPosition); + public IPage selectRescueDriverPositionList(Page page, RescueDriverPosition rescueDriverPosition); /** * 新增救援司机位置记录 @@ -63,6 +65,6 @@ public interface IRescueDriverPositionService extends IService listByInfoId(RescueDriverPosition rescueDriverPosition); - List routeInfo(RescueDriverPosition rescueDriverPosition); + IPage listByInfoId(Page page, RescueDriverPosition rescueDriverPosition); + IPage routeInfo(Page page,RescueDriverPosition rescueDriverPosition); } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java index 3b37b45b..1df9c33c 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/IRescueInfoService.java @@ -48,7 +48,7 @@ public interface IRescueInfoService extends IService IPage selectRescueInfoListByAdmin(RescueInfo rescueInfo, Page page); JSONObject rescueInfoDetail(Long rescueId); - List selectRescueListSystem(RescueInfo rescueInfo); + IPage selectRescueListSystem(Page page,RescueInfo rescueInfo); IPage selectRescueListSystem2(RescueInfo rescueInfo, Page page); JSONObject listData(RescueInfo rescueInfo); diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/ISysConfigService.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/ISysConfigService.java index d189cc88..2285c521 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/ISysConfigService.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/ISysConfigService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.rescue.service; import cn.iocoder.yudao.module.rescue.domain.SysConfig; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; @@ -40,7 +42,7 @@ public interface ISysConfigService * @param config 参数配置信息 * @return 参数配置集合 */ - public List selectConfigList(SysConfig config); + public IPage selectConfigList(Page page, SysConfig config); /** * 新增参数配置 diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueConfigServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueConfigServiceImpl.java index ba211b76..10d8b944 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueConfigServiceImpl.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueConfigServiceImpl.java @@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.rescue.service.impl; import cn.iocoder.yudao.module.rescue.domain.RescueConfig; import cn.iocoder.yudao.module.rescue.mapper.RescueConfigMapper; import cn.iocoder.yudao.module.rescue.service.IRescueConfigService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -49,9 +51,9 @@ public class RescueConfigServiceImpl implements IRescueConfigService * @return 救援司机提成配置 */ @Override - public List selectRescueConfigList(RescueConfig rescueConfig) + public IPage selectRescueConfigList(Page page, RescueConfig rescueConfig) { - return rescueConfigMapper.selectRescueConfigList(rescueConfig); + return rescueConfigMapper.selectRescueConfigList(page,rescueConfig); } /** diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverPositionServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverPositionServiceImpl.java index 15cce5e2..6e87cf54 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverPositionServiceImpl.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverPositionServiceImpl.java @@ -7,6 +7,8 @@ import cn.iocoder.yudao.module.rescue.service.IRescueDriverPositionService; import cn.iocoder.yudao.module.rescue.service.IRescueInfoDetailService; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; import cn.iocoder.yudao.module.rescue.mapper.RescueDriverPositionMapper; @@ -50,9 +52,9 @@ public class RescueDriverPositionServiceImpl extends ServiceImpl selectRescueDriverPositionList(RescueDriverPosition rescueDriverPosition) + public IPage selectRescueDriverPositionList(Page page, RescueDriverPosition rescueDriverPosition) { - return baseMapper.selectRescueDriverPositionList(rescueDriverPosition); + return baseMapper.selectRescueDriverPositionList(page,rescueDriverPosition); } /** @@ -104,8 +106,8 @@ public class RescueDriverPositionServiceImpl extends ServiceImpl listByInfoId(RescueDriverPosition rescueDriverPosition) { - List rescueDriverPositions = baseMapper.selectRescueDriverPositionList(rescueDriverPosition); + public IPage listByInfoId(Page page, RescueDriverPosition rescueDriverPosition) { + IPage rescueDriverPositions = baseMapper.selectRescueDriverPositionList(page,rescueDriverPosition); RescueInfoDetail rescueInfoDetail =new RescueInfoDetail(); rescueInfoDetail.setRescueInfoId(rescueDriverPosition.getRescueInfoId()); LambdaQueryWrapper queryWrapper =new LambdaQueryWrapper<>(); @@ -113,7 +115,7 @@ public class RescueDriverPositionServiceImpl extends ServiceImpl details = detailService.list(queryWrapper); List collect = details.stream().map(RescueInfoDetail::getPositionId).collect(Collectors.toList()); if (CollectionUtil.isNotEmpty(details)){ - for (RescueDriverPosition driverPosition : rescueDriverPositions) { + for (RescueDriverPosition driverPosition : rescueDriverPositions.getRecords()) { if (collect.contains(driverPosition.getId())){ driverPosition.setMark("中转点"); } @@ -123,8 +125,8 @@ public class RescueDriverPositionServiceImpl extends ServiceImpl routeInfo(RescueDriverPosition rescueDriverPosition) { - List rescueDriverPositions = baseMapper.selectRescueDriverPositionList(rescueDriverPosition); + public IPage routeInfo(Page page, RescueDriverPosition rescueDriverPosition) { + IPage rescueDriverPositions = baseMapper.selectRescueDriverPositionList(page,rescueDriverPosition); RescueInfoDetail rescueInfoDetail =new RescueInfoDetail(); rescueInfoDetail.setRescueInfoId(rescueDriverPosition.getRescueInfoId()); LambdaQueryWrapper queryWrapper =new LambdaQueryWrapper<>(); @@ -134,19 +136,19 @@ public class RescueDriverPositionServiceImpl extends ServiceImpl res =new ArrayList<>(); if (CollectionUtil.isNotEmpty(details)){ - for (int i = 0; i < rescueDriverPositions.size()-1; i++) { - double longitude = Double.parseDouble(rescueDriverPositions.get(i+1).getLongitude()); + for (int i = 0; i < rescueDriverPositions.getRecords().size()-1; i++) { + double longitude = Double.parseDouble(rescueDriverPositions.getRecords().get(i+1).getLongitude()); //纬度 - double latitude = Double.parseDouble(rescueDriverPositions.get(i+1).getLatitude()); + double latitude = Double.parseDouble(rescueDriverPositions.getRecords().get(i+1).getLatitude()); - double longitude2 = Double.parseDouble(rescueDriverPositions.get(i).getLongitude()); + double longitude2 = Double.parseDouble(rescueDriverPositions.getRecords().get(i).getLongitude()); //纬度 - double latitude2 = Double.parseDouble(rescueDriverPositions.get(i).getLatitude()); + double latitude2 = Double.parseDouble(rescueDriverPositions.getRecords().get(i).getLatitude()); distanceMeter = distanceMeter + getDistanceMeter(longitude2,latitude2, longitude, latitude); - if (collect.contains(rescueDriverPositions.get(i+1).getId())){ + if (collect.contains(rescueDriverPositions.getRecords().get(i+1).getId())){ LambdaQueryWrapper queryWrapper1 =new LambdaQueryWrapper<>(); - queryWrapper1.eq(RescueInfoDetail::getRescueInfoId,rescueDriverPosition.getRescueInfoId()).eq(RescueInfoDetail::getPositionId,rescueDriverPositions.get(i+1).getId()); + queryWrapper1.eq(RescueInfoDetail::getRescueInfoId,rescueDriverPosition.getRescueInfoId()).eq(RescueInfoDetail::getPositionId,rescueDriverPositions.getRecords().get(i+1).getId()); RescueInfoDetail detail = detailService.getOne(queryWrapper1); JSONObject jsonObject =new JSONObject(); jsonObject.put("title",detail.getTitle()); @@ -156,6 +158,11 @@ public class RescueDriverPositionServiceImpl extends ServiceImpl resultPage = new Page<>(page.getCurrent(), page.getSize()); + resultPage.setRecords(res); // 设置记录 + resultPage.setTotal(rescueDriverPositions.getTotal()); // 设置总数 + return resultPage; } + + } diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java index 063f4af6..2b70bbc0 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java @@ -317,8 +317,8 @@ public class RescueInfoServiceImpl extends ServiceImpl selectRescueListSystem(RescueInfo rescueInfo) { - return baseMapper.selectList(new QueryWrapper<>()); + public IPage selectRescueListSystem(Page page, RescueInfo rescueInfo) { + return baseMapper.selectPage(page,new QueryWrapper<>()); } @Override diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/SysConfigServiceImpl.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/SysConfigServiceImpl.java index 5f4ab49a..f24faf17 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/SysConfigServiceImpl.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/SysConfigServiceImpl.java @@ -9,6 +9,8 @@ import cn.iocoder.yudao.module.rescue.domain.SysConfig; import cn.iocoder.yudao.module.rescue.mapper.RescueSysConfigMapper; import cn.iocoder.yudao.module.rescue.service.ISysConfigService; import cn.iocoder.yudao.module.rescue.utils.StringUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -99,8 +101,8 @@ public class SysConfigServiceImpl implements ISysConfigService { * @return 参数配置集合 */ @Override - public List selectConfigList(SysConfig config) { - return configMapper2.selectConfigList(config); + public IPage selectConfigList(Page page, SysConfig config) { + return configMapper2.selectConfigListIPage(page,config); } /** diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/utils/RedissonDelayQueue.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/utils/RedissonDelayQueue.java index 4cf692c9..53b45165 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/utils/RedissonDelayQueue.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/utils/RedissonDelayQueue.java @@ -112,7 +112,7 @@ public class RedissonDelayQueue { offerTask(task, UserConstants.RESCUE_TIME); } catch (Exception e) { // 记录并打印异常信息 - log.error("发生错误", e); +// log.error("发生错误", e); } } }); diff --git a/dl-module-rescue/src/main/resources/mapper/rescue/RescueConfigMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/RescueConfigMapper.xml index 0ec216b4..4e50145f 100644 --- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueConfigMapper.xml +++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueConfigMapper.xml @@ -18,10 +18,10 @@ diff --git a/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverInfoMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverInfoMapper.xml index 523425cb..e18be413 100644 --- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverInfoMapper.xml +++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverInfoMapper.xml @@ -86,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" `rescue_info` ri INNER JOIN rescue_driver_info rdi ON ri.id = rdi.rescue_id AND rdi.driver_accept = '2' WHERE + ri.deleted = 0 and rdi.driver_id =#{driverId} and ri.rescue_status = '2' and ri.driver_id is null ORDER BY rdi.create_time desc @@ -128,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" `rescue_info` ri left join rescue_order_info roi on ri.id = roi.rescue_info_id WHERE + ri.deleted = '0' and ri.driver_id =#{map.driverId} and ri.rescue_status = #{map.rescueStatus} @@ -143,6 +145,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM `rescue_driver_info` rdi INNER JOIN rescue_info ri on rdi.rescue_id = ri.id - where rdi.driver_accept ='2' and rdi.driver_id =#{driverId} and ri.rescue_status = '2' and ri.driver_id is null + where rdi.deleted = 0 and rdi.driver_accept ='2' and rdi.driver_id =#{driverId} and ri.rescue_status = '2' and ri.driver_id is null diff --git a/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverPositionMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverPositionMapper.xml index e0309245..6293c7ce 100644 --- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverPositionMapper.xml +++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverPositionMapper.xml @@ -9,11 +9,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/dl-module-rescue/src/main/resources/mapper/rescue/RescueSysConfigMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/RescueSysConfigMapper.xml index 6a6b1b68..ecbe8e2b 100644 --- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueSysConfigMapper.xml +++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueSysConfigMapper.xml @@ -33,20 +33,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index 1571d693..aa41b6e1 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -179,6 +179,7 @@ logging: cn.iocoder.yudao.module.company.mapper: debug # cn.iocoder.yudao.module.staff.mapper: debug # cn.iocoder.yudao.module.property.mapper: debug # + cn.iocoder.yudao.module.tickets.mapper: debug # debug: false