From 308c398b62c2319a78f7d9dae6aea8916da95cab Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期四, 10 二月 2022 10:42:31 +0800
Subject: [PATCH] #table-body-node

---
 src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java |   36 ++++++++++++++++--------------------
 1 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java b/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
index c69d7d2..65af884 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ReceiveDetlController.java
@@ -5,21 +5,18 @@
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import zy.cloud.wms.manager.entity.ReceiveDetl;
+import zy.cloud.wms.manager.service.ReceiveDetlService;
 import com.core.annotations.ManagerAuth;
 import com.core.common.BaseRes;
 import com.core.common.Cools;
-import com.core.common.DateUtils;
 import com.core.common.R;
+import zy.cloud.wms.common.web.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import zy.cloud.wms.common.web.BaseController;
-import zy.cloud.wms.manager.entity.ReceiveDetl;
-import zy.cloud.wms.manager.service.ReceiveDetlService;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @RestController
 public class ReceiveDetlController extends BaseController {
@@ -43,7 +40,6 @@
         EntityWrapper<ReceiveDetl> wrapper = new EntityWrapper<>();
         excludeTrash(param);
         convert(param, wrapper);
-        hostEq(wrapper);
         if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
         return R.ok(receiveDetlService.selectPage(new Page<>(curr, limit), wrapper));
     }
@@ -56,7 +52,7 @@
                 wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                 wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
             } else {
-                wrapper.eq(entry.getKey(), val);
+                wrapper.like(entry.getKey(), val);
             }
         }
     }
@@ -80,13 +76,9 @@
 
     @RequestMapping(value = "/receiveDetl/delete/auth")
     @ManagerAuth
-    public R delete(@RequestParam String param){
-        List<ReceiveDetl> list = JSONArray.parseArray(param, ReceiveDetl.class);
-        if (Cools.isEmpty(list)){
-            return R.error();
-        }
-        for (ReceiveDetl entity : list){
-            receiveDetlService.delete(new EntityWrapper<>(entity));
+    public R delete(@RequestParam(value="ids[]") Long[] ids){
+         for (Long id : ids){
+            receiveDetlService.deleteById(id);
         }
         return R.ok();
     }
@@ -95,9 +87,8 @@
     @ManagerAuth
     public R export(@RequestBody JSONObject param){
         EntityWrapper<ReceiveDetl> wrapper = new EntityWrapper<>();
-        hostEq(wrapper);
         List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
-        Map<String, Object> map = excludeTrash(param.getJSONObject("orderDetl"));
+        Map<String, Object> map = excludeTrash(param.getJSONObject("receiveDetl"));
         convert(map, wrapper);
         List<ReceiveDetl> list = receiveDetlService.selectList(wrapper);
         return R.ok(exportSupport(list, fields));
@@ -108,7 +99,6 @@
     public R query(String condition) {
         EntityWrapper<ReceiveDetl> wrapper = new EntityWrapper<>();
         wrapper.like("id", condition);
-        hostEq(wrapper);
         Page<ReceiveDetl> page = receiveDetlService.selectPage(new Page<>(0, 10), wrapper);
         List<Map<String, Object>> result = new ArrayList<>();
         for (ReceiveDetl receiveDetl : page.getRecords()){
@@ -130,4 +120,10 @@
         return R.ok();
     }
 
+    @RequestMapping("/receiveDetl/addIn")
+    public R addIn(@RequestBody ReceiveDetl receiveDetl){
+        System.out.println("receiveDetl = " + receiveDetl);
+        return R.ok();
+    }
+
 }

--
Gitblit v1.9.1