From a757da291b8b0915798dcad81636506f75a52c5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Mon, 18 Nov 2024 16:21:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E7=BA=BF=E8=A1=A8=E7=94=98?=
 =?UTF-8?q?=E7=89=B9=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 9126471..4b38911 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
@@ -51,6 +51,14 @@ public class KbanController {
     private final SyMsgService msgService;
     private final DmSygdMxService service;
 
+    /**
+     * 线表甘特图
+     */
+    @GetMapping("/xbgtt")
+    public ResultBean<?> xbgtt(String nf) {
+        return new ResultBean<>(this.kbanService.xbgtt(nf));
+    }
+
     /**
      * 30天作业区完成情况折线图
      */
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 8a22480..efd51ff 100644
--- a/src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java
+++ b/src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java
@@ -43,4 +43,6 @@ public interface KbanMapper {
     List<Map<String, Object>> zyjhzx(String from, String to);
 
     Map<String, Object> todayZyjhzx(String from, String to);
+
+    List<Map<String, Object>> xbgtt(String nf);
 }
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 7af1c39..0bb8e0d 100644
--- a/src/main/java/com/dsic/gj_erp/service/KbanService.java
+++ b/src/main/java/com/dsic/gj_erp/service/KbanService.java
@@ -21,6 +21,10 @@ public class KbanService {
 
     private final KbanMapper kbanMapper;
 
+    public List<Map<String, Object>> xbgtt(String nf){
+        return kbanMapper.xbgtt(nf);
+    }
+
     public Map<String, Object> todayZyjhzx() {
         DateTime date = DateUtil.date();
         String from = DateUtil.beginOfMonth(date).toString("yyyy/MM/dd");
diff --git a/src/main/resources/mappers/kban/KbanMapper.xml b/src/main/resources/mappers/kban/KbanMapper.xml
index b1314f9..7e2efb9 100644
--- a/src/main/resources/mappers/kban/KbanMapper.xml
+++ b/src/main/resources/mappers/kban/KbanMapper.xml
@@ -192,4 +192,13 @@
         WHERE 
             jssj BETWEEN #{from} and #{to}
     </select>
+
+    <select id="xbgtt" resultType="java.util.Map">
+        SELECT
+        DISTINCT a.dc_ch dcCh,a.yf,sum(a.zl/1000) over(PARTITION by a.dc_ch,a.yf) zl ,
+        sum(CONVERT(decimal,b.zl)/1000) over(PARTITION by b.dc_ch,MONTH(CAST(b.jssj AS DATE))) jhzl
+        from dm_xbjh a left join dm_ydjh b on a.dc_ch =b.dc_ch and
+        CONVERT(int,a.yf)=MONTH(CAST(b.jssj AS DATE)) WHERE a.nf=#{nf}
+        order by a.dc_ch, a.yf
+    </select>
 </mapper>