导出处理修正

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<String, Object> entity, HttpServletResponse response) {
-		if (entity.containsKey("station_equal")) {
+		entity.remove("daf-auth");
-			entity.put("station_equal", Integer.parseInt((String) entity.get("station_equal")));
+		entity.forEach((key, value) -> {
-		}
+			if (!"station".equals(key) && !"planStatus".equals(key))
-		if (entity.containsKey("planStatus_equal")) {
+			{
-			entity.put("planStatus_equal", Integer.parseInt((String) entity.get("planStatus_equal")));
+				entity.put(key, "%" + value + "%");
-		}
+			}
-		QueryWrapper<InspectionPlan> queryWrapper = Condition.getQueryWrapper(entity, InspectionPlan.class);
+		});
-		queryWrapper.lambda().eq(InspectionPlan::getIsDeleted, DafConstant.DB_NOT_DELETED);
+		InspectionPlan vo = DataUtils.mapToEntity(entity, InspectionPlan::new);
-		queryWrapper.orderByAsc("plan_no");
+		List<InspectionPlanExcel> list = inspectionPlanService.export(vo);
-
-		List<InspectionPlanExcel> list = inspectionPlanService.export(queryWrapper);
 		response.setContentType("application/vnd.ms-excel");
 		response.setCharacterEncoding(Charsets.UTF_8.name());
 		String fileName = URLEncoder.encode("巡检计划数据导出", Charsets.UTF_8.name());

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.util.DataUtils;
-import org.energy.modules.system.entity.Dict;
 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<String, Object> entity, HttpServletResponse response) {
-		if (entity.containsKey("stations_equal")) {
+		entity.remove("daf-auth");
-			entity.put("stations_equal", Integer.parseInt((String) entity.get("stations_equal")));
+		entity.forEach((key, value) -> {
-		}
+			if (!"stations".equals(key) && !"istatus".equals(key))
-		if (entity.containsKey("istatus_equal")) {
+			{
-			entity.put("istatus_equal", Integer.parseInt((String) entity.get("istatus_equal")));
+				entity.put(key, "%" + value + "%");
-		}
+			}
-		QueryWrapper<InspectionRoute> queryWrapper = Condition.getQueryWrapper(entity, InspectionRoute.class);
+		});
-		queryWrapper.lambda().eq(InspectionRoute::getIsDeleted, DafConstant.DB_NOT_DELETED);
+		InspectionRoute vo = DataUtils.mapToEntity(entity, InspectionRoute::new);
-		queryWrapper.orderByAsc("route_no");
+		List<InspectionRouteExcel> list = inspectionRouteService.export(vo);
-
-		List<InspectionRouteExcel> list = inspectionRouteService.export(queryWrapper);
 		response.setContentType("application/vnd.ms-excel");
 		response.setCharacterEncoding(Charsets.UTF_8.name());
 		String fileName = URLEncoder.encode("巡检路线数据导出", Charsets.UTF_8.name());

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 = "场站")

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<InspectionPlan> {
 	 */
 	List<InspectionPlanVO> selectInspectionPlanPage(IPage page, InspectionPlanVO inspectionPlan);
 
-	List<InspectionPlanExcel> exportData(@Param("ew") Wrapper<InspectionPlan> queryWrapper);
+	List<InspectionPlanExcel> exportData(@Param("entity") InspectionPlan inspectionPlan);
 
 	/**
 	 * 获取路线编号

src/main/java/org/energy/modules/inspection/mapper/InspectionPlanMapper.xml

@@ -30,19 +30,26 @@
 
     <select id="exportData" resultType="org.energy.modules.inspection.excel.InspectionPlanExcel">
         SELECT plan_no, plan_name, plan_type, period_type, period_value, start_time, end_time, cancel_reason
-             ,CASE
+            ,dic1.dict_value AS station_name, dic2.dict_value AS  plan_status_name
-                  WHEN station = '1' THEN '景和光伏'
+        FROM i_inspection_plan  a
-                  WHEN station = '2' THEN '北沙一光伏'
+        LEFT JOIN sys_dict dic1 ON dic1.code = 'station' AND dic1.dict_key = a.station AND dic1.is_deleted = '0'
-                  WHEN station = '3' THEN '北沙二光伏'
+        LEFT JOIN sys_dict dic2 ON dic2.code = 'istatus' AND dic2.dict_key = a.plan_status AND dic2.is_deleted = '0'
-                  WHEN station = '4' THEN '达坂城风电一场'
+        WHERE a.is_deleted = 0
-                  ELSE ''
+        <if test="entity.planNo != null and entity.planNo != ''">
-            END AS station_name
+            AND a.plan_no LIKE #{entity.planNo}
-             ,CASE
+        </if>
-                  WHEN plan_status = '1' THEN '已生效'
+        <if test="entity.planName != null and entity.planName != ''">
-                  WHEN plan_status = '0' THEN '未生效'
+            AND a.plan_name LIKE #{entity.planName}
-                  ELSE ''
+        </if>
-            END AS  plan_status_name
+        <if test="entity.station != null and entity.station != ''">
-        FROM i_inspection_plan ${ew.customSqlSegment}
+            AND a.station = #{entity.station}
+        </if>
+        <if test="entity.periodType != null and entity.periodType != ''">
+            AND a.period_type LIKE #{entity.periodType}
+        </if>
+        <if test="entity.planStatus != null and entity.planStatus != ''">
+            AND a.plan_status = #{entity.planStatus}
+        </if>
     </select>
 
     <select id="getPlanList" resultMap="inspectionPlanResultMap">

src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.java

@@ -1,13 +1,11 @@
 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.InspectionRoute;
 import org.energy.modules.inspection.excel.InspectionRouteExcel;
 import org.energy.modules.inspection.vo.InspectionRouteVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.energy.modules.system.entity.Dict;
 
 import java.util.List;
 
@@ -28,7 +26,7 @@ public interface InspectionRouteMapper extends BaseMapper<InspectionRoute> {
 	 */
 	List<InspectionRouteVO> selectInspectionRoutePage(IPage page, InspectionRouteVO inspectionRoute);
 
-	List<InspectionRouteExcel> exportData(@Param("ew") Wrapper<InspectionRoute> queryWrapper);
+	List<InspectionRouteExcel> exportData(@Param("entity") InspectionRoute inspectionRoute);
 
 	/**
 	 * 获取路线编号

src/main/java/org/energy/modules/inspection/mapper/InspectionRouteMapper.xml

@@ -26,20 +26,27 @@
     </select>
 
     <select id="exportData" resultType="org.energy.modules.inspection.excel.InspectionRouteExcel">
-        SELECT route_no, route_name, type, factory, cancel_reason
+        SELECT a.route_no, a.route_name, a.type, a.factory, a.cancel_reason
-            ,CASE
+            ,dic1.dict_value AS stations_name, dic2.dict_value AS istatus_name
-               WHEN stations = '1' THEN '景和光伏'
+        FROM i_inspection_route a
-               WHEN stations = '2' THEN '北沙一光伏'
+        LEFT JOIN sys_dict dic1 ON dic1.code = 'station' AND dic1.dict_key = a.stations AND dic1.is_deleted = '0'
-               WHEN stations = '3' THEN '北沙二光伏'
+        LEFT JOIN sys_dict dic2 ON dic2.code = 'istatus' AND dic2.dict_key = a.istatus AND dic2.is_deleted = '0'
-               WHEN stations = '4' THEN '达坂城风电一场'
+        WHERE a.is_deleted = 0
-               ELSE ''
+        <if test="entity.routeNo != null and entity.routeNo != ''">
-               END AS stations_name
+            AND a.route_no LIKE #{entity.routeNo}
-            ,CASE
+        </if>
-               WHEN istatus = '1' THEN '已生效'
+        <if test="entity.routeName != null and entity.routeName != ''">
-               WHEN istatus = '0' THEN '未生效'
+            AND a.route_name LIKE #{entity.routeName}
-               ELSE ''
+        </if>
-               END AS  istatus_name
+        <if test="entity.stations != null and entity.stations != ''">
-        FROM i_inspection_route ${ew.customSqlSegment}
+            AND a.stations = #{entity.stations}
+        </if>
+        <if test="entity.type != null and entity.type != ''">
+            AND a.type LIKE #{entity.type}
+        </if>
+        <if test="entity.istatus != null and entity.istatus != ''">
+            AND a.istatus = #{entity.istatus}
+        </if>
     </select>
 
     <select id="getRouteList" resultMap="inspectionRouteResultMap">

src/main/java/org/energy/modules/inspection/service/IInspectionPlanService.java

@@ -1,8 +1,6 @@
 package org.energy.modules.inspection.service;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 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.dayu.daf.core.mp.base.BaseService;
@@ -30,10 +28,10 @@ public interface IInspectionPlanService extends BaseService<InspectionPlan> {
 	/**
 	 * 获取导出数据
 	 *
-	 * @param queryWrapper
+	 * @param inspectionRoute
 	 * @return
 	 */
-	List<InspectionPlanExcel> export(Wrapper<InspectionPlan> queryWrapper);
+	List<InspectionPlanExcel> export(InspectionPlan inspectionRoute);
 
 	/**
 	 * 获取路线编号

src/main/java/org/energy/modules/inspection/service/IInspectionRouteService.java

@@ -4,7 +4,6 @@ import org.energy.modules.inspection.entity.InspectionRoute;
 import org.energy.modules.inspection.vo.InspectionRouteVO;
 import com.dayu.daf.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import org.energy.modules.inspection.excel.InspectionRouteExcel;
 
 import java.util.List;
@@ -26,13 +25,7 @@ public interface IInspectionRouteService extends BaseService<InspectionRoute> {
 	 */
 	IPage<InspectionRouteVO> selectInspectionRoutePage(IPage<InspectionRouteVO> page, InspectionRouteVO inspectionRoute);
 
-	/**
+	List<InspectionRouteExcel> export(InspectionRoute InspectionRoute);
-	 * 获取导出数据
-	 *
-	 * @param queryWrapper
-	 * @return
-	 */
-	List<InspectionRouteExcel> export(Wrapper<InspectionRoute> queryWrapper);
 
 	/**
 	 * 获取路线编号

src/main/java/org/energy/modules/inspection/service/impl/InspectionPlanServiceImpl.java

@@ -1,8 +1,6 @@
 package org.energy.modules.inspection.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 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 org.energy.modules.inspection.mapper.InspectionPlanMapper;
@@ -28,8 +26,8 @@ public class InspectionPlanServiceImpl extends BaseServiceImpl<InspectionPlanMap
 	}
 
 	@Override
-	public List<InspectionPlanExcel> export(Wrapper<InspectionPlan> queryWrapper) {
+	public List<InspectionPlanExcel> export(InspectionPlan inspectionPlan) {
-		List<InspectionPlanExcel> list = baseMapper.exportData(queryWrapper);
+		List<InspectionPlanExcel> list = baseMapper.exportData(inspectionPlan);
 		return list;
 	}
 

src/main/java/org/energy/modules/inspection/service/impl/InspectionRouteServiceImpl.java

@@ -1,6 +1,5 @@
 package org.energy.modules.inspection.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.inspection.vo.InspectionRouteVO;
@@ -27,8 +26,8 @@ public class InspectionRouteServiceImpl extends BaseServiceImpl<InspectionRouteM
 	}
 
 	@Override
-	public List<InspectionRouteExcel> export(Wrapper<InspectionRoute> queryWrapper) {
+	public List<InspectionRouteExcel> export(InspectionRoute inspectionRoute) {
-		List<InspectionRouteExcel> list = baseMapper.exportData(queryWrapper);
+		List<InspectionRouteExcel> list = baseMapper.exportData(inspectionRoute);
 		return list;
 	}