|
|
|
@ -2470,7 +2470,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr |
|
|
|
return rb.success().setData(url); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<String> printApplyPdf(String sid) { |
|
|
|
public ResultBean<String> printApplyPdf(String sid,String name) { |
|
|
|
ResultBean<String> rb = ResultBean.fireFail(); |
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
/* ResultBean<AppArrearsCarryInfoVo> resultBean = details(sid); |
|
|
|
@ -2600,47 +2600,51 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr |
|
|
|
//获取审批记录
|
|
|
|
List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignPro.flowRecordAndComment(busArrearsCarryVehicleApply.getProcInstId(), "1").getData(); |
|
|
|
List<BusArrearsCarryVehicleFlowableVo> busArrearsCarryVehicleFlowableVos = new ArrayList<>(); |
|
|
|
for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { |
|
|
|
if (flowTask.getFlowableRecordVo() != null) { |
|
|
|
Map<String, Object> flowableRecordVo = flowTask.getFlowableRecordVo(); |
|
|
|
BusArrearsCarryVehicleFlowableVo busArrearsCarryVehicleFlowableVo = new BusArrearsCarryVehicleFlowableVo(); |
|
|
|
List<Map<String, Object>> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos"); |
|
|
|
Map<String, Object> comment = ConstantUtils.getMap(flowableRecordVo, "comment"); |
|
|
|
String assigneeName = (String) taskUserInfos.get(0).get("assigneeName"); |
|
|
|
String comment1 = (String) comment.get("comment"); |
|
|
|
busArrearsCarryVehicleFlowableVo.setName(assigneeName); |
|
|
|
busArrearsCarryVehicleFlowableVo.setComment(comment1); |
|
|
|
if(flowableRecordVo.get("finishTime") != null && flowableRecordVo.get("finishTime") != ""){ |
|
|
|
busArrearsCarryVehicleFlowableVo.setSpsj(flowableRecordVo.get("finishTime").toString()); |
|
|
|
}else{ |
|
|
|
busArrearsCarryVehicleFlowableVo.setSpsj(null); |
|
|
|
} |
|
|
|
busArrearsCarryVehicleFlowableVos.add(busArrearsCarryVehicleFlowableVo); |
|
|
|
} else { |
|
|
|
Map<String, Object> processCommentVo = flowTask.getProcessCommentVo(); |
|
|
|
BusArrearsCarryVehicleFlowableVo busArrearsCarryVehicleFlowableVo = new BusArrearsCarryVehicleFlowableVo(); |
|
|
|
busArrearsCarryVehicleFlowableVo.setName(processCommentVo.get("title").toString()); |
|
|
|
busArrearsCarryVehicleFlowableVo.setComment(processCommentVo.get("content").toString()); |
|
|
|
busArrearsCarryVehicleFlowableVo.setSpsj(processCommentVo.get("time").toString()); |
|
|
|
busArrearsCarryVehicleFlowableVos.add(busArrearsCarryVehicleFlowableVo); |
|
|
|
List<String> fileLists = (List) processCommentVo.get("fileList"); |
|
|
|
fileLists.removeAll(Collections.singleton(null)); |
|
|
|
if (fileLists.size() > 0) { |
|
|
|
for (String image : fileLists) { |
|
|
|
if (image.contains(fileUploadComponent.getUrlPrefix())) { |
|
|
|
image = image.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
try { |
|
|
|
image = fileUploadComponent.getUrlPrefix() + URLEncoder.encode(image, "utf-8"); |
|
|
|
String image2Base64 = image2Base64(image); |
|
|
|
photoList.add(image2Base64); |
|
|
|
} catch (UnsupportedEncodingException e) { |
|
|
|
e.printStackTrace(); |
|
|
|
flowRecordVo.removeAll(Collections.singleton(null)); |
|
|
|
if(!flowRecordVo.isEmpty()){ |
|
|
|
for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { |
|
|
|
if (flowTask.getFlowableRecordVo() != null) { |
|
|
|
Map<String, Object> flowableRecordVo = flowTask.getFlowableRecordVo(); |
|
|
|
BusArrearsCarryVehicleFlowableVo busArrearsCarryVehicleFlowableVo = new BusArrearsCarryVehicleFlowableVo(); |
|
|
|
List<Map<String, Object>> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos"); |
|
|
|
Map<String, Object> comment = ConstantUtils.getMap(flowableRecordVo, "comment"); |
|
|
|
String assigneeName = (String) taskUserInfos.get(0).get("assigneeName"); |
|
|
|
String comment1 = (String) comment.get("comment"); |
|
|
|
busArrearsCarryVehicleFlowableVo.setName(assigneeName); |
|
|
|
busArrearsCarryVehicleFlowableVo.setComment(comment1); |
|
|
|
if(flowableRecordVo.get("finishTime") != null && flowableRecordVo.get("finishTime") != ""){ |
|
|
|
busArrearsCarryVehicleFlowableVo.setSpsj(flowableRecordVo.get("finishTime").toString()); |
|
|
|
}else{ |
|
|
|
busArrearsCarryVehicleFlowableVo.setSpsj(null); |
|
|
|
} |
|
|
|
busArrearsCarryVehicleFlowableVos.add(busArrearsCarryVehicleFlowableVo); |
|
|
|
} else { |
|
|
|
Map<String, Object> processCommentVo = flowTask.getProcessCommentVo(); |
|
|
|
BusArrearsCarryVehicleFlowableVo busArrearsCarryVehicleFlowableVo = new BusArrearsCarryVehicleFlowableVo(); |
|
|
|
busArrearsCarryVehicleFlowableVo.setName(processCommentVo.get("title").toString()); |
|
|
|
busArrearsCarryVehicleFlowableVo.setComment(processCommentVo.get("content").toString()); |
|
|
|
busArrearsCarryVehicleFlowableVo.setSpsj(processCommentVo.get("time").toString()); |
|
|
|
busArrearsCarryVehicleFlowableVos.add(busArrearsCarryVehicleFlowableVo); |
|
|
|
List<String> fileLists = (List) processCommentVo.get("fileList"); |
|
|
|
fileLists.removeAll(Collections.singleton(null)); |
|
|
|
if (fileLists.size() > 0) { |
|
|
|
for (String image : fileLists) { |
|
|
|
if (image.contains(fileUploadComponent.getUrlPrefix())) { |
|
|
|
image = image.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
try { |
|
|
|
image = fileUploadComponent.getUrlPrefix() + URLEncoder.encode(image, "utf-8"); |
|
|
|
String image2Base64 = image2Base64(image); |
|
|
|
photoList.add(image2Base64); |
|
|
|
} catch (UnsupportedEncodingException e) { |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
List<Message> messages = messageFeign.selectByBusinessSid(busArrearsCarryVehicleApply.getSid()).getData(); |
|
|
|
if (messages.size() > 0) { |
|
|
|
for (Message message : messages) { |
|
|
|
@ -2665,6 +2669,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr |
|
|
|
busArrearsCarryVehicleFlowableVos.sort(Comparator.nullsLast(Comparator.comparing(BusArrearsCarryVehicleFlowableVo::getSpsj,nullComparator))); |
|
|
|
map.put("lcList", busArrearsCarryVehicleFlowableVos); |
|
|
|
map.put("photoPath64", photoList); |
|
|
|
map.put("downName",name); |
|
|
|
map.put("downTime",DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")); |
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
|
|
|
|
|
God
2 years ago