From 15382b5abaed7a783d67f0fb5f805e2ef710d208 Mon Sep 17 00:00:00 2001 From: lcj <2331845269@qq.com> Date: Fri, 7 Nov 2025 17:45:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PersonalHomeController.java | 7 +- .../ProjectBigScreenController.java | 17 +++ .../bigscreen/domain/vo/MyProjectInfoVo.java | 5 + .../service/ProjectBigScreenService.java | 8 ++ .../impl/ProjectBigScreenServiceImpl.java | 85 ++++++++++++++ .../impl/OthYs7DeviceImgServiceImpl.java | 3 +- .../project/service/IBusProjectService.java | 13 ++- .../service/impl/BusProjectServiceImpl.java | 110 ++++++++++++++++++ .../safety/domain/HseRecognizeRecord.java | 5 + .../safety/domain/HseSafetyWeeklyReport.java | 5 +- .../HseRecognizeRecordCreateDto.java | 5 + .../HseSafetyWeeklyReportCreateReq.java | 5 +- .../HseSafetyWeeklyReportQueryReq.java | 3 +- .../HseSafetyWeeklyReportUpdateReq.java | 5 +- .../recognizerecord/HseRecognizeRecordVo.java | 5 + .../HseSafetyInspectionGis.java | 5 + .../HseSafetyWeeklyReportVo.java | 5 +- .../impl/HseRecognizeRecordServiceImpl.java | 1 + .../HseSafetyWeeklyReportServiceImpl.java | 14 ++- 19 files changed, 288 insertions(+), 18 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/PersonalHomeController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/PersonalHomeController.java index 68016c40..393836fe 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/PersonalHomeController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/PersonalHomeController.java @@ -42,6 +42,7 @@ import org.dromara.common.web.core.BaseController; import org.dromara.patch.domain.bo.PdMasterBo; import org.dromara.patch.domain.vo.PdMasterBymiAndQt; import org.dromara.patch.service.IPdMasterService; +import org.dromara.project.service.IBusProjectService; import org.dromara.system.domain.SysMenu; import org.dromara.system.mapper.SysRoleMapper; import org.dromara.system.service.impl.SysMenuServiceImpl; @@ -95,6 +96,9 @@ public class PersonalHomeController extends BaseController { @Resource private IAIChatMemoryService aiChatMemoryService; + @Resource + private IBusProjectService projectService; + private final SysRoleMapper roleMapper; private final SysMenuServiceImpl menuMapper; @@ -174,8 +178,7 @@ public class PersonalHomeController extends BaseController { */ @GetMapping("/getMyProjectInfo") public R> getMyProjectInfoList() { - // todo - return null; + return R.ok(projectService.getMyProjectInfo()); } /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProjectBigScreenController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProjectBigScreenController.java index 59a95dbd..0cea6cec 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProjectBigScreenController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/ProjectBigScreenController.java @@ -53,6 +53,7 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -211,6 +212,22 @@ public class ProjectBigScreenController extends BaseController { return R.ok(projectBigScreenService.getProjectPeople(projectId)); } + /** + * 查询项目人员情况 + */ +// @SaCheckPermission("project:big:screen") + @GetMapping("/ue/people/{projectId}") + public R getProjectPeopleUe(@NotNull(message = "主键不能为空") + @PathVariable Long projectId) { + final Long tdyq = 1897160897167638529L; + final Long tdeq = 1968506669544656898L; + if (Objects.equals(projectId, tdeq) || Objects.equals(projectId, tdyq)) { + return R.ok(projectBigScreenService.getProjectPeopleTianDong()); + } else { + return R.ok(projectBigScreenService.getProjectPeople(projectId)); + } + } + /** * 查询项目形象进度 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/MyProjectInfoVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/MyProjectInfoVo.java index 9bbd77ee..1d88b573 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/MyProjectInfoVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/MyProjectInfoVo.java @@ -23,6 +23,11 @@ public class MyProjectInfoVo implements Serializable { */ private Long projectId; + /** + * 负责人 + */ + private String principal; + /** * 项目名称 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/ProjectBigScreenService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/ProjectBigScreenService.java index 55661df9..127bc2bd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/ProjectBigScreenService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/ProjectBigScreenService.java @@ -60,6 +60,13 @@ public interface ProjectBigScreenService { */ ProjectPeopleVo getProjectPeople(Long projectId); + /** + * 获取项目人员（田东一二期） + * + * @return 项目人员 + */ + ProjectPeopleVo getProjectPeopleTianDong(); + /** * 获取项目形象进度 * @@ -89,6 +96,7 @@ public interface ProjectBigScreenService { void setList(GpsEquipmentBo bo); List> getClientList(Long projectId); + List getUeClientList(); /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java index 7939550d..bc1287e6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/ProjectBigScreenServiceImpl.java @@ -234,6 +234,91 @@ public class ProjectBigScreenServiceImpl implements ProjectBigScreenService { return vo; } + /** + * 获取项目人员 + * + * @return 项目人员 + */ + @Override + public ProjectPeopleVo getProjectPeopleTianDong() { + final Long tdyq = 1897160897167638529L; + final Long tdeq = 1968506669544656898L; + List ids = List.of(tdeq, tdyq); + BusProject project = projectService.getById(tdyq); + // 获取大屏数据 + ProjectPeopleVo vo = new ProjectPeopleVo(); + // 获取施工人员总数 + List list = constructionUserService.lambdaQuery() + .in(SubConstructionUser::getProjectId, ids) + .eq(SubConstructionUser::getUserRole, "0") + .isNotNull(SubConstructionUser::getTeamId).list(); + List sysUserIdList = list.stream().map(SubConstructionUser::getSysUserId).toList(); + int count = list.size(); + BigDecimal countDec = BigDecimal.valueOf(count); + vo.setPeopleCount(countDec); + // 获取考勤数据 + List attendancePeopleList1 = attendanceService.listAttendancePeopleByProjectId(tdyq); + List attendancePeopleList2 = attendanceService.listAttendancePeopleByProjectId(tdeq); + List attendancePeopleList = new ArrayList<>(); + attendancePeopleList.addAll(attendancePeopleList1); + attendancePeopleList.addAll(attendancePeopleList2); + BigDecimal attendanceSize = BigDecimal.valueOf(attendancePeopleList.size()); + vo.setAttendanceCount(attendanceSize); + // 计算考勤率 + vo.setAttendanceRate(BigDecimalUtil.toPercentage(attendanceSize, countDec)); + if (count != 0) { + // 统计班组人数 + List memberList = projectTeamMemberService.lambdaQuery() + .select(BusProjectTeamMember::getId, BusProjectTeamMember::getTeamId) + .in(BusProjectTeamMember::getProjectId, ids) + .in(BusProjectTeamMember::getMemberId, sysUserIdList) + .list(); + Map> memberMap = memberList.stream() + .collect(Collectors.groupingBy(BusProjectTeamMember::getTeamId)); + // 统计班组考勤数据 + Map> userTeamMap = new HashMap<>(); + if (CollUtil.isNotEmpty(attendancePeopleList)) { + List users = constructionUserService.lambdaQuery() + .in(SubConstructionUser::getSysUserId, attendancePeopleList) + .isNotNull(SubConstructionUser::getTeamId) + .list(); + userTeamMap = users.stream() + .collect(Collectors.groupingBy(SubConstructionUser::getTeamId)); + } + List teamList = projectTeamService.lambdaQuery() + .in(BusProjectTeam::getProjectId, ids) + .list(); + String punchRange = project.getPunchRange(); + String punchTime = ""; + if (punchRange != null) { + String start = punchRange.split(",")[0]; + punchTime = LocalDate.now() + " "; + } + List listVo = new ArrayList<>(); + for (BusProjectTeam projectTeam : teamList) { + ProjectTeamAttendanceVo teamAttendanceVo = new ProjectTeamAttendanceVo(); + Long id = projectTeam.getId(); + teamAttendanceVo.setId(id); + teamAttendanceVo.setTeamName(projectTeam.getTeamName()); + teamAttendanceVo.setAttendanceTime(punchTime); + BigDecimal allNumber = BigDecimal.ZERO; + if (memberMap.containsKey(id)) { + allNumber = BigDecimal.valueOf(memberMap.get(id).size()); + } + BigDecimal attendanceNumber = BigDecimal.ZERO; + if (CollUtil.isNotEmpty(userTeamMap) && userTeamMap.containsKey(id)) { + attendanceNumber = BigDecimal.valueOf(userTeamMap.get(id).size()); + } + teamAttendanceVo.setAttendanceNumber(attendanceNumber); + teamAttendanceVo.setAllNumber(allNumber); + teamAttendanceVo.setAttendanceRate(BigDecimalUtil.toPercentage(attendanceNumber, allNumber)); + listVo.add(teamAttendanceVo); + } + vo.setTeamAttendanceList(listVo); + } + return vo; + } + /** * 获取项目形象进度 * diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/service/impl/OthYs7DeviceImgServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/service/impl/OthYs7DeviceImgServiceImpl.java index 1dc0376d..e4e44310 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/service/impl/OthYs7DeviceImgServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/service/impl/OthYs7DeviceImgServiceImpl.java @@ -304,6 +304,7 @@ public class OthYs7DeviceImgServiceImpl extends ServiceImpl { List selectProjectVoList(); /** - *查询地图项目分类 + * 查询地图项目分类 + * * @return */ Map>> getProjectMapList(); /** * 查询项目地域分散图 + * * @return */ Map getProjectDiYv(); + /** + * 获取我的项目信息 + * + * @return 项目信息 + */ + List getMyProjectInfo(); + /** * 计划和实际容量对比 + * * @return */ Map> getProjectCapacity(); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java index d89815c6..844edf25 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java @@ -18,6 +18,8 @@ import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.dromara.bigscreen.domain.dto.ProjectUpdateDto; import org.dromara.bigscreen.domain.dto.TanchuangInfoReq; +import org.dromara.bigscreen.domain.vo.MilestoneVo; +import org.dromara.bigscreen.domain.vo.MyProjectInfoVo; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.constant.HttpStatus; import org.dromara.common.core.constant.SystemConstants; @@ -42,8 +44,10 @@ import org.dromara.facility.service.IFacMatrixService; import org.dromara.manager.weathermanager.WeatherConstant; import org.dromara.manager.weathermanager.WeatherManager; import org.dromara.manager.weathermanager.vo.WeatherVo; +import org.dromara.progress.domain.PgsConstructionSchedulePlan; import org.dromara.progress.domain.PgsProgressCategory; import org.dromara.progress.domain.enums.PgsRelevancyStructureEnum; +import org.dromara.progress.service.IPgsConstructionSchedulePlanService; import org.dromara.progress.service.IPgsProgressCategoryService; import org.dromara.progress.service.IPgsProgressCategoryTemplateService; import org.dromara.project.constant.BusProjectConstant; @@ -70,6 +74,8 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; +import java.time.LocalDate; import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; @@ -159,6 +165,10 @@ public class BusProjectServiceImpl extends ServiceImpl WEATHER_CACHE = Caffeine.newBuilder().initialCapacity(1024) .maximumSize(10000L) @@ -1445,6 +1455,106 @@ public class BusProjectServiceImpl extends ServiceImpl getMyProjectInfo() { + Long userId = LoginHelper.getUserId(); + // 获取用户项目关联 + List relevancyList = userProjectRelevancyService.lambdaQuery() + .eq(BusUserProjectRelevancy::getUserId, userId) + .list(); + if (CollUtil.isEmpty(relevancyList)) { + return Collections.emptyList(); + } + Set projectIds = relevancyList.stream().map(BusUserProjectRelevancy::getProjectId).collect(Collectors.toSet()); + // 项目信息 + List projectList = this.listByIds(projectIds); + // 获取里程碑计划 + List constructionSchedulePlanList = constructionSchedulePlanService.lambdaQuery() + .in(PgsConstructionSchedulePlan::getProjectId, projectIds) + .list(); + // 根据项目进行分类 + Map> planMap = constructionSchedulePlanList.stream() + .collect(Collectors.groupingBy(PgsConstructionSchedulePlan::getProjectId)); + // 获取所有项目的子项目 + List subProjects = this.lambdaQuery() + .in(BusProject::getPId, projectIds) + .list(); + Set allProjectIds = subProjects.stream().map(BusProject::getId).collect(Collectors.toSet()); + allProjectIds.addAll(projectIds); + // 获取进度计划 + List progressCategoryList = progressCategoryService.lambdaQuery() + .eq(PgsProgressCategory::getParentId, 0L) + .in(PgsProgressCategory::getProjectId, allProjectIds) + .list(); + // 根据项目进行分类 + Map> progressCategoryMap = progressCategoryList.stream() + .collect(Collectors.groupingBy(PgsProgressCategory::getProjectId)); + // 根据进度计划计算总进度 + Map totalProgressMap = new HashMap<>(); + for (Map.Entry> entry : progressCategoryMap.entrySet()) { + Long key = entry.getKey(); + List value = entry.getValue(); + // 过滤掉那些还有子节点的，只保留最底层 + Set parentIds = value.stream() + .map(PgsProgressCategory::getParentId) + .collect(Collectors.toSet()); + List children = value.stream() + .filter(item -> !parentIds.contains(item.getId())) // 没有被当作别人父id的，就是叶子节点 + .toList(); + // 计算总进度 + BigDecimal percentage = progressCategoryService.getCompletedPercentage(children); + totalProgressMap.put(key, percentage); + } + // 封装数据 + return projectList.stream().map(project -> { + MyProjectInfoVo vo = new MyProjectInfoVo(); + Long id = project.getId(); + vo.setProjectId(id); + vo.setPrincipal(project.getPrincipal()); + vo.setProjectName(project.getProjectName()); + vo.setProjectGeneralize(project.getProjectGeneralize()); + // 获取里程碑 + List planList = planMap.getOrDefault(id, Collections.emptyList()); + if (CollUtil.isNotEmpty(planList)) { + vo.setMilestones(planList.stream().map(plan -> { + MilestoneVo milestoneVo = new MilestoneVo(); + BeanUtils.copyProperties(plan, milestoneVo); + // 统计最早的开始时间 + LocalDate planStartDate = plan.getPlanStartDate(); + LocalDate startTime = vo.getStartTime(); + if (startTime == null) { + vo.setStartTime(planStartDate); + } else { + if (planStartDate.isBefore(startTime)) { + vo.setStartTime(planStartDate); + } + } + // 统计最晚的结束时间 + LocalDate planEndDate = plan.getPlanEndDate(); + LocalDate endTime = vo.getEndTime(); + if (endTime == null) { + vo.setEndTime(planEndDate); + } else { + if (planEndDate.isAfter(endTime)) { + vo.setEndTime(planEndDate); + } + } + return milestoneVo; + }).toList()); + } else { + vo.setMilestones(Collections.emptyList()); + } + // 获取进度计划 + vo.setProgress(totalProgressMap.getOrDefault(id, BigDecimal.ZERO)); + return vo; + }).toList(); + } + @Override public Map> getProjectCapacity() { //获取项目列表 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseRecognizeRecord.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseRecognizeRecord.java index 70d99d15..a9293c11 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseRecognizeRecord.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseRecognizeRecord.java @@ -52,6 +52,11 @@ public class HseRecognizeRecord implements Serializable { */ private String violationType; + /** + * 原始图片 + */ + private String originalPicture; + /** * 图片路径 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyWeeklyReport.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyWeeklyReport.java index 527bf61f..d261ebfc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyWeeklyReport.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyWeeklyReport.java @@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; +import java.time.LocalDate; /** * 安全周报对象 hse_safety_weekly_report @@ -41,12 +42,12 @@ public class HseSafetyWeeklyReport extends BaseEntity { /** * 周期范围 */ - private String scope; + private LocalDate scope; /** * 周期范围结束 */ - private String scopeEnd; + private LocalDate scopeEnd; /** * 文件位置 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/recognizerecord/HseRecognizeRecordCreateDto.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/recognizerecord/HseRecognizeRecordCreateDto.java index 27ea10dc..d4ee694c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/recognizerecord/HseRecognizeRecordCreateDto.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/recognizerecord/HseRecognizeRecordCreateDto.java @@ -37,6 +37,11 @@ public class HseRecognizeRecordCreateDto { */ private String recordCategory; + /** + * 原始图片 + */ + private String originalPicture; + /** * 图片路径 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyweeklyreport/HseSafetyWeeklyReportCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyweeklyreport/HseSafetyWeeklyReportCreateReq.java index 208d9805..97dd1dca 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyweeklyreport/HseSafetyWeeklyReportCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyweeklyreport/HseSafetyWeeklyReportCreateReq.java @@ -4,6 +4,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.time.LocalDate; /** * @author lilemy @@ -28,12 +29,12 @@ public class HseSafetyWeeklyReportCreateReq implements Serializable { /** * 周期范围 */ - private String scope; + private LocalDate scope; /** * 周期范围结束 */ - private String scopeEnd; + private LocalDate scopeEnd; /** * 文件位置 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyweeklyreport/HseSafetyWeeklyReportQueryReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyweeklyreport/HseSafetyWeeklyReportQueryReq.java index cf32cdad..42c02fc0 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyweeklyreport/HseSafetyWeeklyReportQueryReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyweeklyreport/HseSafetyWeeklyReportQueryReq.java @@ -4,6 +4,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.time.LocalDate; import java.util.List; /** @@ -34,7 +35,7 @@ public class HseSafetyWeeklyReportQueryReq implements Serializable { /** * 周期范围 */ - private List scopeDate; + private List scopeDate; /** * 备注 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyweeklyreport/HseSafetyWeeklyReportUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyweeklyreport/HseSafetyWeeklyReportUpdateReq.java index 739725fb..c9c5984d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyweeklyreport/HseSafetyWeeklyReportUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyweeklyreport/HseSafetyWeeklyReportUpdateReq.java @@ -4,6 +4,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.time.LocalDate; /** * @author lilemy @@ -28,12 +29,12 @@ public class HseSafetyWeeklyReportUpdateReq implements Serializable { /** * 周期范围 */ - private String scope; + private LocalDate scope; /** * 周期范围结束 */ - private String scopeEnd; + private LocalDate scopeEnd; /** * 文件位置 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/recognizerecord/HseRecognizeRecordVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/recognizerecord/HseRecognizeRecordVo.java index 4d0aa533..2117722e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/recognizerecord/HseRecognizeRecordVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/recognizerecord/HseRecognizeRecordVo.java @@ -66,6 +66,11 @@ public class HseRecognizeRecordVo implements Serializable { @ExcelDictFormat(dictType = "violation_level_type") private String violationType; + /** + * 原始图片 + */ + private String originalPicture; + /** * 图片路径 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyinspection/HseSafetyInspectionGis.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyinspection/HseSafetyInspectionGis.java index 0a52a57b..b82e2dcc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyinspection/HseSafetyInspectionGis.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyinspection/HseSafetyInspectionGis.java @@ -44,6 +44,11 @@ public class HseSafetyInspectionGis implements Serializable { */ private String status; + /** + * 检查时间 + */ + private Date checkTime; + /** * 创建时间 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyweeklyreport/HseSafetyWeeklyReportVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyweeklyreport/HseSafetyWeeklyReportVo.java index ad015736..4cc57035 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyweeklyreport/HseSafetyWeeklyReportVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyweeklyreport/HseSafetyWeeklyReportVo.java @@ -8,6 +8,7 @@ import org.dromara.safety.domain.HseSafetyWeeklyReport; import java.io.Serial; import java.io.Serializable; +import java.time.LocalDate; import java.util.Date; @@ -47,13 +48,13 @@ public class HseSafetyWeeklyReportVo implements Serializable { * 周期范围 */ @ExcelProperty(value = "周期范围") - private String scope; + private LocalDate scope; /** * 周期范围结束 */ @ExcelProperty(value = "周期范围结束") - private String scopeEnd; + private LocalDate scopeEnd; /** * 文件位置 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseRecognizeRecordServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseRecognizeRecordServiceImpl.java index f9154348..1f3390d8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseRecognizeRecordServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseRecognizeRecordServiceImpl.java @@ -107,6 +107,7 @@ public class HseRecognizeRecordServiceImpl extends ServiceImpl scopeDate = req.getScopeDate(); + List scopeDate = req.getScopeDate(); String remark = req.getRemark(); // 时间范围查询 if (ObjectUtils.isNotEmpty(scopeDate)) { @@ -222,6 +225,7 @@ public class HseSafetyWeeklyReportServiceImpl extends ServiceImpl