完善excel导出

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbBlqController.java

@@ -1,6 +1,7 @@
 package com.railway.web.controller.business.catenary;
 
 import com.railway.business.catenary.domain.BusJcbBlq;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.service.IBusJcbBlqService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
@@ -148,13 +149,8 @@ public class BusJcbBlqController extends BaseController {
 
     @ApiOperation(value = "导出excel")
     @GetMapping(value = "exportExcel")
-    public AjaxResult exportExcel(BusJcbBlq busJcbBlq) {
-        List<BusJcbBlq> list = busJcbBlqService.getList(busJcbBlq);
-        Map<String, Object> params = new HashMap<>();
-
-        String fileName = "避雷器检测记录.xls";
-        String templateFileName = "excel/template/避雷器检测记录.xls";
-        String localFilePath = new EasyExcelUtil().getExcel(params, list, templateFileName, fileName);
+    public AjaxResult exportExcel(JcebQueryVo query) {
+        String localFilePath = busJcbBlqService.exportExcel(query);
         return sysFileService.uploadFile(localFilePath);
     }
 

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbFdfxjyqController.java

@@ -1,6 +1,7 @@
 package com.railway.web.controller.business.catenary;
 
 import com.railway.business.catenary.domain.BusJcbFdfxjyq;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.service.IBusJcbFdfxjyqService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
@@ -191,18 +192,8 @@ public class BusJcbFdfxjyqController extends BaseController {
 
     @ApiOperation(value = "导出excel")
     @GetMapping(value = "exportExcel")
-    public AjaxResult exportExcel(BusJcbFdfxjyq busJcbFdfxjyq) {
-        List<BusJcbFdfxjyq> list = busJcbFdfxjyqService.getList(busJcbFdfxjyq);
-        Map<String, Object> params = new HashMap<>();
-        if(!list.isEmpty()) {
-            params.put("stationName", list.get(0).getStationName());
-            params.put("createBy",list.get(0).getCreateBy());
-            params.put("confirmUser",list.get(0).getConfirmUser());
-        }
-
-        String fileName = "分段绝缘器检测记录.xls";
-        String templateFileName = "excel/template/分段绝缘器检测记录.xls";
-        String localFilePath = new EasyExcelUtil().getExcel(params, list, templateFileName, fileName);
+    public AjaxResult exportExcel(JcebQueryVo query) {
+        String localFilePath = busJcbFdfxjyqService.exportExcel(query);
         return sysFileService.uploadFile(localFilePath);
     }
 

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcebGjsfxController.java

@@ -1,6 +1,7 @@
 package com.railway.web.controller.business.catenary;
 
 import com.railway.business.catenary.domain.BusJcebGjsfx;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.service.IBusJcebGjsfxService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
@@ -96,13 +97,8 @@ public class BusJcebGjsfxController extends BaseController {
 
     @ApiOperation(value = "导出excel")
     @GetMapping(value = "exportExcel")
-    public AjaxResult exportExcel(BusJcebGjsfx busJcebGjsfx) {
-        List<BusJcebGjsfx> list = busJcebGjsfxService.getList(busJcebGjsfx);
-        Map<String, Object> params = new HashMap<>();
-
-        String fileName = "关节式分相检测记录.xls";
-        String templateFileName = "excel/template/关节式分相检测记录.xls";
-        String localFilePath = new EasyExcelUtil().getExcel(params, list, templateFileName, fileName);
+    public AjaxResult exportExcel(JcebQueryVo query) {
+        String localFilePath = busJcebGjsfxService.exportExcel(query);
         return sysFileService.uploadFile(localFilePath);
     }
 

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcbBlq.java

@@ -5,6 +5,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
+
+import java.math.BigDecimal;
+
 /**
  * 检查表-避雷器
  * @author wuhonghao 2021-10-17
@@ -75,7 +78,7 @@ public class BusJcbBlq extends BusJcab{
 
     @ApiModelProperty(value = "高压侧引线对接地体的动态最小距离")
     @Length(min = 1, max = 20, message = "【高压侧引线对接地体的动态最小距离】长度必须介于 {min} 和 {max} 之间")
-    private String blqyxGycyxdjdtdtzxjl;
+    private BigDecimal blqyxGycyxdjdtdtzxjl;
 
     @ApiModelProperty(value = "状态良好，无破损、裂纹")
     @Length(min = 1, max = 1, message = "【状态良好，无破损、裂纹】长度必须介于 {min} 和 {max} 之间")
@@ -91,10 +94,58 @@ public class BusJcbBlq extends BusJcab{
 
     @ApiModelProperty(value = "避雷器接地状态-接地电阻")
     @Length(min = 1, max = 20, message = "【避雷器接地状态-接地电阻】长度必须介于 {min} 和 {max} 之间")
-    private String blqjdztJddz;
+    private BigDecimal blqjdztJddz;
 
     @ApiModelProperty(value = "设备状态(故障描述)")
     @Length(max = 255, message = "【设备状态(故障描述)】长度必须介于 {min} 和 {max} 之间")
     private String sbztDesc;
 
+    @ApiModelProperty(value = "生产厂家")
+    private String sccj;
+
+    public String getXb(){
+        return "检测";
+    }
+
+    public String getBtzt(){
+        if("1".equals(blqjyzBlqjzcjyzcszzt)&& "1".equals(blqjyzBmqjazlg)){
+            return "良好";
+        }else{
+            return "故障";
+        }
+    }
+
+    public String getYx(){
+        if("1".equals(blqyxBlqyxwssdg)){
+            return "良好";
+        }else{
+            return "故障";
+        }
+    }
+
+    public String getJdx(){
+        if(blqjdztJddz!=null&&blqjdztJddz.compareTo(new BigDecimal("10"))==1){
+            return "良好";
+        }else{
+            return "故障";
+        }
+    }
+
+
+    public String getTlq(){
+        if("1".equals(tlqZtlhwpslh)){
+            return "良好";
+        }else{
+            return "故障";
+        }
+    }
+
+    public String getFszzqt(){
+        if("1".equals(tjwzBlqtjazsp)&& "1".equals(tjwzWxs)&& "1".equals(tjwzGblsljjg)){
+            return "良好";
+        }else{
+            return "故障";
+        }
+    }
+
 }

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcebGjsfx.java

@@ -74,4 +74,16 @@ public class BusJcebGjsfx extends BusJceb{
     @Length(min = 1, max = 255, message = "【下锚支接触线垂直投影与钢轨交叉处抬高（mm）】长度必须介于 {min} 和 {max} 之间")
     private String xmzjcxcztyyggjcctg;
 
+    public String getXb(){
+        return "检测";
+    }
+
+    public String getJyjsffhbzText(){
+        if("1".equals(jyjsffhbz)){
+            return "是";
+        }else{
+            return "否";
+        }
+    }
+
 }

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcebJyzqsjl.java

@@ -29,4 +29,6 @@ public class BusJcebJyzqsjl extends BusJceb{
     @ApiModelProperty(value = "数量")
     private Integer sl;
 
+    private Integer xh;
+
 }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebGjsfxServiceImpl.java

@@ -128,9 +128,15 @@ public class BusJcebGjsfxServiceImpl extends BusJcebServiceImpl<BusJcebGjsfx>
   @Override
   public String exportExcel(JcebQueryVo query) {
     List<BusJcebGjsfx> list = busJcebGjsfxMapper.getJcebList(query);
+    Map<String, Object> params = new HashMap<>();
+    if(!list.isEmpty()) {
+      params.put("stationName", list.get(0).getStationName());
+      params.put("createBy",list.get(0).getCreateBy());
+      params.put("operator",list.get(0).getOperator());
+    }
     String fileName = "关节式分相检测记录.xls";
     String templateFileName = "excel/template/关节式分相检测记录.xls";
-    return new EasyExcelUtil().writeExcel(fileName, templateFileName, list);
+    return new EasyExcelUtil().getExcel(params, list, templateFileName, fileName);
   }
 
 }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebJyzqsjlServiceImpl.java

@@ -7,7 +7,11 @@ import com.railway.business.catenary.mapper.BusJcebJyzqsjlMapper;
 import com.railway.business.catenary.service.IBusJcebJyzqsjlService;
 import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.poi.EasyExcelUtil;
+
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -126,8 +130,17 @@ public class BusJcebJyzqsjlServiceImpl extends BusJcebServiceImpl<BusJcebJyzqsjl
   @Override
   public String exportExcel(JcebQueryVo query) {
     List<BusJcebJyzqsjl> list = busJcebJyzqsjlMapper.getJcebList(query);
+    for(int i=0;i<list.size();i++){
+      list.get(i).setXh(i+1);
+    }
+    Map<String, Object> params = new HashMap<>();
+    if(!list.isEmpty()) {
+      params.put("stationName", list.get(0).getStationName());
+      params.put("createBy",list.get(0).getCreateBy());
+      params.put("operator",list.get(0).getOperator());
+    }
     String fileName = "绝缘子清扫记录.xls";
     String templateFileName = "excel/template/绝缘子清扫记录.xls";
-    return new EasyExcelUtil().writeExcel(fileName, templateFileName, list);
+    return new EasyExcelUtil().getExcel(params, list, templateFileName, fileName);
   }
 }

railway-business/src/main/resources/mapper/catenary/BusJcbBlqMapper.xml

@@ -43,6 +43,7 @@
     <result column="update_time" property="updateTime"/>
     <result column="submit_state" property="submitState"/>
     <result column="del_flag" property="delFlag"/>
+    <result column="sccj" property="sccj"/>
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -324,9 +325,7 @@
       <if test='null != tjwzGblsljjg'>tjwz_gblsljjg = #{tjwzGblsljjg},</if>
       <if test='null != tjwzGblsljjgDesc'>tjwz_gblsljjg_desc = #{tjwzGblsljjgDesc},</if>
       <if test='null != blqjyzBlqjzcjyzcszzt'>blqjyz_blqjzcjyzcszzt = #{blqjyzBlqjzcjyzcszzt},</if>
-      <if test='null != blqjyzBlqjzcjyzcszztDesc'>blqjyz_blqjzcjyzcszzt_desc =
-        #{blqjyzBlqjzcjyzcszztDesc},
-      </if>
+      <if test='null != blqjyzBlqjzcjyzcszztDesc'>blqjyz_blqjzcjyzcszzt_desc = #{blqjyzBlqjzcjyzcszztDesc},</if>
       <if test='null != blqjyzBmqjazlg'>blqjyz_bmqjazlg = #{blqjyzBmqjazlg},</if>
       <if test='null != blqjyzBmqjazlgDesc'>blqjyz_bmqjazlg_desc = #{blqjyzBmqjazlgDesc},</if>
       <if test='null != blqyxBlqyxwssdg'>blqyx_blqyxwssdg = #{blqyxBlqyxwssdg},</if>
@@ -513,8 +512,9 @@
 
   <select id="getJcebList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>,base.sccj
     FROM bus_jcb_blq t
+    LEFT JOIN base_blq base on t.pillar_code = base.pillar_code
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>
       t.del_flag='0'