更新内部地址导出功能

src/main/java/com/sqx/modules/address/query/InsideAddressQuery.java

@@ -7,6 +7,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.util.StringUtils;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 
 /**
@@ -38,11 +41,12 @@ public class InsideAddressQuery extends PageQuery {
     private String userId;
 
     public String toStrMessage() {
+        DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         StringBuilder stringBuilder=new StringBuilder();
         stringBuilder
                 .append(StringUtils.hasText(addressDetail)?"地址详情："+addressDetail+";":"")
-                .append(ObjectUtils.isNotEmpty(startTime) ?"查询开始时间："+startTime+";":"")
-                .append(ObjectUtils.isNotEmpty(endTime)?"查询结束时间："+endTime+";":"");
+                .append(ObjectUtils.isNotEmpty(startTime) ?"查询开始时间："+ LocalDateTime.ofInstant(startTime.toInstant(), ZoneId.systemDefault()).format(dateTimeFormatter1)+";":"")
+                .append(ObjectUtils.isNotEmpty(endTime)?"查询结束时间："+LocalDateTime.ofInstant(endTime.toInstant(), ZoneId.systemDefault()).format(dateTimeFormatter1)+";":"");
         if(StringUtils.hasText(status)){
             switch (status){
                 case "1": stringBuilder.append("状态：启用;");break;
@@ -53,12 +57,13 @@ public class InsideAddressQuery extends PageQuery {
     }
 
     public String toStrCode() {
+        DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         return
                 ","+(addressDetail==null?"":addressDetail)
                         +","+(status==null?"":status)
                         +","+(stationId==null?"":stationId)
-                        +","+(startTime==null?"":startTime)
-                        +","+(endTime==null?"":endTime)
+                        +","+(startTime==null?"":LocalDateTime.ofInstant(startTime.toInstant(), ZoneId.systemDefault()).format(dateTimeFormatter1))
+                        +","+(endTime==null?"":LocalDateTime.ofInstant(endTime.toInstant(), ZoneId.systemDefault()).format(dateTimeFormatter1))
                         +",";
     }
 }

src/main/java/com/sqx/modules/exportExecl/controller/ExportExeclController.java

@@ -276,7 +276,7 @@ public class ExportExeclController {
         return getBill(queryDTO,"平台对账.xlsx","platformBill");
     }
 
-    private @NotNull Result getBill(PlatformBillDto queryDTO,String excelName,String fileType) {
+    private Result getBill(PlatformBillDto queryDTO,String excelName,String fileType) {
         if(!StringUtils.hasText(queryDTO.getUserId())){
             return Result.error("用户id不能为空");
         }
@@ -299,6 +299,7 @@ public class ExportExeclController {
     @GetMapping("exportShippingAddress")
     @ApiOperation("导出内部地址列表")
     public Result exportShippingAddress(InsideAddressQuery queryDTO) {
+        queryDTO.setUserId("1");
         if(!StringUtils.hasText(queryDTO.getUserId())){
             return Result.error("用户id不能为空");
         }

src/main/java/com/sqx/scheduler/export/ExportScheduler.java

@@ -3,6 +3,7 @@ package com.sqx.scheduler.export;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.sqx.common.utils.Constant;
+import com.sqx.common.utils.Result;
 import com.sqx.common.utils.SftpUtil;
 import com.sqx.modules.address.query.InsideAddressQuery;
 import com.sqx.modules.address.service.InsideAddressService;
@@ -27,6 +28,7 @@ import com.sqx.modules.reconciliation.service.PlatformBillService;
 import com.sqx.modules.utils.excel.ExcelData;
 import com.sqx.modules.utils.excel.ExportExcelUtils;
 import com.sqx.scheduler.config.SchedulerLock;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
@@ -37,12 +39,14 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -143,7 +147,6 @@ public class ExportScheduler {
                     }else if ("shippingAddress".equals(fileType)){
                         excelData=getShippingAddressExcelData(exportJob);
                     }else{
-
                         continue;
                     }
                     String value=commonInfoService.findOne(430).getValue();
@@ -198,11 +201,13 @@ public class ExportScheduler {
         }
         if(!"".equals(conditions[4])){
             Date start = Date.from(LocalDateTime.parse(conditions[4], dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());
+            log.info("start:"+start);
             query.setStartTime(start);
         }
         if(!"".equals(conditions[5])){
             Date end = Date.from(LocalDateTime.parse(conditions[5], dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());
             query.setEndTime(end);
+            log.info("end:"+end);
         }
 
         ExcelData data = new ExcelData();
@@ -244,7 +249,13 @@ public class ExportScheduler {
                 }
             }
             row.add(status);
-            row.add(record.getCreateTime());
+            Date createTime = record.getCreateTime();
+            String start="";
+            if (ObjectUtils.isNotEmpty(createTime)) {
+                LocalDateTime localDateTime = LocalDateTime.ofInstant(createTime.toInstant(), ZoneId.systemDefault());
+                start = localDateTime.format(dateTimeFormatter1);
+            }
+            row.add(start);
             rows.add(row);
         }
         data.setRows(rows);
@@ -424,4 +435,5 @@ public class ExportScheduler {
         PlatformBillDto query = getPlatformBillDto(exportJob);
         return platformBillService.excelPlatformBillList(query);
     }
+    
 }

src/main/resources/application.yml

@@ -79,8 +79,8 @@ mybatis-plus:
     cache-enabled: false
     call-setters-on-nulls: true
     jdbc-type-for-null: 'null'
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl