From c4df5d2cfaa12a1c8a72ef25934fdc31d5be65a1 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期日, 29 九月 2024 11:21:21 +0800 Subject: [PATCH] 工单导出 --- ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java index 6f47e90..32536ae 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java @@ -1,5 +1,6 @@ package com.ycl.platform.service.impl; +import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -55,6 +56,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; +import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.*; @@ -93,7 +95,6 @@ @Override @Transactional(rollbackFor = Exception.class) - //TODO锛氭竻绌篟edis瀹氭椂浠诲姟 public synchronized Boolean innerAddWorkOrder(List<WorkOrder> workOrderList) { int total = workOrderList.size(); workOrderList.stream().filter(item -> { @@ -942,4 +943,25 @@ workOrder.setImgList(imgList); return Result.ok().data(workOrder); } + + @Override + public List<WorkOrderVO> export(WorkOrderExportQuery query) { + query.setUnitId(SecurityUtils.getUnitId()); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + if (query.getStart() == null) { + query.setStart(format.format(DateUtils.getDayStart(new Date()))); + } else { + query.setStart(query.getStart() + " 00:00:00"); + } + if (query.getEnd() == null) { + query.setStart(format.format(DateUtils.getDayEnd(new Date()))); + } else { + query.setEnd(query.getEnd() + " 23:59:59"); + } + + List<WorkOrderVO> export = baseMapper.export(query); + + System.out.println(export); + return export; + } } -- Gitblit v1.8.0