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-04-06 11:36:57 +08:00
parent 0838d16652
commit 49c855ff78
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/JDOrderListController.java
View File

@@ -103,7 +103,10 @@ public class JDOrderListController extends BaseController
if ("true".equalsIgnoreCase(request.getParameter("hasRebateRemark"))) { if ("true".equalsIgnoreCase(request.getParameter("hasRebateRemark"))) {
query.getParams().put("hasRebateRemark", true); query.getParams().put("hasRebateRemark", true);
} }
if ("true".equalsIgnoreCase(request.getParameter("rebateWithoutUploadLink"))) {
query.getParams().put("rebateWithoutUploadLink", true);
}
java.util.List<JDOrder> list; java.util.List<JDOrder> list;
if (orderBy != null && !orderBy.isEmpty()) { if (orderBy != null && !orderBy.isEmpty()) {
// 设置排序参数 // 设置排序参数
@@ -487,7 +490,18 @@ public class JDOrderListController extends BaseController
if (orderSearch != null && !orderSearch.trim().isEmpty()) { if (orderSearch != null && !orderSearch.trim().isEmpty()) {
query.getParams().put("orderSearch", orderSearch.trim()); query.getParams().put("orderSearch", orderSearch.trim());
} }
String rebateRemarkAbnormal = request.getParameter("rebateRemarkHasAbnormal");
if (rebateRemarkAbnormal != null && !rebateRemarkAbnormal.isEmpty()) {
query.setRebateRemarkHasAbnormal(Integer.valueOf(rebateRemarkAbnormal));
}
if ("true".equalsIgnoreCase(request.getParameter("hasRebateRemark"))) {
query.getParams().put("hasRebateRemark", true);
}
if ("true".equalsIgnoreCase(request.getParameter("rebateWithoutUploadLink"))) {
query.getParams().put("rebateWithoutUploadLink", true);
}
// 处理其他查询参数 // 处理其他查询参数
if (query.getRemark() != null && !query.getRemark().trim().isEmpty()) { if (query.getRemark() != null && !query.getRemark().trim().isEmpty()) {
query.setRemark(query.getRemark().trim()); query.setRemark(query.getRemark().trim());

14
ruoyi-system/src/main/resources/mapper/jarvis/JDOrderMapper.xml
View File

@@ -85,6 +85,13 @@
<if test="params.hasRebateRemark != null and params.hasRebateRemark == true"> <if test="params.hasRebateRemark != null and params.hasRebateRemark == true">
and rebate_remark_json is not null and char_length(trim(rebate_remark_json)) &gt; 2 and rebate_remark_json is not null and char_length(trim(rebate_remark_json)) &gt; 2
</if> </if>
<if test="params.rebateWithoutUploadLink != null and params.rebateWithoutUploadLink == true">
and (
rebate_remark_json is null
or char_length(trim(rebate_remark_json)) &lt;= 2
or rebate_remark_json not like '%"uploadRecordId"%'
)
</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 --> <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date(order_time) &gt;= #{params.beginTime} and date(order_time) &gt;= #{params.beginTime}
</if> </if>
@@ -126,6 +133,13 @@
<if test="params.hasRebateRemark != null and params.hasRebateRemark == true"> <if test="params.hasRebateRemark != null and params.hasRebateRemark == true">
and rebate_remark_json is not null and char_length(trim(rebate_remark_json)) &gt; 2 and rebate_remark_json is not null and char_length(trim(rebate_remark_json)) &gt; 2
</if> </if>
<if test="params.rebateWithoutUploadLink != null and params.rebateWithoutUploadLink == true">
and (
rebate_remark_json is null
or char_length(trim(rebate_remark_json)) &lt;= 2
or rebate_remark_json not like '%"uploadRecordId"%'
)
</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 --> <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date(order_time) &gt;= #{params.beginTime} and date(order_time) &gt;= #{params.beginTime}
</if> </if>