diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java index e1e88208..86819480 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java @@ -89,7 +89,7 @@ public class SubConstructionUserController extends BaseController { @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { - return R.ok(constructionUserService.queryById(id)); + return R.ok(constructionUserService.queryById(id, true)); } /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/app/SubConstructionUserAppController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/app/SubConstructionUserAppController.java index 9385d1ab..4b99ec65 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/app/SubConstructionUserAppController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/app/SubConstructionUserAppController.java @@ -47,7 +47,7 @@ public class SubConstructionUserAppController { @GetMapping("/loginUser") public R getLoginUserInfo() { SubConstructionUser constructionUser = constructionUserService.getBySysUserId(LoginHelper.getUserId()); - return R.ok(constructionUserService.getVo(constructionUser)); + return R.ok(constructionUserService.getVo(constructionUser, false)); } /** @@ -60,7 +60,7 @@ public class SubConstructionUserAppController { if (constructionUser == null) { return R.fail("查询施工人员不存在"); } - return R.ok(constructionUserService.getVo(constructionUser)); + return R.ok(constructionUserService.getVo(constructionUser, true)); } /** @@ -69,7 +69,7 @@ public class SubConstructionUserAppController { @GetMapping("/{id}") public R queryById(@NotNull(message = "主键不能为空") @PathVariable Long id) { - return R.ok(constructionUserService.queryById(id)); + return R.ok(constructionUserService.queryById(id, true)); } /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/app/SubContractorAppController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/app/SubContractorAppController.java new file mode 100644 index 00000000..76e72653 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/app/SubContractorAppController.java @@ -0,0 +1,39 @@ +package org.dromara.contractor.controller.app; + +import jakarta.annotation.Resource; +import jakarta.validation.constraints.NotNull; +import org.dromara.common.core.domain.R; +import org.dromara.common.web.core.BaseController; +import org.dromara.contractor.domain.vo.contractor.SubContractorManagerVo; +import org.dromara.contractor.service.ISubContractorService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 分包单位 app 接口 + * + * @author lilemy + * @date 2025-09-03 15:09 + */ +@Validated +@RestController +@RequestMapping("/app/contractor/contractor") +public class SubContractorAppController extends BaseController { + + @Resource + private ISubContractorService contractorService; + + /** + * 根据项目id查询分包方管理人员信息列表 + */ + @GetMapping("/listManager/{projectId}") + public R> listManager(@NotNull(message = "项目id不能为空") + @PathVariable Long projectId) { + return R.ok(contractorService.queryManagerListByProjectId(projectId)); + } +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserCreateReq.java index 5cc0092d..8d3af0ba 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserCreateReq.java @@ -55,11 +55,66 @@ public class SubConstructionUserCreateReq implements Serializable { */ private String nation; + /** + * 身份证正面图片 + */ + private String sfzFrontPic; + + /** + * 身份证反面图片 + */ + private String sfzBackPic; + + /** + * 身份证号码 + */ + private String sfzNumber; + + /** + * 身份证有效开始期 + */ + private String sfzStart; + + /** + * 身份证有效结束期 + */ + private String sfzEnd; + + /** + * 身份证地址 + */ + private String sfzSite; + + /** + * 身份证出生日期 + */ + private String sfzBirth; + /** * 籍贯 */ private String nativePlace; + /** + * 银行卡图片 + */ + private String yhkPic; + + /** + * 银行卡号 + */ + private String yhkNumber; + + /** + * 开户行 + */ + private String yhkOpeningBank; + + /** + * 持卡人 + */ + private String yhkCardholder; + /** * 工种(字典type_of_work) */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserVo.java index cb0c0168..605766f3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/vo/constructionuser/SubConstructionUserVo.java @@ -6,6 +6,8 @@ import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; import org.dromara.contractor.domain.SubConstructionUser; import org.dromara.contractor.domain.vo.contractor.SubContractorVo; @@ -118,12 +120,24 @@ public class SubConstructionUserVo implements Serializable { @ExcelProperty(value = "身份证正面图片") private String sfzFrontPic; + /** + * 身份证正面图片URL + */ + @Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "sfzFrontPic") + private String sfzFrontPicUrl; + /** * 身份证反面图片 */ @ExcelProperty(value = "身份证反面图片") private String sfzBackPic; + /** + * 身份证反面图片URL + */ + @Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "sfzBackPic") + private String sfzBackPicUrl; + /** * 身份证号码 */ @@ -166,6 +180,12 @@ public class SubConstructionUserVo implements Serializable { @ExcelProperty(value = "银行卡图片") private String yhkPic; + /** + * 银行卡图片地址 + */ + @Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "yhkPic") + private String yhkPicUrl; + /** * 银行卡号 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubConstructionUserService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubConstructionUserService.java index 0d0f7a09..8de9a8a3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubConstructionUserService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/ISubConstructionUserService.java @@ -25,10 +25,11 @@ public interface ISubConstructionUserService extends IService queryList(SubConstructionUserQueryReq req) { LambdaQueryWrapper lqw = this.buildQueryWrapper(req); - List constructionUserVoList = this.list(lqw).stream().map(this::getVo).toList(); + List constructionUserVoList = this.list(lqw).stream().map(user -> getVo(user, false)).toList(); // 关联项目信息 Set projectIdList = constructionUserVoList.stream().map(SubConstructionUserVo::getProjectId) .collect(Collectors.toSet()); @@ -332,6 +338,16 @@ public class SubConstructionUserServiceImpl extends ServiceImpl queryPageList(HseSafetyInspectionQueryReq req, PageQuery pageQuery) { + return safetyInspectionService.queryPageList(req, pageQuery); + } + + /** + * 获取安全巡检工单详细信息 + */ + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(safetyInspectionService.queryById(id)); + } + + /** + * 新增安全巡检工单 + */ + @Log(title = "安全巡检工单", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated @RequestBody HseSafetyInspectionCreateReq req) { + return R.ok(safetyInspectionService.insertByBo(req)); + } + + /** + * 新增安全巡检工单整改 + */ + @Log(title = "安全巡检工单", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/rectification") + public R insertRectification(@Validated @RequestBody HseSafetyInspectionRectificationReq req) { + return toAjax(safetyInspectionService.insertRectification(req)); + } + + /** + * 新增安全巡检工单复查 + */ + @Log(title = "安全巡检工单", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/review") + public R insertReview(@Validated @RequestBody HseSafetyInspectionReviewReq req) { + return toAjax(safetyInspectionService.insertReview(req)); + } + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/app/HseViolationRecordAppController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/app/HseViolationRecordAppController.java index 61cccb0b..165ba97f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/app/HseViolationRecordAppController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/app/HseViolationRecordAppController.java @@ -12,6 +12,7 @@ import org.dromara.common.web.core.BaseController; import org.dromara.safety.domain.dto.violationrecord.HseViolationRecordCreateHandlerReq; import org.dromara.safety.domain.dto.violationrecord.HseViolationRecordQueryReq; import org.dromara.safety.domain.dto.violationrecord.HseViolationRecordRectificationReq; +import org.dromara.safety.domain.dto.violationrecord.HseViolationRecordReviewReq; import org.dromara.safety.domain.vo.violationrecord.HseViolationRecordVo; import org.dromara.safety.service.IHseViolationRecordService; import org.springframework.validation.annotation.Validated; @@ -67,4 +68,14 @@ public class HseViolationRecordAppController extends BaseController { public R insertRectification(@Validated @RequestBody HseViolationRecordRectificationReq req) { return toAjax(violationRecordService.insertRectification(req)); } + + /** + * 新增违规记录复查 + */ + @Log(title = "违规记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/review") + public R insertReview(@Validated @RequestBody HseViolationRecordReviewReq req) { + return toAjax(violationRecordService.insertReview(req)); + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyInspection.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyInspection.java index c8fef3bc..7e69a9cb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyInspection.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseSafetyInspection.java @@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; +import java.time.LocalDate; import java.util.Date; /** @@ -34,6 +35,11 @@ public class HseSafetyInspection extends BaseEntity { */ private Long projectId; + /** + * 检查项目 + */ + private String checkProject; + /** * 检查类型 */ @@ -72,7 +78,7 @@ public class HseSafetyInspection extends BaseEntity { /** * 整改期限 */ - private Date rectificationDeadline; + private LocalDate rectificationDeadline; /** * 回复日期 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseTeamMeeting.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseTeamMeeting.java index f3a9ee16..84b16dbf 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseTeamMeeting.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseTeamMeeting.java @@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; -import java.time.LocalDate; +import java.time.LocalDateTime; /** * 站班会对象 hse_team_meeting @@ -47,7 +47,7 @@ public class HseTeamMeeting extends BaseEntity { /** * 开会时间 */ - private LocalDate meetingDate; + private LocalDateTime meetingDate; /** * 宣讲人 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionCreateReq.java index 97b5df25..3c288340 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionCreateReq.java @@ -1,12 +1,12 @@ package org.dromara.safety.domain.dto.safetyinspection; -import com.fasterxml.jackson.annotation.JsonFormat; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.time.LocalDate; import java.util.Date; /** @@ -25,19 +25,28 @@ public class HseSafetyInspectionCreateReq implements Serializable { @NotNull(message = "项目id不能为空") private Long projectId; + /** + * 检查项目 + */ + @NotBlank(message = "检查项目不能为空") + private String checkProject; + /** * 检查类型 */ + @NotBlank(message = "检查类型不能为空") private String checkType; /** * 违章类型 */ + @NotBlank(message = "违章类型不能为空") private String violationType; /** * 巡检结果 */ + @NotBlank(message = "巡检结果不能为空") private String inspectionResult; /** @@ -58,8 +67,7 @@ public class HseSafetyInspectionCreateReq implements Serializable { /** * 整改期限 */ - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") - private Date rectificationDeadline; + private LocalDate rectificationDeadline; /** * 是否回复（1回复 2不回复） @@ -67,31 +75,11 @@ public class HseSafetyInspectionCreateReq implements Serializable { @NotBlank(message = "是否回复不能为空") private String isReply; - /** - * 回复日期 - */ - private String replyDate; - - /** - * 工单状态（1通知 2整改 3复查） - */ - private String status; - - /** - * 问题隐患 - */ - private String hiddenDanger; - /** * 检查时间 */ private Date checkTime; - /** - * 整改时间 - */ - private Date rectificationTime; - /** * 检查附件 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionRectificationReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionRectificationReq.java new file mode 100644 index 00000000..b2a45955 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionRectificationReq.java @@ -0,0 +1,42 @@ +package org.dromara.safety.domain.dto.safetyinspection; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author lilemy + * @date 2025-09-03 14:41 + */ +@Data +public class HseSafetyInspectionRectificationReq implements Serializable { + + @Serial + private static final long serialVersionUID = 892746807506646837L; + + /** + * 主键ID + */ + @NotNull(message = "主键不能为空") + private Long id; + + /** + * 问题隐患 + */ + private String hiddenDanger; + + /** + * 整改措施 + */ + @NotBlank(message = "整改措施不能为空") + private String measure; + + /** + * 整改附件 + */ + private String rectificationFile; + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionReviewReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionReviewReq.java new file mode 100644 index 00000000..cc0e1aef --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionReviewReq.java @@ -0,0 +1,37 @@ +package org.dromara.safety.domain.dto.safetyinspection; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author lilemy + * @date 2025-09-03 14:42 + */ +@Data +public class HseSafetyInspectionReviewReq implements Serializable { + + @Serial + private static final long serialVersionUID = 4562927673208783521L; + + /** + * 主键ID + */ + @NotNull(message = "主键不能为空") + private Long id; + + /** + * 复查情况 + */ + @NotBlank(message = "复查情况不能为空") + private String review; + + /** + * 复查状态（1通过 2未通过） + */ + @NotBlank(message = "复查状态不能为空") + private String reviewType; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionUpdateReq.java index 1f4f2747..76ffeb9c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/safetyinspection/HseSafetyInspectionUpdateReq.java @@ -1,6 +1,7 @@ package org.dromara.safety.domain.dto.safetyinspection; import com.fasterxml.jackson.annotation.JsonFormat; +import jakarta.validation.constraints.NotNull; import lombok.Data; import java.io.Serial; @@ -20,6 +21,7 @@ public class HseSafetyInspectionUpdateReq implements Serializable { /** * 主键ID */ + @NotNull(message = "主键不能为空") private Long id; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/teammeeting/HseTeamMeetingCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/teammeeting/HseTeamMeetingCreateReq.java index 5fc6f70a..3ea0ac3d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/teammeeting/HseTeamMeetingCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/teammeeting/HseTeamMeetingCreateReq.java @@ -6,7 +6,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.List; /** @@ -41,7 +41,7 @@ public class HseTeamMeetingCreateReq implements Serializable { * 开会时间 */ @NotNull(message = "开会时间不能为空") - private LocalDate meetingDate; + private LocalDateTime meetingDate; /** * 宣讲人 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/violationrecord/HseViolationRecordReviewReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/violationrecord/HseViolationRecordReviewReq.java new file mode 100644 index 00000000..b85504a4 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/violationrecord/HseViolationRecordReviewReq.java @@ -0,0 +1,42 @@ +package org.dromara.safety.domain.dto.violationrecord; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author lilemy + * @date 2025-09-03 11:35 + */ +@Data +public class HseViolationRecordReviewReq implements Serializable { + + @Serial + private static final long serialVersionUID = 250013725990078581L; + + /** + * 主键id + */ + @NotNull(message = "主键不能为空") + private Long id; + + /** + * 复查情况 + */ + @NotBlank(message = "复查情况不能为空") + private String review; + + /** + * 复查状态（1通过 2未通过） + */ + @NotBlank(message = "复查状态不能为空") + private String reviewType; + + /** + * 备注 + */ + private String remark; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/teammeeting/HseTeamMeetingVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/teammeeting/HseTeamMeetingVo.java index 85801480..9b0b800e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/teammeeting/HseTeamMeetingVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/teammeeting/HseTeamMeetingVo.java @@ -11,6 +11,7 @@ import org.dromara.safety.domain.HseTeamMeeting; import java.io.Serial; import java.io.Serializable; +import java.time.LocalDateTime; import java.util.Date; import java.util.List; @@ -67,7 +68,7 @@ public class HseTeamMeetingVo implements Serializable { * 开会时间 */ @ExcelProperty(value = "开会时间") - private Date meetingDate; + private LocalDateTime meetingDate; /** * 宣讲人 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyInspectionService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyInspectionService.java index d202e2aa..483e4c31 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyInspectionService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseSafetyInspectionService.java @@ -7,10 +7,7 @@ import jakarta.servlet.http.HttpServletResponse; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.safety.domain.HseSafetyInspection; -import org.dromara.safety.domain.dto.safetyinspection.HseSafetyInspectionCreateReq; -import org.dromara.safety.domain.dto.safetyinspection.HseSafetyInspectionGisReq; -import org.dromara.safety.domain.dto.safetyinspection.HseSafetyInspectionQueryReq; -import org.dromara.safety.domain.dto.safetyinspection.HseSafetyInspectionUpdateReq; +import org.dromara.safety.domain.dto.safetyinspection.*; import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionListGisVo; import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionVo; @@ -114,4 +111,19 @@ public interface IHseSafetyInspectionService extends IService * @return 是否新增成功 */ Boolean insertRectification(HseViolationRecordRectificationReq req); + + /** + * 新增违章复查信息 + * + * @param req 违章复查信息 + * @return 是否新增成功 + */ + Boolean insertReview(HseViolationRecordReviewReq req); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java index 0bbcacc8..61be216b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java @@ -22,6 +22,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.oss.core.OssClient; import org.dromara.common.oss.exception.OssException; import org.dromara.common.oss.factory.OssFactory; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.utils.DocumentUtil; import org.dromara.contractor.domain.SubContractor; import org.dromara.contractor.service.ISubContractorService; @@ -31,10 +32,8 @@ import org.dromara.project.service.IBusProjectTeamService; import org.dromara.safety.constant.HseSafetyConstant; import org.dromara.safety.domain.HseSafetyInspection; import org.dromara.safety.domain.HseTeamMeeting; -import org.dromara.safety.domain.dto.safetyinspection.HseSafetyInspectionCreateReq; -import org.dromara.safety.domain.dto.safetyinspection.HseSafetyInspectionGisReq; -import org.dromara.safety.domain.dto.safetyinspection.HseSafetyInspectionQueryReq; -import org.dromara.safety.domain.dto.safetyinspection.HseSafetyInspectionUpdateReq; +import org.dromara.safety.domain.HseViolationRecord; +import org.dromara.safety.domain.dto.safetyinspection.*; import org.dromara.safety.domain.enums.HseSafetyInspectionReviewTypeEnum; import org.dromara.safety.domain.enums.HseSafetyInspectionStatusEnum; import org.dromara.safety.domain.vo.safetyinspection.HseSafetyInspectionListGisVo; @@ -203,7 +202,7 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl