|
|
|
|
@ -40,6 +40,7 @@ import java.io.FileNotFoundException; |
|
|
|
|
import java.io.FileOutputStream; |
|
|
|
|
import java.io.IOException; |
|
|
|
|
import java.math.BigDecimal; |
|
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.HashMap; |
|
|
|
|
import java.util.List; |
|
|
|
|
@ -301,7 +302,7 @@ public class CkOrderController extends BladeController { |
|
|
|
|
LambdaQueryWrapper<ApplyOrderDetail> queryWrapper = new LambdaQueryWrapper<>(); |
|
|
|
|
queryWrapper.eq(ApplyOrderDetail::getOrderId, id); |
|
|
|
|
List<ApplyOrderDetail> details = applyOrderDetailService.list(queryWrapper); |
|
|
|
|
|
|
|
|
|
SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日"); |
|
|
|
|
Long aLong = Long.valueOf(id); |
|
|
|
|
//需要批量生成的map
|
|
|
|
|
|
|
|
|
|
@ -319,9 +320,9 @@ public class CkOrderController extends BladeController { |
|
|
|
|
|
|
|
|
|
Map<String, Object> result = new HashMap<>(); |
|
|
|
|
result.put("applyUser", applyOrder.getApplyUser()); |
|
|
|
|
result.put("applyTime", applyOrder.getApplyTime()); |
|
|
|
|
result.put("applyTime", format.format(applyOrder.getApplyTime())); |
|
|
|
|
result.put("approvalUser", applyOrder.getApproveUser()); |
|
|
|
|
result.put("approvalTime", applyOrder.getApproveTime()); |
|
|
|
|
result.put("approvalTime", format.format(applyOrder.getApproveTime())); |
|
|
|
|
result.put("applyRemark", applyOrder.getReason()); |
|
|
|
|
result.put("resultList", resultList); |
|
|
|
|
|
|
|
|
|
|