From fe4646d6fe6144c8e1e1a13a999e6947f9d35640 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 25 三月 2022 08:41:32 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 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 e0baa20..a379794 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -295,6 +295,12 @@
             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());
+            itemsDTO.setType(item.getType());
             List<ProjectPlan> allPlans = projectPlanService.selectList(new EntityWrapper<ProjectPlan>()
                     .eq("item_id", item.getId()));
             for (ProjectPlan projectPlan : allPlans) {
@@ -312,6 +318,20 @@
         return R.ok().add(itemsDTOs);
     }
 
-
+    /**
+     * 椤圭洰姹囨�绘暟鎹�
+     */
+    @RequestMapping("/projectPlan/dataSummary")
+    public R dataSummary(){
+        dataSummary data = new dataSummary();
+        Wrapper<Item> wrapper = new EntityWrapper<>();
+        data.setTotalQuantity(itemService.selectCount(wrapper));//椤圭洰鎬诲叡鏁伴噺
+        data.setIntoSum(itemService.selectCount(wrapper.eq("type","10")));//闆嗘垚椤圭洰鏁�
+        data.setWrongInto(itemService.selectCount(wrapper.ne("type","10")));//闈為泦鎴愰」鐩暟
+        data.setInspected(itemService.selectCount(wrapper.eq("realLADate","").and().eq("realLADate",null)));//宸查獙鏀堕」鐩暟閲�
+        data.setWrongInspected(itemService.selectCount(wrapper.ne("realLADate",null)));//鏈獙鏀堕」鐩暟閲�
+        data.setFinished(itemService.selectCount(wrapper.ne("realinDate", null).eq("realLADate", null)));//宸插畬宸ユ湭楠屾敹鏁伴噺
+        return R.ok().add(data);
+    }
 
 }

--
Gitblit v1.9.1