From 1f46310c58fe9479c2a0ba9bd6c3a1697e5c2344 Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Tue, 16 Jul 2024 09:14:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=A4=84=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InspectionPlanController.java | 22 ++++++------ .../controller/InspectionRouteController.java | 24 ++++++------- .../inspection/excel/InspectionPlanExcel.java | 2 +- .../mapper/InspectionPlanMapper.java | 4 +-- .../mapper/InspectionPlanMapper.xml | 33 ++++++++++------- .../mapper/InspectionRouteMapper.java | 4 +-- .../mapper/InspectionRouteMapper.xml | 35 +++++++++++-------- .../service/IInspectionPlanService.java | 6 ++-- .../service/IInspectionRouteService.java | 9 +---- .../impl/InspectionPlanServiceImpl.java | 6 ++-- .../impl/InspectionRouteServiceImpl.java | 5 ++- 11 files changed, 71 insertions(+), 79 deletions(-) diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java index 4c295ca..9c08b2b 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionPlanController.java @@ -18,7 +18,6 @@ package org.energy.modules.inspection.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; import io.swagger.annotations.ApiOperation; @@ -36,6 +35,7 @@ import com.dayu.daf.core.tool.utils.Func; import lombok.SneakyThrows; import org.apache.commons.codec.Charsets; import org.energy.modules.inspection.excel.InspectionPlanExcel; +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; @@ -215,17 +215,15 @@ public class InspectionPlanController extends DafController { @ApiOperation(value = "导出", notes = "传入") @ApiLog public void exportInspectionRoute(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { - if (entity.containsKey("station_equal")) { - entity.put("station_equal", Integer.parseInt((String) entity.get("station_equal"))); - } - if (entity.containsKey("planStatus_equal")) { - entity.put("planStatus_equal", Integer.parseInt((String) entity.get("planStatus_equal"))); - } - QueryWrapper queryWrapper = Condition.getQueryWrapper(entity, InspectionPlan.class); - queryWrapper.lambda().eq(InspectionPlan::getIsDeleted, DafConstant.DB_NOT_DELETED); - queryWrapper.orderByAsc("plan_no"); - - List list = inspectionPlanService.export(queryWrapper); + entity.remove("daf-auth"); + entity.forEach((key, value) -> { + if (!"station".equals(key) && !"planStatus".equals(key)) + { + entity.put(key, "%" + value + "%"); + } + }); + InspectionPlan vo = DataUtils.mapToEntity(entity, InspectionPlan::new); + List list = inspectionPlanService.export(vo); response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding(Charsets.UTF_8.name()); String fileName = URLEncoder.encode("巡检计划数据导出", Charsets.UTF_8.name()); diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java index e63a79d..0a24905 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java @@ -18,7 +18,6 @@ package org.energy.modules.inspection.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; import io.swagger.annotations.ApiOperation; @@ -36,8 +35,7 @@ import com.dayu.daf.core.tool.utils.Func; import lombok.SneakyThrows; import org.apache.commons.codec.Charsets; import org.energy.modules.inspection.excel.InspectionRouteExcel; -import org.energy.modules.leger.entity.EquipmentLedger; -import org.energy.modules.system.entity.Dict; +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; @@ -218,17 +216,15 @@ public class InspectionRouteController extends DafController { @ApiOperation(value = "导出", notes = "传入") @ApiLog public void exportInspectionRoute(@ApiIgnore @RequestParam Map entity, HttpServletResponse response) { - if (entity.containsKey("stations_equal")) { - entity.put("stations_equal", Integer.parseInt((String) entity.get("stations_equal"))); - } - if (entity.containsKey("istatus_equal")) { - entity.put("istatus_equal", Integer.parseInt((String) entity.get("istatus_equal"))); - } - QueryWrapper queryWrapper = Condition.getQueryWrapper(entity, InspectionRoute.class); - queryWrapper.lambda().eq(InspectionRoute::getIsDeleted, DafConstant.DB_NOT_DELETED); - queryWrapper.orderByAsc("route_no"); - - List list = inspectionRouteService.export(queryWrapper); + entity.remove("daf-auth"); + entity.forEach((key, value) -> { + if (!"stations".equals(key) && !"istatus".equals(key)) + { + entity.put(key, "%" + value + "%"); + } + }); + InspectionRoute vo = DataUtils.mapToEntity(entity, InspectionRoute::new); + List list = inspectionRouteService.export(vo); response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding(Charsets.UTF_8.name()); String fileName = URLEncoder.encode("巡检路线数据导出", Charsets.UTF_8.name()); diff --git a/src/main/java/org/energy/modules/inspection/excel/InspectionPlanExcel.java b/src/main/java/org/energy/modules/inspection/excel/InspectionPlanExcel.java index 5e6b038..3bae5fb 100644 --- a/src/main/java/org/energy/modules/inspection/excel/InspectionPlanExcel.java +++ b/src/main/java/org/energy/modules/inspection/excel/InspectionPlanExcel.java @@ -40,7 +40,7 @@ public class InspectionPlanExcel implements Serializable { @ColumnWidth(15) @ExcelProperty(value = "计划名称") - private String planNme; + private String planName; @ColumnWidth(15) @ExcelProperty(value = "场站") diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.java b/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.java index 031bce7..f6741e7 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.java +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.java @@ -1,9 +1,7 @@ package org.energy.modules.inspection.mapper; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.apache.ibatis.annotations.Param; import org.energy.modules.inspection.entity.InspectionPlan; -import org.energy.modules.inspection.entity.InspectionRoute; import org.energy.modules.inspection.excel.InspectionPlanExcel; import org.energy.modules.inspection.vo.InspectionPlanVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -27,7 +25,7 @@ public interface InspectionPlanMapper extends BaseMapper { */ List selectInspectionPlanPage(IPage page, InspectionPlanVO inspectionPlan); - List exportData(@Param("ew") Wrapper queryWrapper); + List exportData(@Param("entity") InspectionPlan inspectionPlan); /** * 获取路线编号 diff --git a/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml b/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml index 4e3d9c0..cc148a8 100644 --- a/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml +++ b/src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml @@ -30,19 +30,26 @@