Commit 2ed88edd authored by 周昊's avatar 周昊
Browse files

1、修改pc端导出excel

parent d367185d

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanController.java

+9 −0
Original line number Diff line number Diff line
@@ -179,6 +179,15 @@ public class RiskPlanController extends BaseController 
    public void export(@PathVariable Long planId, HttpServletResponse response) {

        try {

            List<RiskInherentListExportDto> dtos = riskPlanInherentListService.getPlanInherentListByPlanId(planId);

            for (RiskInherentListExportDto dto : dtos) {

                if ("1".equals(dto.getMajorHazardSource())){

                    dto.setMajorHazardSource("是");

                }else {

                    dto.setMajorHazardSource("否");

                    dto.setHazardSourceName("/");

                    dto.setMajorHazardDescription("/");

                }

            }

            riskPlanInherentListService.exportPlanInherentList(response,dtos);

        } catch (IOException e) {

            e.printStackTrace();

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanInherentListServiceImpl.java

+6 −6
Original line number Diff line number Diff line
@@ -270,11 +270,11 @@ public class RiskPlanInherentListServiceImpl 
        writer.merge(1, 1, 6, 7, "固有风险", true);

        writer.merge(1, 1, 8, 9, "现有风险", true);

        Cell cell62 = writer.getOrCreateCell(6, 2);

        CellUtil.setCellValue(cell62, "风险清单", writer.getHeadCellStyle());

        CellUtil.setCellValue(cell62, "危险源名称", writer.getHeadCellStyle());

        Cell cell72 = writer.getOrCreateCell(7, 2);

        CellUtil.setCellValue(cell72, "风险等级", writer.getHeadCellStyle());

        Cell cell82 = writer.getOrCreateCell(8, 2);

        CellUtil.setCellValue(cell82, "风险清单", writer.getHeadCellStyle());

        CellUtil.setCellValue(cell82, "危险源名称", writer.getHeadCellStyle());

        Cell cell92 = writer.getOrCreateCell(9, 2);

        CellUtil.setCellValue(cell92, "风险等级", writer.getHeadCellStyle());

        writer.merge(1, 2, 10, 10, "风险点位置", true);
@@ -296,8 +296,8 @@ public class RiskPlanInherentListServiceImpl 
        CellUtil.setCellValue(cell182, "人员联系方式", writer.getHeadCellStyle());

        //重大危险源管理

        writer.merge(0, 0, 19, 21, "重大危险源管理", true);

        writer.merge(1, 2, 19, 19, "重大危险源名称", true);

        writer.merge(1, 2, 20, 20, "是否存在重大危险源", true);

        writer.merge(1, 2, 19, 19, "是否存在重大危险源", true);

        writer.merge(1, 2, 20, 20, "重大危险源名称", true);

        writer.merge(1, 2, 21, 21, "重大危险源描述", true);

        //判定依据

        writer.merge(0, 2, 22, 22, "判定依据", true);
@@ -374,10 +374,10 @@ public class RiskPlanInherentListServiceImpl 
            //重大危险源管理

            {

                Cell celli19 = writer.getOrCreateCell(19, i+3);

                CellUtil.setCellValue(celli19, dto.getHazardSourceName(), writer.getCellStyle());

                CellUtil.setCellValue(celli19, dto.getMajorHazardSource(), writer.getCellStyle());



                Cell celli20 = writer.getOrCreateCell(20, i+3);

                CellUtil.setCellValue(celli20, dto.getMajorHazardSource(), writer.getCellStyle());

                CellUtil.setCellValue(celli20, dto.getHazardSourceName(), writer.getCellStyle());



                Cell celli21 = writer.getOrCreateCell(21, i+3);

                CellUtil.setCellValue(celli21, dto.getMajorHazardDescription(), writer.getCellStyle());

censoft-rongtong/src/main/resources/mapper/system/RiskPlanInherentListMapper.xml

+1 −1
Original line number Diff line number Diff line
@@ -442,6 +442,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
        WHERE

            rpil.plan_id = #{planId}

            AND rpil.id IS NOT NULL

            GROUP BY rpel.id

            GROUP BY rpil.id

    </select>

</mapper>
 
 No newline at end of file