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