Skip to content

Z
zlmy-cloud
Commit b9d3c53a authored by 鲁鸿波's avatar 鲁鸿波
Browse files
Options

值班日历导出

parent 64bf1403
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 15 deletions
zlmy-modules/zlmy-boot/src/main/java/com/testor/module/duty/service/impl/DutyServiceImpl.java
View file @ b9d3c53a
...@@ -1613,24 +1613,27 @@ public class DutyServiceImpl extends ServiceImpl<DutyDao, TSysDuty> implements D ...@@ -1613,24 +1613,27 @@ public class DutyServiceImpl extends ServiceImpl<DutyDao, TSysDuty> implements D
.eq(TSysDuty::getClasses, tSysDuty.getClasses()) .eq(TSysDuty::getClasses, tSysDuty.getClasses())
); );
//如果值班日志不为空 //如果值班日志不为空
System.out.println("tSysDutyLog-------->"+tSysDutyLog);
if (tSysDutyLog != null) { if (tSysDutyLog != null) {
String[] jobIds = tSysDutyLog.getJobId().split(","); if(!"".equals(tSysDutyLog.getJobId()) && null != tSysDutyLog.getJobId()){
//获取作业活动 String[] jobIds = tSysDutyLog.getJobId().split(",");
List<TSysTaskWork> taskWorks = tSysTaskWorkService.list(new LambdaQueryWrapper<TSysTaskWork>().in(TSysTaskWork::getId, jobIds)); //获取作业活动
if (taskWorks != null && taskWorks.size() > 0) { List<TSysTaskWork> taskWorks = tSysTaskWorkService.list(new LambdaQueryWrapper<TSysTaskWork>().in(TSysTaskWork::getId, jobIds));
for (TSysTaskWork taskWork : taskWorks) { if (taskWorks != null && taskWorks.size() > 0) {
ExportDutyPo exportDutyPo1 = exportDutyPo; for (TSysTaskWork taskWork : taskWorks) {
exportDutyPo1.setContent(taskWork.getContent()); ExportDutyPo exportDutyPo1 = exportDutyPo;
exportDutyPo1.setToll(String.valueOf(count)); exportDutyPo1.setContent(taskWork.getContent());
String involvePerson = taskWork.getInvolvePerson(); exportDutyPo1.setToll(String.valueOf(count));
if (StringUtils.isNotBlank(involvePerson)) { String involvePerson = taskWork.getInvolvePerson();
String[] involvePersons = involvePerson.split(","); if (StringUtils.isNotBlank(involvePerson)) {
exportDutyPo1.setPartiesInvolved(String.valueOf(involvePersons.length)); String[] involvePersons = involvePerson.split(",");
exportDutyPo1.setPartiesInvolved(String.valueOf(involvePersons.length));
}
exportDutyPos.add(exportDutyPo1);
} }
exportDutyPos.add(exportDutyPo1); } else {
exportDutyPos.add(exportDutyPo);
} }
} else {
exportDutyPos.add(exportDutyPo);
} }
}else { }else {
exportDutyPos.add(exportDutyPo); exportDutyPos.add(exportDutyPo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment