From cc5dc59bdd17e61a1a3546cdf45a56c5c29c66db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Tue, 8 Apr 2025 13:46:24 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E4=BD=9C=E4=B8=9A=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=AE=8C=E5=B7=A5=E9=87=8F=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gj_erp/controller/kban/KbanController.java   |  9 ++++++---
 .../java/com/dsic/gj_erp/mapper/KbanMapper.java  |  3 +++
 .../com/dsic/gj_erp/service/KbanService.java     |  4 ++++
 src/main/resources/mappers/kban/KbanMapper.xml   | 16 ++++++++++++++++
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java b/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java
index d02354c..39250d4 100644
--- a/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java
@@ -19,9 +19,7 @@ import com.dsic.gj_erp.service.sy.impl.SyMsgService;
 import com.dsic.gj_erp.service.zyjh.ZyjhService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.io.File;
 import java.util.*;
@@ -52,6 +50,11 @@ public class KbanController {
     @Value("${pdfUri}")
     private String pdfUri;
 
+    @PostMapping("zyjhwcl")
+    public ResultBean<?> 作业计划完成量(@RequestBody Map<String, Object> map) {
+        return new ResultBean<>(kbanService.作业计划完成量(map));
+    }
+
     /**
      * 设备状态及加工情况
      */
diff --git a/src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java b/src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java
index ab26736..81283f4 100644
--- a/src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java
+++ b/src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java
@@ -10,6 +10,9 @@ import java.util.Map;
 @Mapper
 public interface KbanMapper {
 
+    //按日或月统计作业计划完成量
+    List<Map<String, Object>> 作业计划完成量(Map<String, Object> map);
+
     List<Map<String, Object>> getProjects();
 
     //线表重量
diff --git a/src/main/java/com/dsic/gj_erp/service/KbanService.java b/src/main/java/com/dsic/gj_erp/service/KbanService.java
index 7b0e759..bfa6818 100644
--- a/src/main/java/com/dsic/gj_erp/service/KbanService.java
+++ b/src/main/java/com/dsic/gj_erp/service/KbanService.java
@@ -26,6 +26,10 @@ public class KbanService {
     @Value("${xbjh-path}")
     String xbjhPath;
 
+    public List<Map<String,Object>> 作业计划完成量(Map<String, Object> map){
+        return kbanMapper.作业计划完成量(map);
+    }
+
     public List<Device> getDeviceStatus(){
         return deviceMapper.getDeviceStatus();
     }
diff --git a/src/main/resources/mappers/kban/KbanMapper.xml b/src/main/resources/mappers/kban/KbanMapper.xml
index fd9b867..64aa948 100644
--- a/src/main/resources/mappers/kban/KbanMapper.xml
+++ b/src/main/resources/mappers/kban/KbanMapper.xml
@@ -266,4 +266,20 @@
         WHERE
             jssj BETWEEN #{from} and #{to} and lx='b' and ylbs='N'
     </select>
+
+    <select id="作业计划完成量" resultType="java.util.Map">
+        SELECT
+            dc_ch,count(1) total,ROUND(SUM(bclqzl/1000),2) bclqzl,ROUND(sum(bcshzl/1000),2) bcshzl
+        from dm_ydjh
+        WHERE
+            cast(qgfkrq as date) BETWEEN #{from} and #{to}
+            <if test="ylbs!=null and ylbs!=''">
+                and ylbs=#{ylbs}
+            </if>
+            <if test="kw!=null and kw!=''">
+                and kw=#{kw}
+            </if>
+        group by dc_ch
+        order by dc_ch
+    </select>
 </mapper>