|
|
@ -6541,7 +6541,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
//获取审批记录
|
|
|
|
List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignPro.flowRecordAndComment(busSalesOrder.getProcInstId(), "1").getData(); |
|
|
|
List<BusSalesOrderSourceLCVo> busSalesOrderSourceLCVos = new ArrayList<>(); |
|
|
|
/*for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { |
|
|
|
for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { |
|
|
|
if (flowTask.getFlowableRecordVo() != null) { |
|
|
|
Map<String, Object> flowableRecordVo = flowTask.getFlowableRecordVo(); |
|
|
|
BusSalesOrderSourceLCVo busSalesOrderSourceLCVo = new BusSalesOrderSourceLCVo(); |
|
|
@ -6567,8 +6567,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}*/ |
|
|
|
/*List<Message> messages = messageFeign.selectByBusinessSid(busSalesOrder.getSid()).getData(); |
|
|
|
} |
|
|
|
List<Message> messages = messageFeign.selectByBusinessSid(busSalesOrder.getSid()).getData(); |
|
|
|
if (messages.size() > 0) { |
|
|
|
for (Message message : messages) { |
|
|
|
BusSalesOrderSourceLCVo busSalesOrderSourceLCVo = new BusSalesOrderSourceLCVo(); |
|
|
@ -6585,7 +6585,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
busSalesOrderSourceLCVos.add(busSalesOrderSourceLCVo); |
|
|
|
} |
|
|
|
} |
|
|
|
busSalesOrderSourceLCVos.sort(comparing(BusSalesOrderSourceLCVo::getSpsj));*/ |
|
|
|
busSalesOrderSourceLCVos.sort(comparing(BusSalesOrderSourceLCVo::getSpsj)); |
|
|
|
dataMap.put("lcList", busSalesOrderSourceLCVos); |
|
|
|
//创建时间
|
|
|
|
dataMap.put("time", DateUtil.format(busSalesOrder.getCreateTime(), "yyyy-MM-dd")); |
|
|
|