Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/dsic/gj_erp/service/KbanService.java
#	src/main/resources/mappers/kban/KbanMapper.xml

src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java

@@ -84,6 +84,14 @@ public class KbanController {
         return new ResultBean<>(ls.stream().map(FileUtil::getPrefix));
     }
 
+    /**
+     * 线表甘特图
+     */
+    @GetMapping("/xbgtt")
+    public ResultBean<?> xbgtt(String nf) {
+        return new ResultBean<>(this.kbanService.xbgtt(nf));
+    }
+
     /**
      * 30天作业区完成情况折线图
      */

src/main/java/com/dsic/gj_erp/mapper/KbanMapper.java

@@ -45,4 +45,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);
 }

src/main/java/com/dsic/gj_erp/service/KbanService.java

@@ -25,6 +25,10 @@ public class KbanService {
         return kbanMapper.getProjects();
     }
 
+    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");

src/main/resources/mappers/kban/KbanMapper.xml

@@ -192,6 +192,15 @@
         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>
     <select id="getProjects" resultType="java.util.Map">
         SELECT dcch dcCh,pl dcPl from (SELECT dcch ,pl ,ROW_NUMBER() over(PARTITION by dcch,pl order by dcch,pl) rn from dm_bom ) a where a.rn=1
     </select>