Bladeren bron

导出功能

wks 1 jaar geleden
bovenliggende
commit
967d6eaa3c

+ 1 - 1
src/main/java/com/ydtech/modules/order/controller/QrCodeController.java

@@ -164,7 +164,7 @@ public class QrCodeController {
         LocalDate currentDate = LocalDate.now();
         if (Math.abs(currentDate.toEpochDay() - qrcodeCreateTime.toEpochDay()) >= 1) {
             //重定向到错误页面中
-            return getModelAndView("");
+            return getModelAndView("二维码仅当天支付有效");
         }
 
         PtlAgreement ptlAgreement = ptlAgreementService.getById(insAreaCompany.getAgreementId());

+ 5 - 9
src/main/java/com/ydtech/modules/order/entity/dto/TaskPoolDataExcelDto.java

@@ -9,6 +9,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.format.DateTimeFormatter;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -66,19 +68,13 @@ public class TaskPoolDataExcelDto {
     private String createTime;
 
     public TaskPoolDataExcelDto(InsOrders insOrder) {
-        this.orderNo = insOrder.getOrderno();
+        this.orderNo = insOrder.getSubOrderId();
         this.product = insOrder.getProduct();
         this.areaInfo = insOrder.getAreaInfo();
         this.username = insOrder.getUsername();
         this.leaderName = insOrder.getLeaderName();
 
-        try {
-            ManagementSource source = ManagementSource.valueOf("MS_0" + insOrder.getManagementSource());
-            this.managementSource = source.getDesc();
-        } catch (Exception e) {
-            this.managementSource = "";
-        }
-
+        this.managementSource = insOrder.getManagementSource();
         try {
             OrderEntryStatus orderEntryStatus = OrderEntryStatus.valueOf("OES_" + insOrder.getEntryStatus());
             this.entryStatus = orderEntryStatus.getDesc();
@@ -102,7 +98,7 @@ public class TaskPoolDataExcelDto {
         }
 
         this.userid = insOrder.getUserid();
-        this.createTime = insOrder.getCreatetime().toString();
+        this.createTime = insOrder.getCreatetime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
     }
 
 

+ 2 - 0
src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -2493,4 +2493,6 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
         throw new SystemException("文件导出失败");
     }
+
+
 }