导出 处理修改

src/main/java/org/energy/modules/inspection/controller/InspectionTasksController.java

@@ -35,9 +35,12 @@ import com.dayu.daf.core.tool.api.R;
 import com.dayu.daf.core.tool.utils.Func;
 import lombok.SneakyThrows;
 import org.apache.commons.codec.Charsets;
+import org.energy.modules.inspection.entity.InspectionRoute;
+import org.energy.modules.inspection.excel.InspectionRouteExcel;
 import org.energy.modules.inspection.excel.InspectionTasksExcel;
 import org.energy.modules.leger.entity.EquipmentLedger;
 import org.energy.modules.leger.excel.EquipmentLedgerExcel;
+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;
@@ -228,15 +231,15 @@ public class InspectionTasksController extends DafController {
 	@ApiOperation(value = "导出", notes = "传入")
 	@ApiLog
 	public void exportUser(@ApiIgnore @RequestParam Map<String, Object> entity, HttpServletResponse response) {
-		if (entity.containsKey("station_equal")) {
-			entity.put("station_equal", Integer.parseInt((String) entity.get("station_equal")));
-		}
-		if (entity.containsKey("taskStatus_equal")) {
-			entity.put("taskStatus_equal", Integer.parseInt((String) entity.get("taskStatus_equal")));
-		}
-		QueryWrapper<InspectionTasks> queryWrapper = Condition.getQueryWrapper(entity, InspectionTasks.class);
-		queryWrapper.lambda().eq(InspectionTasks::getIsDeleted, DafConstant.DB_NOT_DELETED);
-		List<InspectionTasksExcel> list = inspectionTasksService.export(queryWrapper);
+		entity.remove("daf-auth");
+		entity.forEach((key, value) -> {
+			if (!"station".equals(key) && !"taskStatus".equals(key))
+			{
+				entity.put(key, "%" + value + "%");
+			}
+		});
+		InspectionTasks vo = DataUtils.mapToEntity(entity, InspectionTasks::new);
+		List<InspectionTasksExcel> list = inspectionTasksService.export(vo);
 		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/mapper/InspectionTasksMapper.java

@@ -32,7 +32,7 @@ public interface InspectionTasksMapper extends BaseMapper<InspectionTasks> {
 	/**
 	 * 导出
 	 */
-	List<InspectionTasksExcel> exportData(@Param("ew") Wrapper<InspectionTasks> queryWrapper);
+	List<InspectionTasksExcel> exportData(@Param("entity") InspectionTasks inspectionTasks);
 
 	/**
 	 * 获取最大任务编号

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

@@ -36,25 +36,34 @@
     </select>
 
     <select id="exportData" resultType="org.energy.modules.inspection.excel.InspectionTasksExcel">
-        SELECT task_no
-               ,task_name
-               ,CASE
-                   WHEN station = '1' THEN '景和光伏'
-                   WHEN station = '2' THEN '北沙一光伏'
-                   WHEN station = '3' THEN '北沙二光伏'
-                   WHEN station = '4' THEN '达坂城风电一场'
-                   ELSE ''
-                   END AS station_ext
-               ,task_start_date
-               ,task_end_date
-               ,responsible_person
-               ,CASE
-                   WHEN task_status = '1' THEN '已启动'
-                   WHEN task_status = '2' THEN '已停止'
-                   ELSE ''
-                   END AS task_status_ext
-               , cancel_reason
-        FROM i_inspection_tasks ${ew.customSqlSegment}
+        SELECT a.task_no, a.task_name, dic1.dict_value AS stationExt, a.task_start_date
+            , a.task_end_date, a.responsible_person, dic2.dict_value AS taskStatusExt
+            , a.cancel_reason
+        FROM i_inspection_tasks a
+        LEFT JOIN sys_dict dic1 ON dic1.code = 'station' AND dic1.dict_key = a.station AND dic1.is_deleted = '0'
+        LEFT JOIN sys_dict dic2 ON dic2.code = 'task_status' AND dic2.dict_key = a.task_status AND dic2.is_deleted = '0'
+        WHERE a.is_deleted = 0
+        <if test="entity.taskNo != null and entity.taskNo != ''">
+            AND a.task_no LIKE #{entity.taskNo}
+        </if>
+        <if test="entity.taskName != null and entity.taskName != ''">
+            AND a.task_name LIKE #{entity.taskName}
+        </if>
+        <if test="entity.station != null and entity.station != ''">
+            AND a.station = #{entity.station}
+        </if>
+        <if test="entity.taskStartDate != null and entity.taskStartDate != ''">
+            AND a.task_start_date LIKE #{entity.taskStartDate}
+        </if>
+        <if test="entity.taskEndDate != null and entity.taskEndDate != ''">
+            AND a.task_end_date LIKE #{entity.taskEndDate}
+        </if>
+        <if test="entity.responsiblePerson != null and entity.responsiblePerson != ''">
+            AND a.responsible_person LIKE #{entity.responsiblePerson}
+        </if>
+        <if test="entity.taskStatus != null and entity.taskStatus != ''">
+            AND a.task_status = #{entity.taskStatus}
+        </if>
     </select>
 
     <select id="getMaxTaskNO" resultType="java.lang.String">

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

@@ -1,7 +1,9 @@
 package org.energy.modules.inspection.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import org.energy.modules.inspection.entity.InspectionRoute;
 import org.energy.modules.inspection.entity.InspectionTasks;
+import org.energy.modules.inspection.excel.InspectionRouteExcel;
 import org.energy.modules.inspection.excel.InspectionTasksExcel;
 import org.energy.modules.inspection.vo.InspectionTasksVO;
 import com.dayu.daf.core.mp.base.BaseService;
@@ -30,11 +32,8 @@ public interface IInspectionTasksService extends BaseService<InspectionTasks> {
 
 	/**
 	 * 获取导出数据
-	 *
-	 * @param queryWrapper
-	 * @return
 	 */
-	List<InspectionTasksExcel> export(Wrapper<InspectionTasks> queryWrapper);
+	List<InspectionTasksExcel> export(InspectionTasks InspectionTasks);
 
 	/**
 	 * 获取最大任务编号

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

@@ -29,8 +29,8 @@ public class InspectionTasksServiceImpl extends BaseServiceImpl<InspectionTasksM
 	}
 
 	@Override
-	public List<InspectionTasksExcel> export(Wrapper<InspectionTasks> queryWrapper) {
-		List<InspectionTasksExcel> list = baseMapper.exportData(queryWrapper);
+	public List<InspectionTasksExcel> export(InspectionTasks inspectionTasks) {
+		List<InspectionTasksExcel> list = baseMapper.exportData(inspectionTasks);
 		return list;
 	}