CC/ruoyi-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
van
2026-09-06 21:00:59 +08:00
parent e5da5096c3
commit b46edff651
5 changed files with 91 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/InstructionController.java
+3 -2
View File
@@ -43,8 +43,9 @@ public class InstructionController extends BaseController {
@GetMapping("/history")
public AjaxResult getHistory(@RequestParam(required = false, defaultValue = "request") String type,
@RequestParam(required = false, defaultValue = "100") Integer limit,
@RequestParam(required = false) String keyword) {
java.util.List<String> history = instructionService.getHistory(type, limit, keyword);
@RequestParam(required = false) String keyword,
@RequestParam(required = false) Integer days) {
java.util.List<String> history = instructionService.getHistory(type, limit, keyword, days);
return AjaxResult.success(history);
}
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
+5
View File
@@ -126,6 +126,11 @@ public class JDOrderListController extends BaseController
query.getParams().put("orderSearch", orderSearch.trim());
}
String quickRecordSearch = request.getParameter("quickRecordSearch");
if (quickRecordSearch != null && !quickRecordSearch.trim().isEmpty()) {
query.getParams().put("quickRecordSearch", quickRecordSearch.trim());
}
String rebateRemarkAbnormal = request.getParameter("rebateRemarkHasAbnormal");
if (rebateRemarkAbnormal != null && !rebateRemarkAbnormal.isEmpty()) {
query.setRebateRemarkHasAbnormal(Integer.valueOf(rebateRemarkAbnormal));