From 64a3cf1a59eff2e93f5340f11927098b3a04be50 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期一, 28 三月 2022 09:36:09 +0800
Subject: [PATCH] # ycq
---
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
index 2d2c017..95fcd03 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -11,6 +11,7 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
+import lombok.val;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.common.web.BaseController;
@@ -49,7 +50,7 @@
EntityWrapper<Item> wrapper = new EntityWrapper<>();
HashSet<String> excludeField = new HashSet<>();
-// allLike(Item.class,excludeField,wrapper, (String) param.get("id"));
+ allLike(Item.class,excludeField,wrapper, (String) param.get("id"));
excludeTrash(param);
convert(param, wrapper);
hostEq(wrapper);
@@ -72,6 +73,39 @@
}
}
+ @RequestMapping(value = "/item/list/chaoPirce")
+ @ManagerAuth
+ public R list1(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ val id = param.get("id");
+ String uuid=null;
+ if(id!=null){
+ uuid = id.toString();
+ }
+ Page<Item> projectPlanPage = itemService.chaoPirce(toPage(curr,limit,param,Item.class),uuid);
+ return R.ok(projectPlanPage);
+ }
+
+ @RequestMapping(value = "/item/list/chaoTime")
+ @ManagerAuth
+ public R list2(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ val id = param.get("id");
+ String uuid=null;
+ if(id!=null){
+ uuid = id.toString();
+ }
+
+ Page<Item> projectPlanPage = itemService.chaoTime(toPage(curr,limit,param,Item.class),uuid);
+ return R.ok(projectPlanPage);
+ }
+
@RequestMapping(value = "/item/add/auth")
@ManagerAuth
public R add(Item item) {
@@ -79,10 +113,10 @@
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
- item.setType("1");
- if (!item.getType().equals("1")) {
- throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
- }
+ //item.setType("1");
+// if (!item.getType().equals("1")) {
+// throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
+// }
Item name = itemService.selectOne(new EntityWrapper<Item>()
.eq("name", item.getName()));
if (!Cools.isEmpty(name)) {
@@ -105,17 +139,25 @@
@RequestMapping(value = "/item/update/auth")
@ManagerAuth
public R update(Item item){
+ EntityWrapper<Item> wapper = new EntityWrapper<Item>();
+ Item newitem = itemService.selectOne(wapper.eq("id", item.getId()));
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
- item.setType("1");
- if (!item.getType().equals("1")) {
- throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
- }
+// item.setType("1");
+// if (!item.getType().equals("1")) {
+// throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
+// }
// item.setRealMonth(1);
// if (item.getRealMonth() < 0){
// throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
// }
+ if(!(newitem.getStartTime()==null || newitem.getEndTime()==null || newitem.getRealStartTime()==null || newitem.getRealEndTime()==null)){
+ item.setStartTime(newitem.getStartTime());
+ item.setEndTime(newitem.getEndTime());
+ item.setRealEndTime(newitem.getRealEndTime());
+ item.setRealStartTime(newitem.getRealStartTime());
+ }
item.setUpdateBy(getUserId());
item.setUpdateTime(new Date());
itemService.update(item,new EntityWrapper<Item>()
--
Gitblit v1.9.1