修改

src/main/java/com/ruoyi/project/zt/controller/DjdcController.java

@@ -278,6 +278,11 @@ public class DjdcController {
                 List<Djjc> djjcList = djdcService.getDjjcList(param);
                 List<Djjc> djjcList = djdcService.getDjjcList(param);
                 ExcelUtil<Djjc> utilzt = new ExcelUtil<Djjc>(Djjc.class);
                 ExcelUtil<Djjc> utilzt = new ExcelUtil<Djjc>(Djjc.class);
                 utilzt.exportExcel(response, djjcList, "Sheet1");
                 utilzt.exportExcel(response, djjcList, "Sheet1");
+            case "exportQkztfx":
+                //导出区块钻头分析
+                List<DjZtfx> djZtfxList = djdcService.getDjZtfxList(param);
+                ExcelUtil<DjZtfx> utilzqk = new ExcelUtil<DjZtfx>(DjZtfx.class);
+                utilzqk.exportExcel(response, djZtfxList, "Sheet1");
             default:
             default:
 
 
         }
         }

src/main/java/com/ruoyi/project/zt/domain/DjZtfx.java

 package com.ruoyi.project.zt.domain;
 package com.ruoyi.project.zt.domain;
 
 
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import lombok.Data;
 import lombok.Data;
 
 
 @Data
 @Data
@@ -8,14 +9,22 @@ public class DjZtfx {
 
 
 
 
     //开次
     //开次
+    @Excel(name = "开次")
     private String kc;
     private String kc;
     //钻头型号
     //钻头型号
+    @Excel(name = "钻头型号")
     private String ztxh;
     private String ztxh;
+    //厂家
+    @Excel(name = "厂家")
+    private String cj;
     //外径
     //外径
+    @Excel(name = "外径")
     private Double cc;
     private Double cc;
     //钻头数量（钻头使用频次）
     //钻头数量（钻头使用频次）
+    @Excel(name = "钻头数量")
     private Integer ztsl;
     private Integer ztsl;
     //一趟钻率
     //一趟钻率
+    @Excel(name = "一趟钻率")
     private Double ytzl;
     private Double ytzl;
     private Double etzl;
     private Double etzl;
     private Double stzl;
     private Double stzl;
@@ -23,14 +32,19 @@ public class DjZtfx {
     private Double wtzl;
     private Double wtzl;
 
 
     //进尺中位数
     //进尺中位数
+    @Excel(name = "进尺中位数")
     private Double jcZw;
     private Double jcZw;
     //进尺最大值
     //进尺最大值
+    @Excel(name = "进尺最大值")
     private Double jcMax;
     private Double jcMax;
     //机械钻速中位数
     //机械钻速中位数
+    @Excel(name = "机械钻速中位数")
     private Double jxzsZw;
     private Double jxzsZw;
     //机械钻速最大值
     //机械钻速最大值
+    @Excel(name = "机械钻速最大值")
     private Double jxzsMax;
     private Double jxzsMax;
     //起出井深中位数
     //起出井深中位数
+    @Excel(name = "起出井深中位数")
     private Double qsjsZw;
     private Double qsjsZw;
 
 
 
 

src/main/resources/mybatis/zt/DjdcInfoMapper.xml

@@ -525,7 +525,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--	group by ss.kc,ss.ztxh,ss.cc-->
 <!--	group by ss.kc,ss.ztxh,ss.cc-->
 	<select id="getDjZtfxList" resultType="com.ruoyi.project.zt.domain.DjZtfx">
 	<select id="getDjZtfxList" resultType="com.ruoyi.project.zt.domain.DjZtfx">
 
 
-		select ss.kc,ss.ztxh,ss.cc,
+		select ss.kc,ss.ztxh,ss.cc,ss.cj,
 		count( *) as ztsl,
 		count( *) as ztsl,
 		round( sum(case when tcyk=1  then 1 else 0 end )/count(*)*100,2)as ytzl,
 		round( sum(case when tcyk=1  then 1 else 0 end )/count(*)*100,2)as ytzl,
 		-- round( sum(case when ss.kc=1 and tcyk=1  then 1 else 0 end )/count(*)*100,2)as ytzl,
 		-- round( sum(case when ss.kc=1 and tcyk=1  then 1 else 0 end )/count(*)*100,2)as ytzl,
@@ -535,7 +535,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		-- round( sum(case when ss.kc=5 and tcyk=1 then 1 else 0 end )/count(*)*100,2) as wtzl,
 		-- round( sum(case when ss.kc=5 and tcyk=1 then 1 else 0 end )/count(*)*100,2) as wtzl,
 		MEDIAN(nvl(jc,0)) as jc_zw,max(nvl(jc,0)) as jc_max,MEDIAN(nvl(jxzs,0)) as jxzs_zw,max(nvl(jxzs,0)) as jxzs_max,MEDIAN(nvl(qsjs,0)) as qsjs_zw
 		MEDIAN(nvl(jc,0)) as jc_zw,max(nvl(jc,0)) as jc_max,MEDIAN(nvl(jxzs,0)) as jxzs_zw,max(nvl(jxzs,0)) as jxzs_max,MEDIAN(nvl(qsjs,0)) as qsjs_zw
 		from (
 		from (
-		select ss.kc,ss.lag_js,ss.js,jsha.ztxh,jsha.cc,jsha.zzjs,jsha.jc,jsha.jxzs,nvl(jsha.qsjs,0) as qsjs,
+		select ss.kc,ss.lag_js,ss.js,jsha.cj,jsha.ztxh,jsha.cc,jsha.zzjs,jsha.jc,jsha.jxzs,nvl(jsha.qsjs,0) as qsjs,
 		---------判断是否在开次内一趟
 		---------判断是否在开次内一趟
 		case when  abs(nvl(jsha.qsjs,0)-ss.lag_js) &lt;=30 and jsha.zzjs=ss.js then 1 else 0 end as tcyk
 		case when  abs(nvl(jsha.qsjs,0)-ss.lag_js) &lt;=30 and jsha.zzjs=ss.js then 1 else 0 end as tcyk
 		from (
 		from (
@@ -553,6 +553,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		right join (select * from jsha where jh in(select jh from jsaa where qk like CONCAT(CONCAT('%', #{qk}), '%')  and wjrq >sysdate-365*2))jsha
 		right join (select * from jsha where jh in(select jh from jsaa where qk like CONCAT(CONCAT('%', #{qk}), '%')  and wjrq >sysdate-365*2))jsha
 		on jsha.jh=ss.jh  and jsha.zzjs between ss.lag_js and ss.js
 		on jsha.jh=ss.jh  and jsha.zzjs between ss.lag_js and ss.js
 		)ss
 		)ss
-		group by ss.kc,ss.ztxh,ss.cc
+		group by ss.kc,ss.ztxh,ss.cc,ss.cj
 	</select>
 	</select>
 </mapper>
 </mapper>
\ No newline at end of file