From 5ad384e5b1a148696f5e3f3c3f52f6564a2961d3 Mon Sep 17 00:00:00 2001 From: lishiwei <3230787218@qq.com> Date: Fri, 26 Jun 2026 10:10:58 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E5=A4=8D=E9=9A=90=E6=82=A3?= =?UTF-8?q?=E5=A4=84=E7=BD=9A=E5=8A=9F=E8=83=BD=E4=B8=AD=E7=9A=84=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E5=A4=84=E7=BD=9A=E5=92=8C=E6=95=B0=E6=8D=AE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/web/hidden/HiddenController.java | 5 +- .../hidden/HiddenAcceptRecordUpdateExe.java | 7 +-- .../command/hidden/HiddenPenaltyAddExe.java | 37 +++++++++++---- .../hidden/HiddenPenaltyUpdateExe.java | 2 +- .../SafetyEnvironmentalInspectionAddExe.java | 47 +++++++++++++++++++ .../command/project/KeyProjectAddExe.java | 1 + .../command/query/hidden/HiddenQueryExe.java | 19 ++++++-- .../service/hidden/HiddenServiceImpl.java | 4 +- .../project/api/hidden/HiddenServiceI.java | 2 +- .../dto/hidden/HiddenPenaltyAddCmd.java | 3 ++ .../mapper/HiddenPenaltyMapper.java | 3 +- .../SafetyEnvironmentalInspectionMapper.java | 2 +- .../hidden/HiddenPenaltyRepository.java | 3 +- .../hidden/HiddenPenaltyRepositoryImpl.java | 3 +- 14 files changed, 110 insertions(+), 28 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenController.java b/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenController.java index df98846..8ebc27a 100644 --- a/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenController.java +++ b/web-adapter/src/main/java/com/zcloud/key/project/web/hidden/HiddenController.java @@ -79,8 +79,9 @@ public class HiddenController { @ApiOperation("详情") @GetMapping("/{id}") - public SingleResponse getInfoById(@PathVariable("id") Long id) { - return hiddenService.getInfoById(id); + public SingleResponse getInfoById(@PathVariable("id") Long id, + @RequestParam(required = false) String hiddenPenaltyId) { + return hiddenService.getInfoById(id, hiddenPenaltyId); } @ApiOperation("删除") diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java index af5c0ea..ffdb02e 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenAcceptRecordUpdateExe.java @@ -135,9 +135,10 @@ public class HiddenAcceptRecordUpdateExe { // TODO 完成该隐患的待办 messageNoticeExe.sendMessageCompleteEvent(findUserDO.getId()); } - if (cmd.getState() == 1 && hiddenDO != null) { - notifyPenaltyUsers(hiddenDO); - } + // 在检查发起时进行隐患处罚 此处不需要处罚 +// if (cmd.getState() == 1 && hiddenDO != null) { +// notifyPenaltyUsers(hiddenDO); +// } if (cmd.getState() == 0 && hiddenDO != null) { if (hiddenDO.getSource() == 1) { // 视频识别隐患 diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenPenaltyAddExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenPenaltyAddExe.java index 66a7f0b..32811ba 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenPenaltyAddExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenPenaltyAddExe.java @@ -15,12 +15,14 @@ import com.zcloud.key.project.persistence.dataobject.hidden.HiddenPenaltyDO; import com.zcloud.key.project.persistence.repository.hidden.HiddenPenaltyRepository; import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository; import lombok.AllArgsConstructor; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.HashMap; +import java.util.List; import java.util.Map; @Component @@ -35,15 +37,14 @@ public class HiddenPenaltyAddExe { @Transactional(rollbackFor = Exception.class) public SingleResponse execute(HiddenPenaltyAddCmd cmd) { - HiddenPenaltyDO existing = hiddenPenaltyRepository.getByHiddenId(cmd.getHiddenId()); + HiddenPenaltyDO target = resolveTarget(cmd); - // 已存在记录：三个状态均为0代表仅初始化、未处罚，走首次处罚更新逻辑 - if (existing != null) { - if (Integer.valueOf(0).equals(existing.getFineFlag()) - && Integer.valueOf(0).equals(existing.getFeedbackStatus()) - && Integer.valueOf(0).equals(existing.getEditFlag())) { + if (target != null) { + if (Integer.valueOf(0).equals(target.getFineFlag()) + && Integer.valueOf(0).equals(target.getFeedbackStatus()) + && Integer.valueOf(0).equals(target.getEditFlag())) { HiddenPenaltyE e = new HiddenPenaltyE(); - e.setHiddenPenaltyId(existing.getHiddenPenaltyId()); + e.setHiddenPenaltyId(target.getHiddenPenaltyId()); BeanUtils.copyProperties(cmd, e); if (e.getPenaltyTime() == null) { e.setPenaltyTime(LocalDateTime.now()); @@ -52,14 +53,13 @@ public class HiddenPenaltyAddExe { if (!res) { throw new BizException("保存失败"); } - HiddenPenaltyDO updated = hiddenPenaltyRepository.getByHiddenId(cmd.getHiddenId()); + HiddenPenaltyDO updated = hiddenPenaltyRepository.getByPenaltyId(target.getHiddenPenaltyId()); handlePenaltyIssued(updated); return SingleResponse.of(hiddenPenaltyCoConvertor.converDOToCO(updated)); } throw new BizException("无法重复处罚"); } - // 不存在记录：初始化（隐患发现时同步创建，三个状态默认0） HiddenPenaltyE e = new HiddenPenaltyE(); e.setHiddenPenaltyId(Tools.get32UUID()); BeanUtils.copyProperties(cmd, e); @@ -70,11 +70,28 @@ public class HiddenPenaltyAddExe { if (!res) { throw new BizException("保存失败"); } - HiddenPenaltyDO saved = hiddenPenaltyRepository.getByHiddenId(cmd.getHiddenId()); + HiddenPenaltyDO saved = hiddenPenaltyRepository.getByPenaltyId(e.getHiddenPenaltyId()); handlePenaltyIssued(saved); return SingleResponse.of(hiddenPenaltyCoConvertor.converDOToCO(saved)); } + private HiddenPenaltyDO resolveTarget(HiddenPenaltyAddCmd cmd) { + if (StringUtils.isNotBlank(cmd.getHiddenPenaltyId())) { + return hiddenPenaltyRepository.getByPenaltyId(cmd.getHiddenPenaltyId()); + } + List list = hiddenPenaltyRepository.getByHiddenId(cmd.getHiddenId()); + if (list != null && !list.isEmpty()) { + for (HiddenPenaltyDO item : list) { + if (Integer.valueOf(0).equals(item.getFineFlag()) + && Integer.valueOf(0).equals(item.getFeedbackStatus()) + && Integer.valueOf(0).equals(item.getEditFlag())) { + return item; + } + } + } + return null; + } + private void handlePenaltyIssued(HiddenPenaltyDO penaltyDO) { HiddenDO hiddenDO = hiddenRepository.getInfoByHiddenId(penaltyDO.getHiddenId()); if (hiddenDO != null) { diff --git a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenPenaltyUpdateExe.java b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenPenaltyUpdateExe.java index 4de3e22..5265ebd 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenPenaltyUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/hidden/HiddenPenaltyUpdateExe.java @@ -59,7 +59,7 @@ public class HiddenPenaltyUpdateExe { throw new BizException("修改失败"); } - HiddenPenaltyDO updated = hiddenPenaltyRepository.getByHiddenId(existing.getHiddenId()); + HiddenPenaltyDO updated = hiddenPenaltyRepository.getByPenaltyId(existing.getHiddenPenaltyId()); handleFeedbackTodo(updated); return SingleResponse.of(hiddenPenaltyCoConvertor.converDOToCO(updated)); } diff --git a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionAddExe.java b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionAddExe.java index 5966b18..13b07a0 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionAddExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/inspection/SafetyEnvironmentalInspectionAddExe.java @@ -1,6 +1,7 @@ package com.zcloud.key.project.command.inspection; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import com.alibaba.cola.exception.BizException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jjb.saas.framework.auth.model.SSOUser; @@ -24,14 +25,18 @@ import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionConten import com.zcloud.key.project.dto.inspection.SafetyEnvironmentalInspectionUserAddCmd; import com.zcloud.key.project.persistence.dataobject.hidden.HiddenDO; import com.zcloud.key.project.persistence.dataobject.hidden.HiddenFindUserDO; +import com.zcloud.key.project.persistence.dataobject.hidden.HiddenPenaltyDO; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionContentDO; import com.zcloud.key.project.persistence.dataobject.inspection.SafetyEnvironmentalInspectionUserDO; import com.zcloud.key.project.persistence.dataobject.project.KeyProjectDO; +import com.zcloud.key.project.persistence.dataobject.project.KeyProjectPenaltyPersonnelDO; import com.zcloud.key.project.persistence.repository.hidden.HiddenFindUserRepository; +import com.zcloud.key.project.persistence.repository.hidden.HiddenPenaltyRepository; import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository; import com.zcloud.key.project.persistence.repository.impl.inspection.SafetyEnvironmentalInspectionContentRepositoryImpl; import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionContentRepository; import com.zcloud.key.project.persistence.repository.inspection.SafetyEnvironmentalInspectionUserRepository; +import com.zcloud.key.project.persistence.repository.project.KeyProjectPenaltyPersonnelRepository; import com.zcloud.key.project.persistence.repository.project.KeyProjectRepository; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -59,7 +64,9 @@ public class SafetyEnvironmentalInspectionAddExe { private final SafetyEnvironmentalInspectionContentRepository safetyEnvironmentalInspectionContentRepository; private final HiddenRepository hiddenRepository; private final HiddenFindUserRepository hiddenFindUserRepository; + private final HiddenPenaltyRepository hiddenPenaltyRepository; private final KeyProjectRepository keyProjectRepository; + private final KeyProjectPenaltyPersonnelRepository keyProjectPenaltyPersonnelRepository; private final MessageNoticeExe messageNoticeExe; private final MessageTemplateConfig messageTemplateConfig; @@ -170,6 +177,46 @@ public class SafetyEnvironmentalInspectionAddExe { hiddenRepository.batchInsert(BeanUtil.copyToList(hiddenList, HiddenDO.class)); // 新增隐患发现人 hiddenFindUserRepository.batchInsert(BeanUtil.copyToList(hiddenFindUserList, HiddenFindUserDO.class)); + + // 根据重点作业配置的处罚人员，为每个隐患初始化处罚记录 + List personnelList = + keyProjectPenaltyPersonnelRepository.getListByProjectId(cmd.getKeyProjectId()); + if (CollUtil.isNotEmpty(personnelList)) { + // 查询项目名称用于消息通知 + QueryWrapper projectQuery = new QueryWrapper<>(); + projectQuery.eq("key_project_id", cmd.getKeyProjectId()); + projectQuery.eq("delete_enum", "FALSE"); + projectQuery.orderByDesc("create_time"); + projectQuery.last("limit 1"); + KeyProjectDO projectDO = keyProjectRepository.getOne(projectQuery); + + List penaltyList = new ArrayList<>(); + hiddenAddCmdList.forEach(hiddenAddCmd -> personnelList.forEach(person -> { + HiddenPenaltyDO penalty = new HiddenPenaltyDO(); + penalty.setHiddenPenaltyId(Tools.get32UUID()); + penalty.setHiddenId(hiddenAddCmd.getHiddenId()); + penalty.setKeyProjectId(cmd.getKeyProjectId()); + penalty.setPenalizedCorpId(safetyEnvironmentalInspectionE.getInspectedCorpinfoId()); + penalty.setPenalizedUserId(person.getUserId()); + penalty.setFineFlag(0); + penalty.setFeedbackStatus(0); + penalty.setEditFlag(0); + penaltyList.add(penalty); + })); + hiddenPenaltyRepository.saveBatch(penaltyList); + + // 通知处罚人 + String projectName = projectDO != null ? projectDO.getProjectName() : ""; + Map sendParams = new HashMap<>(); + sendParams.put("keyProject", projectName); + personnelList.forEach(person -> { + messageNoticeExe.messageNotice(person.getUserId(), + messageTemplateConfig.getHiddenDangerPenaltyPersonApplyPenalty(), sendParams); + messageNoticeExe.sendMessageAddEvent(person.getUserId(), + "您有一条待处罚隐患，请及时发起处罚。", "待处罚", + safetyEnvironmentalInspectionE.getId(), safetyEnvironmentalInspectionE.getId()); + }); + } } } catch (Exception e) { log.error("报错了", e); diff --git a/web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectAddExe.java b/web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectAddExe.java index 627dd09..0b63376 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectAddExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectAddExe.java @@ -108,6 +108,7 @@ public class KeyProjectAddExe { keyProjectCameraRepository.saveBatch(keyProjectCameraDOList); } if (!CollectionUtils.isEmpty(penaltyPersonnelAddCmdList)) { + keyProjectPenaltyPersonnelRepository.deleteByKeyProjectId(keyProjectE.getKeyProjectId()); List penaltyPersonnelDOList = keyProjectPenaltyPersonnelCoConvertor.converCmdsToDOs(penaltyPersonnelAddCmdList); penaltyPersonnelDOList.forEach(item -> { item.setKeyProjectId(keyProjectE.getKeyProjectId()); diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenQueryExe.java index 4be49f0..cfbed51 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenQueryExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/hidden/HiddenQueryExe.java @@ -24,6 +24,7 @@ import com.zcloud.key.project.persistence.repository.hidden.HiddenPenaltyReposit import com.zcloud.key.project.persistence.repository.hidden.HiddenRectificationRecordRepository; import com.zcloud.key.project.persistence.repository.hidden.HiddenRepository; import lombok.AllArgsConstructor; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -63,7 +64,7 @@ public class HiddenQueryExe { List examCenterCOS = hiddenCoConvertor.converDOsToCOs(pageResponse.getData()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } - public SingleResponse getInfoByIdExecute(Long id) { + public SingleResponse getInfoByIdExecute(Long id, String hiddenPenaltyId) { HiddenDO hiddenDO = hiddenRepository.getInfoById(id); HiddenCO hiddenCO = new HiddenCO(); BeanUtils.copyProperties(hiddenDO, hiddenCO); @@ -94,12 +95,20 @@ public class HiddenQueryExe { BeanUtils.copyProperties(hiddenAcceptRecordDOs.get(0), hiddenAcceptRecordCO); hiddenCO.setAcceptRecord(hiddenAcceptRecordCO); } - HiddenPenaltyDO hiddenPenaltyDO = hiddenPenaltyRepository.getByHiddenId(hiddenDO.getHiddenId()); - if (hiddenPenaltyDO != null) { - HiddenPenaltyCO hiddenPenaltyCO = hiddenPenaltyCoConvertor.converDOToCO(hiddenPenaltyDO); + HiddenPenaltyDO targetPenalty = null; + if (StringUtils.isNotBlank(hiddenPenaltyId)) { + targetPenalty = hiddenPenaltyRepository.getByPenaltyId(hiddenPenaltyId); + } else { + List penaltyDOList = hiddenPenaltyRepository.getByHiddenId(hiddenDO.getHiddenId()); + if (penaltyDOList != null && !penaltyDOList.isEmpty()) { + targetPenalty = penaltyDOList.get(0); + } + } + if (targetPenalty != null) { + HiddenPenaltyCO hiddenPenaltyCO = hiddenPenaltyCoConvertor.converDOToCO(targetPenalty); hiddenCO.setHiddenPenaltyCO(hiddenPenaltyCO); - HiddenPenaltyFeedbackDO feedbackDO = hiddenPenaltyRepository.getFeedbackByPenaltyId(hiddenPenaltyDO.getHiddenPenaltyId()); + HiddenPenaltyFeedbackDO feedbackDO = hiddenPenaltyRepository.getFeedbackByPenaltyId(targetPenalty.getHiddenPenaltyId()); if (feedbackDO != null) { HiddenPenaltyFeedbackCO feedbackCO = hiddenPenaltyCoConvertor.converFeedbackDOToCO(feedbackDO); hiddenCO.setHiddenPenaltyFeedbackCO(feedbackCO); diff --git a/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenServiceImpl.java b/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenServiceImpl.java index 83411aa..b4ad9a8 100644 --- a/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/key/project/service/hidden/HiddenServiceImpl.java @@ -57,8 +57,8 @@ public class HiddenServiceImpl implements HiddenServiceI { } @Override - public SingleResponse getInfoById(Long id) { - return hiddenQueryExe.getInfoByIdExecute(id); + public SingleResponse getInfoById(Long id, String hiddenPenaltyId) { + return hiddenQueryExe.getInfoByIdExecute(id, hiddenPenaltyId); } } diff --git a/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenServiceI.java b/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenServiceI.java index 55d44ac..b69ad83 100644 --- a/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenServiceI.java +++ b/web-client/src/main/java/com/zcloud/key/project/api/hidden/HiddenServiceI.java @@ -25,6 +25,6 @@ public interface HiddenServiceI { void removeBatch(Long[] ids); - SingleResponse getInfoById(Long id); + SingleResponse getInfoById(Long id, String hiddenPenaltyId); } diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenPenaltyAddCmd.java b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenPenaltyAddCmd.java index c4d7484..30db8db 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenPenaltyAddCmd.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/hidden/HiddenPenaltyAddCmd.java @@ -15,6 +15,9 @@ public class HiddenPenaltyAddCmd { @ApiModelProperty(value = "隐患业务主键ID", required = true) private String hiddenId; + @ApiModelProperty(value = "处罚业务主键ID（多个处罚人时定位具体记录）") + private String hiddenPenaltyId; + @ApiModelProperty(value = "重点作业ID") private String keyProjectId; diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenPenaltyMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenPenaltyMapper.java index 5d36695..89f28a7 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenPenaltyMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/HiddenPenaltyMapper.java @@ -9,6 +9,7 @@ import com.zcloud.key.project.persistence.dataobject.hidden.HiddenPenaltyFeedbac import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; import java.util.Map; @Mapper @@ -20,7 +21,7 @@ public interface HiddenPenaltyMapper extends BaseMapper { IPage listPage(IPage iPage, @Param("params") Map params); - HiddenPenaltyDO getByHiddenId(@Param("hiddenId") String hiddenId); + List getByHiddenId(@Param("hiddenId") String hiddenId); IPage feedbackListPage(IPage iPage, @Param("params") Map params); diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java index 2068f73..9a54a51 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/inspection/SafetyEnvironmentalInspectionMapper.java @@ -22,7 +22,7 @@ import java.util.Map; @Mapper @DataScopes({ - @DataScope(method = "selectListPage", menuPerms = ""), + @DataScope(method = "selectListPage", menuPerms = "xgfd-bjcrqr"), }) public interface SafetyEnvironmentalInspectionMapper extends BaseMapper { IPage selectListPage(IPage page, @Param("params") Map params, String menuPerms); diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenPenaltyRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenPenaltyRepository.java index a1f73c7..97e2a0b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenPenaltyRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/hidden/HiddenPenaltyRepository.java @@ -5,13 +5,14 @@ import com.jjb.saas.framework.repository.repo.BaseRepository; import com.zcloud.key.project.persistence.dataobject.hidden.HiddenPenaltyDO; import com.zcloud.key.project.persistence.dataobject.hidden.HiddenPenaltyFeedbackDO; +import java.util.List; import java.util.Map; public interface HiddenPenaltyRepository extends BaseRepository { PageResponse listPage(Map params); - HiddenPenaltyDO getByHiddenId(String hiddenId); + List getByHiddenId(String hiddenId); HiddenPenaltyDO getByPenaltyId(String hiddenPenaltyId); diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenPenaltyRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenPenaltyRepositoryImpl.java index 190d6e4..48411b1 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenPenaltyRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/hidden/HiddenPenaltyRepositoryImpl.java @@ -13,6 +13,7 @@ import com.zcloud.key.project.persistence.repository.hidden.HiddenPenaltyReposit import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; @Service @@ -32,7 +33,7 @@ public class HiddenPenaltyRepositoryImpl } @Override - public HiddenPenaltyDO getByHiddenId(String hiddenId) { + public List getByHiddenId(String hiddenId) { return hiddenPenaltyMapper.getByHiddenId(hiddenId); }