From 228baf7c1c851ee8eba6d4da1e3f459f4d6a98e0 Mon Sep 17 00:00:00 2001
From: whycq0520 <91384184@qq.com>
Date: 星期四, 24 三月 2022 14:11:31 +0800
Subject: [PATCH] # ycq
---
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
index 50d8a0f..b3bb6a0 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -46,7 +46,10 @@
@RequestParam(required = false) String orderByType,
@RequestParam Map<String, Object> param) {
String target = (String) param.get("items");
+ String search = (String) param.get("id");
param.remove("items");
+ param.remove("id");
+
EntityWrapper<ProjectPlan> wrapper = new EntityWrapper<>();
if (target != null && !target.equals("0")){
wrapper.eq("item_id",target);
@@ -60,21 +63,8 @@
}
excludeTrash(param);
convert(param, wrapper);
-// HashSet<String> excludeItems = new HashSet<>();
-// excludeItems.add("id");
-// excludeItems.add("item_id");
-// excludeItems.add("weight_num");
-// excludeItems.add("create_time");
-// excludeItems.add("create_id");
-// excludeItems.add("modify_time");
-// excludeItems.add("modify_id");
-//
-// allLike(ProjectPlan.class,excludeItems,wrapper, (String) param.get("id"));
- wrapper.orderBy("item_id");
-// if (!Cools.isEmpty(orderByField)) {
-// wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
-// }
+ wrapper.orderBy("item_id");
return R.ok(projectPlanService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -305,6 +295,11 @@
itemsDTO.setId(item.getName());
itemsDTO.setStartDay(item.getStartTime$());
itemsDTO.setEndDay(item.getEndTime$());
+ itemsDTO.setPresaleAmt(item.getPresaleAmt());
+ itemsDTO.setPlandeAmt(item.getPlandeAmt());
+ itemsDTO.setRealdeAmt(item.getRealdeAmt());
+ itemsDTO.setPlaninAmt(item.getPlaninAmt());
+ itemsDTO.setRealinAmt(item.getRealinAmt());
List<ProjectPlan> allPlans = projectPlanService.selectList(new EntityWrapper<ProjectPlan>()
.eq("item_id", item.getId()));
for (ProjectPlan projectPlan : allPlans) {
--
Gitblit v1.9.1