|
|
@@ -44,7 +44,6 @@ import org.springframework.stereotype.Service;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.text.DecimalFormat;
|
|
|
import java.text.ParseException;
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
import java.util.concurrent.ForkJoinPool;
|
|
|
import java.util.concurrent.Future;
|
|
|
@@ -183,6 +182,7 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
|
|
|
|
|
|
@Override
|
|
|
public List<OrderExcelDTO> orderExcel(OrderServiceWebInDTO dto) {
|
|
|
+ try {
|
|
|
Integer operatorId = TokenContext.cureOperatorId();
|
|
|
QueryWrapper queryWrapper = orderServiceQuery(dto, "o.");
|
|
|
int count;
|
|
|
@@ -236,7 +236,7 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
|
|
|
orderExcelDTO.setStationOrGroupName(StringUtils.isNotBlank(orderExcelDTO.getGroupLeaderName())?orderExcelDTO.getGroupLeaderName():orderExcelDTO.getServiceStationName());
|
|
|
}
|
|
|
//ForkJoinPool pool = new ForkJoinPool();
|
|
|
- try {
|
|
|
+
|
|
|
/* OrderExcelTask task = new OrderExcelTask(1,maxPage,queryWrapper, operatorId, dbName,baseMapper);
|
|
|
Future<List<OrderExcelDTO>> future = pool.submit(task);
|
|
|
do {
|
|
|
@@ -244,18 +244,19 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
|
|
|
} while (!future.isDone());
|
|
|
pool.shutdown();
|
|
|
list = future.get();*/
|
|
|
+ return list;
|
|
|
}catch (Exception e){
|
|
|
e.printStackTrace();
|
|
|
throw new BuilderException("工单导出失败,请重新操作");
|
|
|
}
|
|
|
-
|
|
|
- return list;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
private String getPayAccountString(String payAccount){
|
|
|
StringBuilder sb = new StringBuilder();
|
|
|
for (String s : payAccount.split(",")) {
|
|
|
if(StringUtils.isNotBlank(s)){
|
|
|
+ log.info("ssssss===="+s);
|
|
|
for (PayAccount account : EnumUtils.getEnumList(PayAccount.class)) {
|
|
|
if(account.getCode().equals(Integer.parseInt(s))){
|
|
|
sb.append(account.getDisplay()+",");
|
|
|
@@ -1675,15 +1676,9 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
|
|
|
}
|
|
|
|
|
|
public static void main(String[] args) {
|
|
|
- SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
- Calendar calendar = Calendar.getInstance();
|
|
|
- try {
|
|
|
- calendar.setTime(df.parse("2024-03-05 00:00:24"));
|
|
|
- } catch (ParseException e) {
|
|
|
- e.printStackTrace();
|
|
|
+ String val = ",5,";
|
|
|
+ for (String s : val.split(",")) {
|
|
|
+ System.out.println(s);
|
|
|
}
|
|
|
- System.out.println(calendar.get(Calendar.DAY_OF_WEEK));
|
|
|
- System.out.println(calendar.get(Calendar.HOUR_OF_DAY));
|
|
|
-
|
|
|
}
|
|
|
}
|