|
|
@@ -1630,6 +1630,8 @@ public class HouseOrderController implements HouseOrderAPI {
|
|
|
headerRow.createCell(19).setCellValue("支付时间");
|
|
|
headerRow.createCell(20).setCellValue("退款时间");
|
|
|
headerRow.createCell(21).setCellValue("取消时间");
|
|
|
+ headerRow.createCell(22).setCellValue("来源");
|
|
|
+ headerRow.createCell(23).setCellValue("来源详情");
|
|
|
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
if (ObjectUtils.isNotEmpty(vos) && vos.size() > 0) {
|
|
|
@@ -1752,6 +1754,29 @@ public class HouseOrderController implements HouseOrderAPI {
|
|
|
} else {
|
|
|
dataRow1.createCell(21).setCellValue(sdf.format(cancelTime));
|
|
|
}
|
|
|
+ String[] arr=(vo.getSourceId()==null?"":vo.getSourceId()).split(",");
|
|
|
+ ArrayList<String> idList = new ArrayList<String>(Arrays.asList(arr)) ;
|
|
|
+ if(!StringUtils.hasText(vo.getSource())){
|
|
|
+ dataRow1.createCell(22).setCellValue("自费");
|
|
|
+ dataRow1.createCell(23).setCellValue("");
|
|
|
+ }else if ("1".equals(vo.getSource())){
|
|
|
+ vo.setSource("课表");
|
|
|
+ List<ClassSchedule> schedules=new ArrayList<>(classScheduleService.listByIds(idList));
|
|
|
+ String data = schedules.stream().peek((ClassSchedule u) -> u.setJsxm("姓名:"+u.getJsxm()+ ";工号:" + u.getJsgh() + ";课表日期:" + u.getDateTime() + ";备注:" + u.getRemark()+";")).map(ClassSchedule::getJsxm).collect(Collectors.joining("\\/r\\/n"));
|
|
|
+ dataRow1.createCell(22).setCellValue("课表");
|
|
|
+ dataRow1.createCell(23).setCellValue(data);
|
|
|
+ } else if ("2".equals(vo.getSource())){
|
|
|
+ vo.setSource("流程");
|
|
|
+ List<ApplicationProcedureTemporaryVo> applicationProcedureTemporaries= new ArrayList<>();
|
|
|
+ for (int j = 0; j <idList.size(); j++) {
|
|
|
+ applicationProcedureTemporaries.add(applicationProcedureTemporaryService.appletDetail(Integer.valueOf(idList.get(j))));
|
|
|
+ }
|
|
|
+ String data = applicationProcedureTemporaries.stream().peek((ApplicationProcedureTemporaryVo u) ->
|
|
|
+ u.setUsersName("申请人姓名:"+u.getUsersName()+ ";申请人部门" + u.getOrgName() + ";房间数量:" + u.getHouseCount()
|
|
|
+ + ";开始时间:" + u.getStartTime()+";结束时间"+u.getEndTime()+";审核状态:"+u.getStatus()+"(0:已拒绝,1:待审批,2:处理中,3:已同意);")).map(ApplicationProcedureTemporaryVo::getUsersName).collect(Collectors.joining("\\/r\\/n"));
|
|
|
+ dataRow1.createCell(22).setCellValue("流程");
|
|
|
+ dataRow1.createCell(23).setCellValue(data);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
// 将工作簿写入文件
|