diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java index 49455376..b9a6a008 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java @@ -72,6 +72,8 @@ public class SysSourceController extends BaseController { @GetMapping("/getAllSource") public TableDataInfo getAllSource(SysSource sysSource) { + System.out.println("搜索条件: "+sysSource.getCity()+sysSource.getScenic()+sysSource.getcX()+sysSource.getcY()); + startPage(); diff --git a/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml index f7700742..464018f3 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml @@ -115,23 +115,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" on s.order_id = o.order_id and s.source_id = #{sourceId} - and city_id = #{cityId} + and city = #{city} - and scenic_id = #{scenicId} + and scenic = #{scenic} and part = #{part} - and scale = #{scale} - and coordinate = #{coordinate} - and price = #{price} + + + and source_status = #{sourceStatus} - and work_address = #{workAddress} - and start_time = #{startTime} - and end_time = #{endTime} - and b_bought = #{bBought} - and order_id = #{orderId} - and work_id = #{workId} - and c_x = #{cX} - and c_y = #{cY} + + + + + + + and c_x = #{cX} + and c_y = #{cY}