feat: 按天导出工作表

guzijian
1 parent 7364a92c
Showing 6 changed files with 218 additions and 95 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/ReportController.java
Bsth-admin/src/main/java/com/ruoyi/eexception/domain/EquipmentException.java
Bsth-admin/src/main/java/com/ruoyi/pojo/response/ReportErrorResponseVo.java
Bsth-admin/src/main/java/com/ruoyi/service/ReportService.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/resources/mapper/eexception/EquipmentExceptionMapper.xml
@@ -59,10 +59,7 @@ public class ReportController {
     @ApiOperation("签到报表导出")
     @PostMapping("/export")
     public void exportReport(@ApiParam ReportViewRequestVo requestVo, HttpServletResponse response) {
-        List<ExportReportViewResponseVo> list = reportService.exportReportList(requestVo, response);
-        // 不导出图片清空路径信息
-        ExcelUtil<ExportReportViewResponseVo> util = new ExcelUtil<ExportReportViewResponseVo>(ExportReportViewResponseVo.class);
-        util.exportEasyExcel(response, list, "签到报表");
+        reportService.exportReportList(requestVo, response);
     }
     @ApiOperation("告警通知")
@@ -59,4 +59,6 @@ public class EquipmentException extends BaseEntity
     private String nbbm;
     private Date planTime;
+
+    private Integer signType;
 }
 package com.ruoyi.pojo.response;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
@@ -19,6 +20,7 @@ import java.util.Date;
 @Data
 @ApiModel("异常报表对象")
 @HeadFontStyle(fontHeightInPoints = 10,fontName = "黑体")
+@ExcelIgnoreUnannotated
 public class ReportErrorResponseVo {
     @ApiModelProperty("工号")
     @ExcelProperty(value = "工号")
@@ -44,8 +46,8 @@ public class ReportErrorResponseVo {
     @ExcelProperty(value = "车辆自编号")
     @ColumnWidth(20)
     private String nbbm;
-    @ApiModelProperty("计划时间")
-    @ExcelProperty(value = "计划时间")
+    @ApiModelProperty("计划打卡时间")
+    @ExcelProperty(value = "计划打卡时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     @ColumnWidth(20)
 package com.ruoyi.service;
 import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import com.ruoyi.common.global.Result;
 import com.ruoyi.common.global.ResultCode;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.driver.mapper.DriverMapper;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.eexception.mapper.EquipmentExceptionMapper;
 import com.ruoyi.in.mapper.SignInMapper;
-import com.ruoyi.domain.DriverScheduling;
-import com.ruoyi.pojo.request.ReportViewRequestVo;
 import com.ruoyi.pojo.request.ReportErrorRequestVo;
+import com.ruoyi.pojo.request.ReportViewRequestVo;
 import com.ruoyi.pojo.response.*;
 import com.ruoyi.pojo.vo.PersonSignDataResponseVo;
 import com.ruoyi.system.domain.SysNotice;
@@ -25,6 +29,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotBlank;
+import java.io.OutputStream;
 import java.time.LocalDate;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
@@ -57,9 +62,6 @@ public class ReportService {
     @Autowired
     private EquipmentExceptionMapper exceptionMapper;
-    @Autowired
-    private DriverMapper driverMapper;
-
     @Resource
     private SchedulingService schedulingService;
@@ -81,7 +83,6 @@ public class ReportService {
             vo.setRemark(item.getRemark());
             vo.setName(item.getPersonnelName());
             vo.setSiteName(item.getSiteName());
-            vo.setImage(item.getImage());
             vo.setJobCode(item.getJobCode());
             vo.setDeviceId(item.getDeviceId());
             vo.setExType(item.getExType());
@@ -96,20 +97,90 @@ public class ReportService {
     }
-    public List<ExportReportViewResponseVo> exportReportList(ReportViewRequestVo requestVo, HttpServletResponse response) {
+    public void exportReportList(ReportViewRequestVo requestVo, HttpServletResponse response) {
+        List<ExportReportViewResponseVo> list = null;
         //  处理天
         if (requestVo.getExportFlag().equals(DAY)) {
-            return getDayReportTableResponseVo(requestVo.getDate());
+            list = getDayReportTableResponseVo(requestVo.getDate());
+            // 查询无排班异常
+            ReportErrorRequestVo errorVo = new ReportErrorRequestVo();
+            errorVo.setDate(requestVo.getDate());
+            errorVo.setExType(SIGN_NO_SCHEDULING_EX_NUM);
+            List<EquipmentExceptionResponseVo> errorList = exceptionMapper.selectEquipmentExceptionListByVo(errorVo);
+            ExcelWriter excelWriter = null;
+            try (OutputStream os = response.getOutputStream()) {
+                excelWriter = EasyExcel.write(os).build();
+                WriteSheet writeSheet = EasyExcel.writerSheet(0, "签到报表").head(ExportReportViewResponseVo.class).build();
+                excelWriter.write(list, writeSheet);
+                // 无排班打卡表
+                Map<String, List<EquipmentExceptionResponseVo>> map = new HashMap<>();
+                transfromMap(errorList, map);
+                List<List<String>> errorListHead = createErrorListHead(map);
+                WriteSheet writeSheet1 = EasyExcel.writerSheet(1, "无排班打卡表").head(errorListHead).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).build();
+                excelWriter.write(createErrorListData(errorListHead.size(), map), writeSheet1);
+                excelWriter.finish();
+            } catch (Exception e) {
+                System.out.println(e.getMessage());
+            }
+            return;
         }
         // 处理月
         else if (requestVo.getExportFlag().equals(MONTH)) {
-            return getMonthReportTableResponseVo(requestVo);
+            list = getMonthReportTableResponseVo(requestVo);
         }
         // 处理导出任意时间段  后台追加限制条件 366 天为最长导出时间
         else if (requestVo.getExportFlag().equals(TIME_PERIOD)) {
-            return getTimePeriodReportTableResponseVo(requestVo);
+            list = getTimePeriodReportTableResponseVo(requestVo);
+        }
+        if (!DAY.equals(requestVo.getExportFlag())) {
+            // 不导出图片清空路径信息
+            ExcelUtil<ExportReportViewResponseVo> util = new ExcelUtil<ExportReportViewResponseVo>(ExportReportViewResponseVo.class);
+            util.exportEasyExcel(response, list, "签到报表");
         }
-        return null;
+    }
+
+    private static void transfromMap(List<EquipmentExceptionResponseVo> errorList, Map<String, List<EquipmentExceptionResponseVo>> map) {
+        // 以工号封装成map
+        for (EquipmentExceptionResponseVo exceptionResponseVo : errorList) {
+            List<EquipmentExceptionResponseVo> vos = map.get(exceptionResponseVo.getJobCode());
+            if (CollectionUtil.isEmpty(vos)) {
+                map.put(exceptionResponseVo.getJobCode(), new ArrayList<>(Arrays.asList(exceptionResponseVo)));
+            } else {
+                vos.add(exceptionResponseVo);
+            }
+        }
+    }
+
+    /**
+     * 不确定数据列数
+     *
+     * @return
+     */
+    private List<List<String>> createErrorListData(int column, Map<String, List<EquipmentExceptionResponseVo>> map) {
+        // 封装数据
+        List<List<String>> result = new ArrayList<>();
+        map.forEach((key, value) -> {
+            List<String> data = new ArrayList<>();
+            data.add(key);
+            data.add(value.get(0).getPersonnelName());
+            data.add(value.get(0).getFleetName());
+            for (int i = 0; i < column; i++) {
+                if (value.size() > i) {
+                    EquipmentExceptionResponseVo vo = value.get(i);
+                    data.add(ConstDateUtil.formatDate("yyyy-MM-dd HH:mm:ss", vo.getCreateTime()));
+                    if (vo.getSignType() == null) {
+                        data.add("");
+                    }else {
+                        data.add(vo.getSignType().equals(SIGN_IN) ? "签到" : "签退");
+                    }
+                } else {
+                    data.add("");
+                    data.add("");
+                }
+            }
+            result.add(data);
+        });
+        return result;
     }
     private List<ExportReportViewResponseVo> getTimePeriodReportTableResponseVo(ReportViewRequestVo requestVo) {
@@ -176,10 +247,28 @@ public class ReportService {
     private List<ExportReportViewResponseVo> getDayReportTableResponseVo(String date) {
         List<DriverScheduling> schedulingList = schedulingMapper.queryToDay(date, null, null, null);
         Map<String, List<DriverScheduling>> resultMap = new HashMap<>(800);
-        List<ExportReportViewResponseVo> vo = new ArrayList<>(800);
+        List<ExportReportViewResponseVo> signVo = new ArrayList<>(800);
         handlerResultMap(date, resultMap, schedulingList);
-        handleResultList(vo, resultMap);
-        return vo;
+        handleResultList(signVo, resultMap);
+        return signVo;
+    }
+
+    private List<List<String>> createErrorListHead(Map<String, List<EquipmentExceptionResponseVo>> map) {
+        List<List<String>> list = new ArrayList<>();
+        list.add(Arrays.asList("工号"));
+        list.add(Arrays.asList("姓名"));
+        list.add(Arrays.asList("部门"));
+        List<Integer> maxSignCount = Arrays.asList(0);
+        map.forEach((key, value) -> {
+            if (maxSignCount.get(0) < value.size()) {
+                maxSignCount.set(0, value.size());
+            }
+        });
+        for (int i = 0; i < maxSignCount.get(0) * 2; i = i + 2) {
+            list.add(Arrays.asList("打卡时间"));
+            list.add(Arrays.asList("打卡类型"));
+        }
+        return list;
     }
     private void handleResultList(List<ExportReportViewResponseVo> vo, Map<String, List<DriverScheduling>> resultMap) {
@@ -219,6 +308,7 @@ public class ReportService {
         List<String> days = getNowMonthAllDay(requestVo.getDate());
         for (String day : days) {
             List<ExportReportViewResponseVo> dayReportTableResponseVo = getDayReportTableResponseVo(day);
+            // TODO 修改
             responseVos.addAll(dayReportTableResponseVo);
         }
         return responseVos;
@@ -182,6 +182,7 @@ public class ThreadJobService {
                 exception.setLineName(scheduling.getLineName());
                 exception.setPlanTime(scheduling.getBcType().equals(BC_TYPE_IN) ? new Date(scheduling.getZdsjT()) : new Date(scheduling.getFcsjT()));
             }
+            exception.setSignType(signIn.getType());
             exceptionMapper.insertEquipmentException(exception);
             // 发送通知
             sendNotice(signIn, driver, dto, globalIndex);
@@ -219,10 +220,12 @@ public class ThreadJobService {
     }
     private String getResultString(BigDecimal alcoholIntake) {
-        if (alcoholIntake.compareTo(new BigDecimal(20)) >= 0 && alcoholIntake.compareTo(new BigDecimal(80)) < 0)
+        if (alcoholIntake.compareTo(new BigDecimal(20)) >= 0 && alcoholIntake.compareTo(new BigDecimal(80)) < 0) {
             return "饮酒后驾驶机动车";
-        else
+        } else {
             return "醉酒后驾驶机动车";
+        }
+
     }
     @Async
@@ -525,7 +528,7 @@ public class ThreadJobService {
                     DriverScheduling scheduling = nowScheduling.get(nowScheduling.size() - 1);
                     scheduling.setZdsjT(scheduling.getFcsjT());
                 } catch (Exception e) {
-                    log.error("特殊处理失败:{}",e.getMessage());
+                    log.error("特殊处理失败:{}", e.getMessage());
                 }
                 // 处理青蒸线区间 区间删除注意特殊情况放到最后可能没有全部都是区间倒是nowScheduling 为0 然后get报错
                 if (nowScheduling.get(0).getLineName().startsWith("青蒸线")) {
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.eexception.mapper.EquipmentExceptionMapper">
-    
+
     <resultMap type="com.ruoyi.pojo.response.EquipmentExceptionResponseVo" id="EquipmentExceptionResponseResult">
-        <result property="id"    column="id"    />
-        <result property="title"    column="title"    />
-        <result property="deviceId"    column="device_id"    />
-        <result property="jobCode"    column="job_code"    />
-        <result property="image"    column="image"    />
-        <result property="status"    column="status"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="remark"    column="remark"    />
-        <result property="exType"    column="ex_type"    />
-        <result property="personnelName"    column="personnel_name"    />
-        <result property="siteName"    column="site_name"    />
-        <result property="fleetName"    column="fleet_name"    />
-        <result property="nbbm"    column="nbbm"    />
-        <result property="lineName"    column="line_name"    />
-        <result property="planTime"    column="plan_time"    />
+        <result property="id" column="id"/>
+        <result property="title" column="title"/>
+        <result property="deviceId" column="device_id"/>
+        <result property="jobCode" column="job_code"/>
+        <result property="image" column="image"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="remark" column="remark"/>
+        <result property="exType" column="ex_type"/>
+        <result property="personnelName" column="personnel_name"/>
+        <result property="siteName" column="site_name"/>
+        <result property="fleetName" column="fleet_name"/>
+        <result property="nbbm" column="nbbm"/>
+        <result property="lineName" column="line_name"/>
+        <result property="planTime" column="plan_time"/>
+        <result property="signType" column="sign_type"/>
     </resultMap>
     <resultMap type="EquipmentException" id="EquipmentExceptionResult">
-        <result property="id"    column="id"    />
-        <result property="title"    column="title"    />
-        <result property="deviceId"    column="device_id"    />
-        <result property="jobCode"    column="job_code"    />
-        <result property="image"    column="image"    />
-        <result property="status"    column="status"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="remark"    column="remark"    />
-        <result property="exType"    column="ex_type"    />
-        <result property="planTime"    column="plan_time"    />
+        <result property="id" column="id"/>
+        <result property="title" column="title"/>
+        <result property="deviceId" column="device_id"/>
+        <result property="jobCode" column="job_code"/>
+        <result property="image" column="image"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="remark" column="remark"/>
+        <result property="exType" column="ex_type"/>
+        <result property="planTime" column="plan_time"/>
+        <result property="signType" column="sign_type"/>
     </resultMap>
     <sql id="selectEquipmentExceptionVo">
-        select id, title, device_id, job_code, image, status, create_time, remark,ex_type,plan_time from equipment_exception
+        select id,
+               title,
+               device_id,
+               job_code,
+               image,
+               status,
+               create_time,
+               remark,
+               ex_type,
+               plan_time,
+               sign_type
+        from equipment_exception
     </sql>
-    <select id="selectEquipmentExceptionList" parameterType="com.ruoyi.pojo.response.EquipmentExceptionResponseVo" resultMap="EquipmentExceptionResponseResult">
+    <select id="selectEquipmentExceptionList" parameterType="com.ruoyi.pojo.response.EquipmentExceptionResponseVo"
+            resultMap="EquipmentExceptionResponseResult">
         select equipment_exception.id, title, equipment.site_name ,
-               equipment_exception.device_id,driver.personnel_name,
-               driver.job_code, equipment_exception.image,
-               equipment_exception.status, equipment_exception.create_time,
-               equipment_exception.ex_type,equipment_exception.remark,
-               equipment_exception.plan_time
+        equipment_exception.device_id,driver.personnel_name,
+        driver.job_code, equipment_exception.image,
+        equipment_exception.status, equipment_exception.create_time,
+        equipment_exception.ex_type,equipment_exception.remark,
+        equipment_exception.plan_time
         from
-            equipment_exception
-                join driver on driver.job_code = equipment_exception.job_code
-                join equipment on equipment.device_id = equipment_exception.device_id
+        equipment_exception
+        join driver on driver.job_code = equipment_exception.job_code
+        join equipment on equipment.device_id = equipment_exception.device_id
         <where>
             ex_type = 4
-            <if test="title != null  and title != ''"> and title = #{title}</if>
-            <if test="deviceId != null "> and device_id = #{deviceId}</if>
-            <if test="jobCode != null  and jobCode != ''"> and driver.job_code = #{jobCode}</if>
-            <if test="status != null "> and status = #{status}</if>
+            <if test="title != null  and title != ''">and title = #{title}</if>
+            <if test="deviceId != null ">and device_id = #{deviceId}</if>
+            <if test="jobCode != null  and jobCode != ''">and driver.job_code = #{jobCode}</if>
+            <if test="status != null ">and status = #{status}</if>
         </where>
         order by id desc
     </select>
-    
+
     <select id="selectEquipmentExceptionById" parameterType="Long" resultMap="EquipmentExceptionResult">
         <include refid="selectEquipmentExceptionVo"/>
         where id = #{id}
@@ -75,43 +89,54 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         </if>
     </select>
     <select id="selectEquipmentExceptionListByVo"
-            resultType="com.ruoyi.pojo.response.EquipmentExceptionResponseVo" resultMap="EquipmentExceptionResponseResult">
+            resultType="com.ruoyi.pojo.response.EquipmentExceptionResponseVo"
+            resultMap="EquipmentExceptionResponseResult">
         select equipment_exception.id, title,
-               equipment.site_name ,
-               equipment_exception.device_id,
-               driver.personnel_name,
-               driver.job_code,
-               equipment_exception.image,
-               equipment_exception.status,
-               equipment_exception.create_time,
-               equipment_exception.ex_type,
-               equipment_exception.remark,
-                equipment_exception.fleet_name,
-                equipment_exception.nbbm,
-                equipment_exception.line_name,
-                equipment_exception.plan_time
+        equipment.site_name ,
+        equipment_exception.device_id,
+        driver.personnel_name,
+        driver.job_code,
+        equipment_exception.image,
+        equipment_exception.status,
+        equipment_exception.create_time,
+        equipment_exception.ex_type,
+        equipment_exception.remark,
+        equipment_exception.fleet_name,
+        equipment_exception.nbbm,
+        equipment_exception.line_name,
+        equipment_exception.plan_time,
+        equipment_exception.sign_type
         from
-            equipment_exception
-            join driver on driver.job_code = equipment_exception.job_code
-            join equipment on equipment.device_id = equipment_exception.device_id
+        equipment_exception
+        join driver on driver.job_code = equipment_exception.job_code
+        join equipment on equipment.device_id = equipment_exception.device_id
         <where>
             equipment_exception.`status` != 1
-            <if test="fleetName != null  and fleetName != ''"> and equipment_exception.fleet_name like concat(#{fleetName},'%')</if>
-            <if test="lineName != null  and lineName != ''"> and equipment_exception.line_name like concat(#{lineName},'%')</if>
-            <if test="jobCode != null  and jobCode != ''"> and driver.job_code = #{jobCode}</if>
-            <if test="exType != null "> and ex_type = #{exType}</if>
-            <if test="id != null "> and equipment_exception.id #{id}</if>
+            <if test="fleetName != null  and fleetName != ''">and equipment_exception.fleet_name like
+                concat(#{fleetName},'%')
+            </if>
+            <if test="lineName != null  and lineName != ''">and equipment_exception.line_name like
+                concat(#{lineName},'%')
+            </if>
+            <if test="jobCode != null  and jobCode != ''">and driver.job_code = #{jobCode}</if>
+            <if test="exType != null ">and ex_type = #{exType}</if>
+            <if test="id != null ">and equipment_exception.id #{id}</if>
             <if test="date != null ">
                 and
                 equipment_exception.create_time &gt;= CONCAT(#{date}, ' 02:30:00')
                 and
-        equipment_exception.create_time &lt;= CONCAT(DATE_ADD(#{date}, INTERVAL 1 DAY), ' 02:30:00')
+                equipment_exception.create_time &lt;= CONCAT(DATE_ADD(#{date}, INTERVAL 1 DAY), ' 02:30:00')
             </if>
         </where>
+        order by equipment_exception.create_time
     </select>
     <select id="selectEquipmentExceptionByDeviceIdStatus"
             resultType="com.ruoyi.eexception.domain.EquipmentException">
-        select id from equipment_exception where device_id = #{deviceId} and ex_type = 4 and  `status` != 1 limit 1
+        select id
+        from equipment_exception
+        where device_id = #{deviceId}
+          and ex_type = 4
+          and `status` != 1 limit 1
     </select>
     <insert id="insertEquipmentException" parameterType="EquipmentException" useGeneratedKeys="true" keyProperty="id">
@@ -129,7 +154,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="nbbm != null and nbbm != ''">nbbm,</if>
             <if test="lineName != null and lineName != ''">line_name,</if>
             <if test="planTime != null">plan_time,</if>
-         </trim>
+            <if test="signType != null">sign_type,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="title != null">#{title},</if>
             <if test="deviceId != null">#{deviceId},</if>
@@ -143,7 +169,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="nbbm != null and nbbm != ''">#{nbbm},</if>
             <if test="lineName != null and lineName != ''">#{lineName},</if>
             <if test="planTime != null ">#{planTime},</if>
-         </trim>
+            <if test="signType != null ">#{signType},</if>
+        </trim>
     </insert>
     <update id="updateEquipmentException" parameterType="EquipmentException">
@@ -161,11 +188,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     </update>
     <delete id="deleteEquipmentExceptionById" parameterType="Long">
-        delete from equipment_exception where id = #{id}
+        delete
+        from equipment_exception
+        where id = #{id}
     </delete>
     <delete id="deleteEquipmentExceptionByIds" parameterType="String">
-        delete from equipment_exception where id in 
+        delete from equipment_exception where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>