diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/enums/JobRecordExportEnum.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/enums/JobRecordExportEnum.java index 3164092..5b078f4 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/enums/JobRecordExportEnum.java +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/enums/JobRecordExportEnum.java @@ -49,7 +49,7 @@ this.add(new Header("公厕名称", "toiletName")); this.add(new Header("公厕位置", "toiletPosition")); this.add(new Header("作业内容", "jobContent")); - this.add(new Header("作业时间", "startTime")); + this.add(new Header("作业时间", "startTimeFmt")); } }) ; diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/enums/JobRecordExportEnum.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/enums/JobRecordExportEnum.java index 3164092..5b078f4 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/enums/JobRecordExportEnum.java +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/enums/JobRecordExportEnum.java @@ -49,7 +49,7 @@ this.add(new Header("公厕名称", "toiletName")); this.add(new Header("公厕位置", "toiletPosition")); this.add(new Header("作业内容", "jobContent")); - this.add(new Header("作业时间", "startTime")); + this.add(new Header("作业时间", "startTimeFmt")); } }) ; diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java index f3940cb..54b4c99 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import java.util.List; +import java.util.stream.Collectors; /** *

@@ -27,13 +28,15 @@ public class JobRecordServiceImpl extends ServiceImpl implements IJobRecordService { @Autowired private ICommonPermissionService service; + @Override public List selectRecordsPage(Page page, DataScope scope, EntityWrapper query) { - List jobRecordDTOS = this.baseMapper.selectRecordsPage(page,scope,query); - if(ToolUtil.isNotEmpty(jobRecordDTOS)){ - for (JobRecordDTO recordDTO : jobRecordDTOS) { - recordDTO.setDeptName(service.getDeptName(recordDTO.getDeptId())); - } + List jobRecordDTOS = this.baseMapper.selectRecordsPage(page, scope, query); + if (ToolUtil.isNotEmpty(jobRecordDTOS)) { + jobRecordDTOS.stream().forEach(jobRecordDTO -> { + jobRecordDTO.setDeptName(service.getDeptName(jobRecordDTO.getDeptId())); + } + ); } return jobRecordDTOS; } diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/enums/JobRecordExportEnum.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/enums/JobRecordExportEnum.java index 3164092..5b078f4 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/enums/JobRecordExportEnum.java +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/enums/JobRecordExportEnum.java @@ -49,7 +49,7 @@ this.add(new Header("公厕名称", "toiletName")); this.add(new Header("公厕位置", "toiletPosition")); this.add(new Header("作业内容", "jobContent")); - this.add(new Header("作业时间", "startTime")); + this.add(new Header("作业时间", "startTimeFmt")); } }) ; diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java index f3940cb..54b4c99 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import java.util.List; +import java.util.stream.Collectors; /** *

@@ -27,13 +28,15 @@ public class JobRecordServiceImpl extends ServiceImpl implements IJobRecordService { @Autowired private ICommonPermissionService service; + @Override public List selectRecordsPage(Page page, DataScope scope, EntityWrapper query) { - List jobRecordDTOS = this.baseMapper.selectRecordsPage(page,scope,query); - if(ToolUtil.isNotEmpty(jobRecordDTOS)){ - for (JobRecordDTO recordDTO : jobRecordDTOS) { - recordDTO.setDeptName(service.getDeptName(recordDTO.getDeptId())); - } + List jobRecordDTOS = this.baseMapper.selectRecordsPage(page, scope, query); + if (ToolUtil.isNotEmpty(jobRecordDTOS)) { + jobRecordDTOS.stream().forEach(jobRecordDTO -> { + jobRecordDTO.setDeptName(service.getDeptName(jobRecordDTO.getDeptId())); + } + ); } return jobRecordDTOS; } diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/controller/ToiletCleanLogController.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/controller/ToiletCleanLogController.java index 6879e4e..ac684d9 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/controller/ToiletCleanLogController.java +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/controller/ToiletCleanLogController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.constant.JobConstant; import com.casic.missiles.modular.job.enums.JobRecordExportEnum; @@ -46,11 +47,11 @@ @ResponseBody public Object jobRecord(String name, String jobContent, String tolietKeywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - page.setRecords(listPage(page,name,jobContent,tolietKeywords,startTime,endTime)); + page.setRecords(listPage(page, name, jobContent, tolietKeywords, startTime, endTime)); return ResponseData.success(super.packForBT(page)); } - private List listPage(Page page,String name, String jobContent, String tolietKeywords, String startTime, String endTime){ + private List listPage(Page page, String name, String jobContent, String tolietKeywords, String startTime, String endTime) { EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(name)) { query.like("c.name", name); @@ -81,8 +82,11 @@ Page page = new PageFactory().defaultPage(); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - List dtos = listPage(page,name,jobContent,tolietKeywords,startTime,endTime); - exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, dtos.stream().map(toiletCleanLogDTO -> (Object) toiletCleanLogDTO).collect(Collectors.toList())); + List dtos = listPage(page, name, jobContent, tolietKeywords, startTime, endTime); + exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, dtos.stream().map(toiletCleanLogDTO -> { + toiletCleanLogDTO.setStartTimeFmt(DateUtil.format(toiletCleanLogDTO.getStartTime(), "yyyy-MM-dd HH:mm:ss")); + return (Object) toiletCleanLogDTO; + }).collect(Collectors.toList())); } /** diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/enums/JobRecordExportEnum.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/enums/JobRecordExportEnum.java index 3164092..5b078f4 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/enums/JobRecordExportEnum.java +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/enums/JobRecordExportEnum.java @@ -49,7 +49,7 @@ this.add(new Header("公厕名称", "toiletName")); this.add(new Header("公厕位置", "toiletPosition")); this.add(new Header("作业内容", "jobContent")); - this.add(new Header("作业时间", "startTime")); + this.add(new Header("作业时间", "startTimeFmt")); } }) ; diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java index f3940cb..54b4c99 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import java.util.List; +import java.util.stream.Collectors; /** *

@@ -27,13 +28,15 @@ public class JobRecordServiceImpl extends ServiceImpl implements IJobRecordService { @Autowired private ICommonPermissionService service; + @Override public List selectRecordsPage(Page page, DataScope scope, EntityWrapper query) { - List jobRecordDTOS = this.baseMapper.selectRecordsPage(page,scope,query); - if(ToolUtil.isNotEmpty(jobRecordDTOS)){ - for (JobRecordDTO recordDTO : jobRecordDTOS) { - recordDTO.setDeptName(service.getDeptName(recordDTO.getDeptId())); - } + List jobRecordDTOS = this.baseMapper.selectRecordsPage(page, scope, query); + if (ToolUtil.isNotEmpty(jobRecordDTOS)) { + jobRecordDTOS.stream().forEach(jobRecordDTO -> { + jobRecordDTO.setDeptName(service.getDeptName(jobRecordDTO.getDeptId())); + } + ); } return jobRecordDTOS; } diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/controller/ToiletCleanLogController.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/controller/ToiletCleanLogController.java index 6879e4e..ac684d9 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/controller/ToiletCleanLogController.java +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/controller/ToiletCleanLogController.java @@ -7,6 +7,7 @@ import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.util.DateUtil; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.constant.JobConstant; import com.casic.missiles.modular.job.enums.JobRecordExportEnum; @@ -46,11 +47,11 @@ @ResponseBody public Object jobRecord(String name, String jobContent, String tolietKeywords, String startTime, String endTime) { Page page = new PageFactory().defaultPage(); - page.setRecords(listPage(page,name,jobContent,tolietKeywords,startTime,endTime)); + page.setRecords(listPage(page, name, jobContent, tolietKeywords, startTime, endTime)); return ResponseData.success(super.packForBT(page)); } - private List listPage(Page page,String name, String jobContent, String tolietKeywords, String startTime, String endTime){ + private List listPage(Page page, String name, String jobContent, String tolietKeywords, String startTime, String endTime) { EntityWrapper query = new EntityWrapper<>(); if (ToolUtil.isNotEmpty(name)) { query.like("c.name", name); @@ -81,8 +82,11 @@ Page page = new PageFactory().defaultPage(); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); - List dtos = listPage(page,name,jobContent,tolietKeywords,startTime,endTime); - exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, dtos.stream().map(toiletCleanLogDTO -> (Object) toiletCleanLogDTO).collect(Collectors.toList())); + List dtos = listPage(page, name, jobContent, tolietKeywords, startTime, endTime); + exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, dtos.stream().map(toiletCleanLogDTO -> { + toiletCleanLogDTO.setStartTimeFmt(DateUtil.format(toiletCleanLogDTO.getStartTime(), "yyyy-MM-dd HH:mm:ss")); + return (Object) toiletCleanLogDTO; + }).collect(Collectors.toList())); } /** diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dto/ToiletCleanLogDTO.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dto/ToiletCleanLogDTO.java index ffe5c80..56a1c4d 100644 --- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dto/ToiletCleanLogDTO.java +++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dto/ToiletCleanLogDTO.java @@ -76,6 +76,6 @@ @JSONField(serializeUsing = DateDeserializer.class) private Timestamp startTime; - + private String startTimeFmt; private Timestamp endTime; }