1.报价次数任务导出调整

src/main/java/com/ydtech/modules/admin/service/impl/CompanyDataReportServiceImpl.java

@@ -266,7 +266,7 @@ public class CompanyDataReportServiceImpl implements CompanyDataReportService {
 //            }
         dateMapByType.put("userId", userId);
 
-        this.insExcelTaskAsyncService.importasync(resultSubOrder,dateMapByType);
+        this.insExcelTaskAsyncService.importasync(resultSubOrder,dateMapByType, ordersDataVo.getBeginDate(), ordersDataVo.getEndDate());
 //        String uploadPath = this.uploadPath + "/excel/";
 //        Path path = Paths.get(uploadPath);
 //        if (!Files.exists(path)) {

src/main/java/com/ydtech/modules/console/controller/UploadOrderController.java

@@ -54,9 +54,11 @@ public class UploadOrderController {
       @PostMapping("/bigOrderCountUpload")
       @ApiOperation(value = "大订单导出导出明细功能")
       public HttpResult bigOrderCountUpload(@RequestBody BigOrderUploadVo bigOrderUploadVo) {
+          String beginDate = bigOrderUploadVo.getBeginDate();
+          String endDate = bigOrderUploadVo.getEndDate();
           String userId = BaseController.getUserId();
           List<BigOrderUploadDto> list = upLoadOrderService.uploadExcelData(bigOrderUploadVo);
-          insExcelTaskAsyncService.importasyncBigOrder(list,userId);
+          insExcelTaskAsyncService.importasyncBigOrder(list,userId,beginDate,endDate);
 //          if(list!=null && !list.isEmpty()){
 //              for (BigOrderUploadDto bigOrderUploadDto : list) {
 //                  String orderStatus="";

src/main/java/com/ydtech/modules/fnc/entity/InsExcelTaskEntity.java

@@ -42,10 +42,18 @@ public class InsExcelTaskEntity {
 
     @ApiModelProperty("导入路径")
     @TableField("upload_url")
-    private String uploadUrl; // 导入路径
+    private String uploadUrl;
 
     @ApiModelProperty("类型")
     @TableField("type")
-    private String type; // 导入路径
+    private String type;
+
+    @ApiModelProperty("列表开始时间")
+    @TableField("start_time")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty("列表结束时间")
+    @TableField("end_time")
+    private LocalDateTime endTime;
 
 }

src/main/java/com/ydtech/modules/fnc/service/InsExcelTaskAsyncService.java

@@ -12,9 +12,9 @@ import java.util.HashMap;
 import java.util.List;
 
 public interface InsExcelTaskAsyncService   extends IService<InsExcelTaskEntity> {
-    void importasync(List<OrdersDataExcel> resultSubOrder, HashMap<String, String> dateMapByType);
+    void importasync(List<OrdersDataExcel> resultSubOrder, HashMap<String, String> dateMapByType,String beginDate,String endDate);
 
-    void importasyncBigOrder(List<BigOrderUploadDto> list,String userId);
+    void importasyncBigOrder(List<BigOrderUploadDto> list,String userId,String beginDate,String endDate);
 
     /**
      *

src/main/java/com/ydtech/modules/fnc/service/impl/InsExcelTaskAsyncServiceImpl.java

@@ -36,7 +36,10 @@ import java.math.RoundingMode;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -57,7 +60,7 @@ public class InsExcelTaskAsyncServiceImpl extends ServiceImpl<InsExcelTaskAsyncM
 
     @Async
     @Override
-    public void importasync(List<OrdersDataExcel> resultSubOrder, HashMap<String, String> dateMapByType) {
+    public void importasync(List<OrdersDataExcel> resultSubOrder, HashMap<String, String> dateMapByType,String beginDate,String endDate) {
         InsExcelTaskEntity insExcelTaskEntity = new InsExcelTaskEntity();
         String taskId = String.valueOf(new SnowFlakeUtil().nextId());
         insExcelTaskEntity.setId(taskId);
@@ -66,6 +69,15 @@ public class InsExcelTaskAsyncServiceImpl extends ServiceImpl<InsExcelTaskAsyncM
         insExcelTaskEntity.setCreateTime(LocalDateTime.now());
         insExcelTaskEntity.setCreatedAt(LocalDateTime.now());
         insExcelTaskEntity.setType("1");
+        // 定义时间格式的常量
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        // 构建开始时间
+        LocalDateTime startTime = LocalDateTime.parse(beginDate + " 00:00:00", formatter);
+        insExcelTaskEntity.setStartTime(startTime);
+        // 构建结束时间
+        LocalDateTime endTime = LocalDateTime.parse(endDate + " " + LocalDateTime.now().format(DateTimeFormatter.ofPattern("HH:mm:ss")), formatter);
+        insExcelTaskEntity.setEndTime(endTime);
+
         baseMapper.insert(insExcelTaskEntity);
 
         if (!resultSubOrder.isEmpty()) {
@@ -107,7 +119,8 @@ public class InsExcelTaskAsyncServiceImpl extends ServiceImpl<InsExcelTaskAsyncM
 
     @Override
     @Async
-    public void importasyncBigOrder(List<BigOrderUploadDto> list,String  userId) {
+    public void importasyncBigOrder(List<BigOrderUploadDto> list,String  userId,String beginDate,String endDate) {
+
         InsExcelTaskEntity insExcelTaskEntity = new InsExcelTaskEntity();
         String taskId = String.valueOf(new SnowFlakeUtil().nextId());
         insExcelTaskEntity.setId(taskId);
@@ -115,6 +128,15 @@ public class InsExcelTaskAsyncServiceImpl extends ServiceImpl<InsExcelTaskAsyncM
         insExcelTaskEntity.setUserId(userId);
         insExcelTaskEntity.setCreateTime(LocalDateTime.now());
         insExcelTaskEntity.setCreatedAt(LocalDateTime.now());
+        // 定义时间格式的常量
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        // 构建开始时间
+        LocalDateTime startTime = LocalDateTime.parse(beginDate + " 00:00:00", formatter);
+        insExcelTaskEntity.setStartTime(startTime);
+        // 构建结束时间
+        LocalDateTime endTime = LocalDateTime.parse(endDate + " " + LocalDateTime.now().format(DateTimeFormatter.ofPattern("HH:mm:ss")), formatter);
+        insExcelTaskEntity.setEndTime(endTime);
+
         insExcelTaskEntity.setType("0");
         baseMapper.insert(insExcelTaskEntity);
 
@@ -150,6 +172,11 @@ public class InsExcelTaskAsyncServiceImpl extends ServiceImpl<InsExcelTaskAsyncM
         baseMapper.updateById(insExcelTaskEntity1);
     }
 
+    /**
+     *
+     * @param insExcelTaskDto
+     * @return  控制台导出任务分页
+     */
     @Override
     public BasePageResult<InsExcelTaskEntity> queryPage(InsExcelTaskDto insExcelTaskDto) {
         Page<InsExcelTaskEntity> page = new Page<>(insExcelTaskDto.getPageNum(), insExcelTaskDto.getPageSize());

src/main/resources/mapper/modules/console/UpLoadOrderMapper.xml

@@ -27,5 +27,6 @@
                 AND DATE_FORMAT( io.createtime, '%Y-%m-%d') BETWEEN #{vo.beginDate} AND #{vo.endDate}
             </if>
         </where>
+        order by io.createtime ,io.orderno
     </select>
 </mapper>

src/main/resources/mapper/modules/fnc/InsExcelTaskAsyncMapper.xml

@@ -5,6 +5,6 @@
         <select id="queryPage" resultType="com.ydtech.modules.fnc.entity.InsExcelTaskEntity">
             select *
             from ins_excel_task
-
+            order by create_time desc
         </select>
 </mapper>