浏览代码

fix:技师数据倒序排

wrj 8 月之前
父节点
当前提交
97b0f5733f

+ 9 - 0
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/ComplaintController.java

@@ -1,6 +1,7 @@
 package com.ylx.web.controller.massage;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import com.ylx.common.annotation.Log;
@@ -8,6 +9,7 @@ import com.ylx.common.core.domain.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.core.controller.BaseController;
 import com.ylx.common.enums.BusinessType;
+import com.ylx.common.utils.StringUtils;
 import com.ylx.massage.domain.Complaint;
 import com.ylx.massage.enums.ComplaintEnum;
 import com.ylx.massage.enums.Enumproject;
@@ -48,6 +50,13 @@ public class ComplaintController extends BaseController {
     @ApiOperation("分页查询所有数据")
     @Log(title = "投诉新增查看", businessType = BusinessType.OTHER)
     public R selectAll(Page<Complaint> page, Complaint complaint) {
+
+        LambdaQueryWrapper<Complaint> complaintLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        complaintLambdaQueryWrapper.like(Complaint::getName, complaint.getName())
+                .eq(StringUtils.isNotBlank(complaint.getPhone()),Complaint::getPhone, complaint.getPhone())
+                .eq(Complaint::getDeptId, complaint.getDeptId())
+                .eq(Complaint::getComplaintType, complaint.getComplaintType())
+                .orderByDesc(Complaint::getCreateTime);
         Page<Complaint> complaints = complaintService.selectAll(page, complaint);
         return R.ok(complaints);
     }

+ 2 - 1
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TJsDayController.java

@@ -51,7 +51,8 @@ public class TJsDayController extends BaseController {
         LambdaQueryWrapper<TJsDay> tJsDayLambdaQueryWrapper = new LambdaQueryWrapper<>();
         tJsDayLambdaQueryWrapper.le(StringUtils.isNotBlank(tJsDay.getEndTime()) && StringUtils.isNotBlank(tJsDay.getStartTime()), TJsDay::getCountDate, tJsDay.getEndTime()).
                 ge(StringUtils.isNotBlank(tJsDay.getStartTime()) && StringUtils.isNotBlank(tJsDay.getEndTime()),TJsDay::getCountDate, tJsDay.getStartTime()).
-            eq(StringUtils.isNotBlank(tJsDay.getName()), TJsDay::getName, tJsDay.getName());
+            eq(StringUtils.isNotBlank(tJsDay.getName()), TJsDay::getName, tJsDay.getName()).
+        orderByDesc(TJsDay::getCountDate);
         return R.ok(this.tJsDayService.page(page, tJsDayLambdaQueryWrapper));
     }