Commit 28a6d54cdde4148bf886bd3dac0e5c6f0c891a58
1 parent
cbfd2163
fix: 修复查询bug
Showing
2 changed files
with
3 additions
and
3 deletions
Bsth-admin/src/main/java/com/ruoyi/service/impl/BigViewServiceImpl.java
| @@ -73,7 +73,7 @@ public class BigViewServiceImpl implements BigViewService { | @@ -73,7 +73,7 @@ public class BigViewServiceImpl implements BigViewService { | ||
| 73 | List<FleetInfoVo> fleetInfoVos = handleFleetWithLinePersonInfo(matchMap, mapVo); | 73 | List<FleetInfoVo> fleetInfoVos = handleFleetWithLinePersonInfo(matchMap, mapVo); |
| 74 | // 特殊处理 处理进博会线路信息 | 74 | // 特殊处理 处理进博会线路信息 |
| 75 | if (LocalDate.now().toString().compareTo("2023-11-12") < 0){ | 75 | if (LocalDate.now().toString().compareTo("2023-11-12") < 0){ |
| 76 | - specialTreatment(fleetInfoVos); | 76 | +// specialTreatment(fleetInfoVos); |
| 77 | } | 77 | } |
| 78 | return fleetInfoVos; | 78 | return fleetInfoVos; |
| 79 | } | 79 | } |
Bsth-admin/src/main/resources/mapper/RuleNumSettingMapper.xml
| @@ -61,11 +61,11 @@ | @@ -61,11 +61,11 @@ | ||
| 61 | FROM | 61 | FROM |
| 62 | rule_setting_driver | 62 | rule_setting_driver |
| 63 | WHERE | 63 | WHERE |
| 64 | - job_code = #{jocCode} | 64 | + job_code = #{jobCode} |
| 65 | LIMIT 1) | 65 | LIMIT 1) |
| 66 | </if> | 66 | </if> |
| 67 | <if test="ruleDictName != null and ruleDictName != ''"> | 67 | <if test="ruleDictName != null and ruleDictName != ''"> |
| 68 | - and rule_dict_name = #{ruleDictName} | 68 | + and setting.rule_dict_name = #{ruleDictName} |
| 69 | </if> | 69 | </if> |
| 70 | </select> | 70 | </select> |
| 71 | <select id="getPeopleList" resultType="com.ruoyi.pojo.dto.AttendanceDto" resultMap="AttendanceResult"> | 71 | <select id="getPeopleList" resultType="com.ruoyi.pojo.dto.AttendanceDto" resultMap="AttendanceResult"> |