wrj 10 mesi fa
parent
commit
29a71fd5b8

+ 3 - 2
nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/ComplaintController.java

@@ -48,7 +48,8 @@ public class ComplaintController extends BaseController {
     @ApiOperation("分页查询所有数据")
     @Log(title = "投诉新增查看", businessType = BusinessType.OTHER)
     public R selectAll(Page<Complaint> page, Complaint complaint) {
-        return R.ok(this.complaintService.page(page, new QueryWrapper<>(complaint)));
+        Page<Complaint> complaints = complaintService.selectAll(page, complaint);
+        return R.ok(complaints);
     }
 
     /**
@@ -98,7 +99,7 @@ public class ComplaintController extends BaseController {
     @PostMapping("delete")
     @ApiOperation("删除数据")
     @Log(title = "投诉删除数据", businessType = BusinessType.DELETE)
-    public R delete(@RequestParam("idList") List<Long> idList) {
+    public R delete(@RequestBody List<Long> idList) {
         return R.ok(this.complaintService.removeByIds(idList));
     }
     @PostMapping("complaintEnum")

+ 10 - 0
nightFragrance-massage/src/main/java/com/ylx/massage/enums/ComplaintEnum.java

@@ -1,6 +1,7 @@
 package com.ylx.massage.enums;
 
 
+import com.ylx.common.utils.StringUtils;
 import lombok.Getter;
 import org.apache.commons.compress.utils.Lists;
 
@@ -45,4 +46,13 @@ public enum ComplaintEnum {
         }
         return objects;
     }
+
+    public static String getDescByCode(String code) {
+        for (ComplaintEnum value : ComplaintEnum.values()) {
+            if(value.getCode().equals(code)){
+                return value.getInfo();
+            }
+        }
+        return StringUtils.EMPTY;
+    }
 }

+ 5 - 0
nightFragrance-massage/src/main/java/com/ylx/massage/service/ComplaintService.java

@@ -1,8 +1,11 @@
 package com.ylx.massage.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ylx.massage.domain.Complaint;
 
+import java.util.List;
+
 /**
  * 投诉(Complaint)表服务接口
  *
@@ -11,5 +14,7 @@ import com.ylx.massage.domain.Complaint;
  */
 public interface ComplaintService extends IService<Complaint> {
 
+    Page<Complaint> selectAll(Page<Complaint> page, Complaint complaint);
+
 }
 

+ 22 - 0
nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/ComplaintServiceImpl.java

@@ -1,11 +1,18 @@
 package com.ylx.massage.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ylx.massage.enums.ComplaintEnum;
 import com.ylx.massage.mapper.ComplaintMapper;
 import com.ylx.massage.domain.Complaint;
 import com.ylx.massage.service.ComplaintService;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * 投诉(Complaint)表服务实现类
  *
@@ -15,5 +22,20 @@ import org.springframework.stereotype.Service;
 @Service("complaintService")
 public class ComplaintServiceImpl extends ServiceImpl<ComplaintMapper, Complaint> implements ComplaintService {
 
+    @Override
+    public Page<Complaint> selectAll(Page<Complaint> page, Complaint complaint) {
+
+        Page<Complaint> pageComplaint = this.page(page, new QueryWrapper<>(complaint));
+
+        List<Complaint> records = pageComplaint.getRecords();
+
+        if (CollectionUtil.isEmpty(records)) {
+            return pageComplaint;
+        }
+        records.forEach(i -> {
+            i.setComplaintType(ComplaintEnum.getDescByCode(i.getComplaintType()));
+        });
+        return pageComplaint;
+    }
 }