diff --git a/src/main/java/org/energy/modules/smart/controller/OperationTicketController.java b/src/main/java/org/energy/modules/smart/controller/OperationTicketController.java index efe3fb7..9c11e39 100644 --- a/src/main/java/org/energy/modules/smart/controller/OperationTicketController.java +++ b/src/main/java/org/energy/modules/smart/controller/OperationTicketController.java @@ -15,7 +15,9 @@ */ package org.energy.modules.smart.controller; +import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.dayu.daf.core.log.annotation.ApiLog; import com.dayu.daf.core.tool.constant.DafConstant; import com.xkcoding.http.util.StringUtil; import io.swagger.annotations.Api; @@ -23,14 +25,18 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import lombok.AllArgsConstructor; + +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import com.dayu.daf.core.mp.support.Condition; import com.dayu.daf.core.mp.support.Query; import com.dayu.daf.core.tool.api.R; import com.dayu.daf.core.tool.utils.Func; -import org.energy.modules.inspection.entity.InspectionRoute; -import org.energy.modules.leger.entity.EquipmentLedger; +import lombok.SneakyThrows; +import org.apache.commons.codec.Charsets; +import org.energy.modules.smart.excel.OperationTicketExcel; +import org.energy.modules.system.util.DataUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.RequestParam; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -38,9 +44,12 @@ import org.energy.modules.smart.entity.OperationTicket; import org.energy.modules.smart.vo.OperationTicketVO; import org.energy.modules.smart.service.IOperationTicketService; import com.dayu.daf.core.boot.ctrl.DafController; +import springfox.documentation.annotations.ApiIgnore; +import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * 操作票一览 控制器 @@ -170,7 +179,7 @@ public class OperationTicketController extends DafController { @ApiOperationSupport(order = 8) @ApiOperation(value = "更新", notes = "传入ids") public R auditing(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return this.approve("2",ids); + return this.approve(2,ids); } /** @@ -181,13 +190,13 @@ public class OperationTicketController extends DafController { @ApiOperation(value = "更新", notes = "传入ids") public R reject(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return this.approve("3",ids); + return this.approve(3,ids); } /** * 驳回OR审核 操作票一览 */ - public R approve(String status, String ids) { + public R approve(Integer status, String ids) { List list = new ArrayList<>(); for (String id : ids.split(",")) { OperationTicket operationTicket = new OperationTicket(); @@ -222,4 +231,29 @@ public class OperationTicketController extends DafController { } return R.status(operationTicketService.updateBatchById(list)); } + /** + * 导出 + */ + @SneakyThrows + @GetMapping("export") + @ApiOperationSupport(order = 10) + @ApiOperation(value = "导出", notes = "传入") + @ApiLog + public void exportInspectionRoute(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { + entity.remove("daf-auth"); + entity.forEach((key, value) -> { + if (!"station".equals(key) && !"isQuakified".equals(key) && !"sts".equals(key)) + { + entity.put(key, "%" + value + "%"); + } + }); + OperationTicket vo = DataUtils.mapToEntity(entity, OperationTicket::new); + + List list = operationTicketService.export(vo); + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding(Charsets.UTF_8.name()); + String fileName = URLEncoder.encode("操作票数据导出", Charsets.UTF_8.name()); + response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); + EasyExcel.write(response.getOutputStream(), OperationTicketExcel.class).sheet("操作票").doWrite(list); + } } diff --git a/src/main/java/org/energy/modules/smart/entity/OperationTicket.java b/src/main/java/org/energy/modules/smart/entity/OperationTicket.java index 8fe1417..0f902c4 100644 --- a/src/main/java/org/energy/modules/smart/entity/OperationTicket.java +++ b/src/main/java/org/energy/modules/smart/entity/OperationTicket.java @@ -170,7 +170,7 @@ public class OperationTicket extends BaseEntity { * 审核状态 */ @ApiModelProperty(value = "审核状态") - private String reviewStatus; + private Integer reviewStatus; } diff --git a/src/main/java/org/energy/modules/smart/excel/OperationTicketExcel.java b/src/main/java/org/energy/modules/smart/excel/OperationTicketExcel.java new file mode 100644 index 0000000..8ef5d7b --- /dev/null +++ b/src/main/java/org/energy/modules/smart/excel/OperationTicketExcel.java @@ -0,0 +1,202 @@ +/** + * Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com). + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.energy.modules.smart.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * EquipmentLedge model export + * @author edwong + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(16) +public class OperationTicketExcel implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * KKS编码 + */ + @ColumnWidth(20) + @ExcelProperty(value = "KKS编码") + private String kksEncoding; + /** + * KSS描述 + */ + @ColumnWidth(20) + @ExcelProperty(value ="KSS描述") + private String kksDescription; + /** + * 场站 + */ + @ColumnWidth(20) + @ExcelProperty(value = "场站") + private String stationName; + /** + * 操作票编号 + */ + @ColumnWidth(20) + @ExcelProperty(value ="操作票编号") + private String operationTicketNo; + + /** + * 工作班组 + */ + @ColumnWidth(20) + @ExcelProperty(value = "工作班组") + private String workTeam; + /** + * 工作负责人 + */ + @ColumnWidth(20) + @ExcelProperty(value = "工作负责人") + private String workLeader; + /** + * 监护人 + */ + @ColumnWidth(20) + @ExcelProperty(value = "监护人") + private String guardian; + /** + * 发令人 + */ + @ColumnWidth(20) + @ExcelProperty(value = "发令人") + private String givingOrdersUser; + /** + * 作业风险等级 + */ + @ColumnWidth(20) + @ExcelProperty(value ="作业风险等级") + private String jobRiskLevel; + /** + * 控制等级 + */ + @ColumnWidth(20) + @ExcelProperty(value = "控制等级") + private String controlLevel; + /** + * 计划开始时间 + */ + @ColumnWidth(20) + @ExcelProperty(value = "计划开始时间") + private String plannedStartTime; + /** + * 计划结束时间 + */ + @ColumnWidth(20) + @ExcelProperty(value = "计划结束时间") + private String plannedEndTime; + /** + * 工作签发时间 + */ + @ColumnWidth(20) + @ExcelProperty(value ="工作签发时间") + private String workIssuanceTime; + /** + * 人员资格 + */ + @ColumnWidth(20) + @ExcelProperty(value ="人员资格") + private String personnelQualification; + /** + * 人员状态 + */ + @ColumnWidth(20) + @ExcelProperty(value = "人员状态") + private String personnelState; + /** + * 人员防护 + */ + @ColumnWidth(20) + @ExcelProperty(value = "人员防护") + private String personnelPritection; + /** + * 安全距离 + */ + @ColumnWidth(20) + @ExcelProperty(value = "安全距离") + private String safeDistance; + /** + * 走错间隔 + */ + @ColumnWidth(20) + @ExcelProperty(value = "走错间隔") + private String wrongInterval; + /** + * 安全措施落实 + */ + @ColumnWidth(20) + @ExcelProperty(value = "安全措施落实") + private String securityMeasuresImplement; + /** + * 开展过程检查 + */ + @ColumnWidth(20) + @ExcelProperty(value = "开展过程检查") + private String conductProcessInspections; + /** + * 安全培训落实 + */ + @ColumnWidth(20) + @ExcelProperty(value = "安全培训落实") + private String securityTrainingImplement; + /** + * 其他 + */ + @ColumnWidth(20) + @ExcelProperty(value = "其他") + private String other; + /** + * 安全技术措施交底 + */ + @ColumnWidth(20) + @ExcelProperty(value = "安全技术措施交底") + private String securityMeasuresDisclosure; + /** + * 作业后风险管控情况评价 + */ + @ColumnWidth(20) + @ExcelProperty(value ="作业后风险管控情况评价") + private String riskControlEvaluation; + /** + * 状态 + */ + @ColumnWidth(20) + @ExcelProperty(value ="状态") + private String stsName; + /** + * 是否合格 + */ + @ColumnWidth(20) + @ExcelProperty(value = "是否合格") + private String isQuakifiedName; + /** + * 审核状态 + */ + @ColumnWidth(20) + @ExcelProperty(value = "审核状态") + private String reviewStatus; + +} diff --git a/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.java b/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.java index d83e530..10583d3 100644 --- a/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.java +++ b/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.java @@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Param; import org.energy.modules.leger.entity.EquipmentLedger; import org.energy.modules.leger.excel.EquipmentLedgerExcel; import org.energy.modules.smart.entity.OperationTicket; +import org.energy.modules.smart.excel.OperationTicketExcel; import org.energy.modules.smart.vo.OperationTicketVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -27,7 +28,7 @@ public interface OperationTicketMapper extends BaseMapper { */ List selectOperationTicketPage(IPage page, OperationTicketVO operationTicket); - List exportData(@Param("ew") Wrapper queryWrapper); + List exportData(@Param("entity")OperationTicket operationTicket); List selectOperationTicketPageExt(IPage page, @Param("ew") Wrapper queryWrapper); } diff --git a/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.xml b/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.xml index 576397a..295a063 100644 --- a/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.xml +++ b/src/main/java/org/energy/modules/smart/mapper/OperationTicketMapper.xml @@ -118,4 +118,45 @@ , a.id + + + + + + diff --git a/src/main/java/org/energy/modules/smart/service/IOperationTicketService.java b/src/main/java/org/energy/modules/smart/service/IOperationTicketService.java index 810ba06..32a9c5b 100644 --- a/src/main/java/org/energy/modules/smart/service/IOperationTicketService.java +++ b/src/main/java/org/energy/modules/smart/service/IOperationTicketService.java @@ -1,8 +1,7 @@ package org.energy.modules.smart.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import org.energy.modules.inspection.entity.InspectionRoute; -import org.energy.modules.inspection.excel.InspectionRouteExcel; +import org.energy.modules.smart.excel.OperationTicketExcel; import org.energy.modules.smart.entity.OperationTicket; import org.energy.modules.smart.vo.OperationTicketVO; import com.dayu.daf.core.mp.base.BaseService; @@ -29,4 +28,11 @@ public interface IOperationTicketService extends BaseService { IPage selectOperationTicketPageExt(IPage page, Wrapper wrapper); + /** + * 获取导出数据 + * + * @param operationTicket + * @return + */ + List export(OperationTicket operationTicket); } diff --git a/src/main/java/org/energy/modules/smart/service/impl/OperationTicketServiceImpl.java b/src/main/java/org/energy/modules/smart/service/impl/OperationTicketServiceImpl.java index 0a3e073..5edad37 100644 --- a/src/main/java/org/energy/modules/smart/service/impl/OperationTicketServiceImpl.java +++ b/src/main/java/org/energy/modules/smart/service/impl/OperationTicketServiceImpl.java @@ -1,8 +1,7 @@ package org.energy.modules.smart.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import org.energy.modules.inspection.entity.InspectionRoute; -import org.energy.modules.inspection.excel.InspectionRouteExcel; +import org.energy.modules.smart.excel.OperationTicketExcel; import org.energy.modules.smart.entity.OperationTicket; import org.energy.modules.smart.vo.OperationTicketVO; import org.energy.modules.smart.mapper.OperationTicketMapper; @@ -32,4 +31,9 @@ public class OperationTicketServiceImpl extends BaseServiceImpl export(OperationTicket operationTicket) { + List list = baseMapper.exportData(operationTicket); + return list; + } }