From 12e517b169d6084401946c39c8438d62d8df51a0 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Wed, 1 Apr 2026 10:03:41 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E6=82=A3=E8=80=83=E8=AF=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/HiddenEvaluationRecordController.java | 4 ++-- .../command/query/HiddenEvaluationRecordQueryExe.java | 4 ++-- .../service/HiddenEvaluationRecordServiceImpl.java | 4 ++-- .../api/HiddenEvaluationRecordServiceI.java | 2 +- .../hidden/evaluation/dto/HiddenEvalPageQry.java | 4 +++- .../mapper/HiddenEvaluationRecordMapper.java | 2 +- .../repository/HiddenEvaluationRecordRepository.java | 2 +- .../impl/HiddenEvaluationRecordRepositoryImpl.java | 4 ++-- .../resources/mapper/HiddenEvaluationRecordMapper.xml | 11 ++++++----- 9 files changed, 20 insertions(+), 17 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/hidden/evaluation/web/HiddenEvaluationRecordController.java b/web-adapter/src/main/java/com/zcloud/hidden/evaluation/web/HiddenEvaluationRecordController.java index dd59543..a1a61f3 100644 --- a/web-adapter/src/main/java/com/zcloud/hidden/evaluation/web/HiddenEvaluationRecordController.java +++ b/web-adapter/src/main/java/com/zcloud/hidden/evaluation/web/HiddenEvaluationRecordController.java @@ -64,8 +64,8 @@ public class HiddenEvaluationRecordController { @ApiOperation("考评列表") @PostMapping("/hiddenEvalPage") - public PageResponse hidddenEvalPage(@RequestBody HiddenEvalPageQry qry) { - return hiddenEvaluationRecordService.hidddenEvalPage(qry); + public PageResponse hiddenEvalPage(@RequestBody HiddenEvalPageQry qry) { + return hiddenEvaluationRecordService.hiddenEvalPage(qry); } @ApiOperation("分公司绩效好评-首页列表") diff --git a/web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationRecordQueryExe.java b/web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationRecordQueryExe.java index 08538d8..db67aa1 100644 --- a/web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationRecordQueryExe.java +++ b/web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationRecordQueryExe.java @@ -112,9 +112,9 @@ public class HiddenEvaluationRecordQueryExe { return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } - public PageResponse hidddenEvalPage(HiddenEvalPageQry qry) { + public PageResponse hiddenEvalPage(HiddenEvalPageQry qry) { Map params = PageQueryHelper.toHashMap(qry); - PageResponse pageResponse = hiddenEvaluationRecordRepository.hidddenEvalPage(params); + PageResponse pageResponse = hiddenEvaluationRecordRepository.hiddenEvalPage(params); List examCenterCOS =hiddenEvaluationRecordCoConvertor.converHiddenEvalDOsToCOs(pageResponse.getData()); diff --git a/web-app/src/main/java/com/zcloud/hidden/evaluation/service/HiddenEvaluationRecordServiceImpl.java b/web-app/src/main/java/com/zcloud/hidden/evaluation/service/HiddenEvaluationRecordServiceImpl.java index c0a8068..a4b3b72 100644 --- a/web-app/src/main/java/com/zcloud/hidden/evaluation/service/HiddenEvaluationRecordServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/hidden/evaluation/service/HiddenEvaluationRecordServiceImpl.java @@ -77,8 +77,8 @@ public class HiddenEvaluationRecordServiceImpl implements HiddenEvaluationRecord } @Override - public PageResponse hidddenEvalPage(HiddenEvalPageQry qry) { - return hiddenEvaluationRecordQueryExe.hidddenEvalPage(qry); + public PageResponse hiddenEvalPage(HiddenEvalPageQry qry) { + return hiddenEvaluationRecordQueryExe.hiddenEvalPage(qry); } @Override diff --git a/web-client/src/main/java/com/zcloud/hidden/evaluation/api/HiddenEvaluationRecordServiceI.java b/web-client/src/main/java/com/zcloud/hidden/evaluation/api/HiddenEvaluationRecordServiceI.java index ca8f2cf..543790d 100644 --- a/web-client/src/main/java/com/zcloud/hidden/evaluation/api/HiddenEvaluationRecordServiceI.java +++ b/web-client/src/main/java/com/zcloud/hidden/evaluation/api/HiddenEvaluationRecordServiceI.java @@ -32,7 +32,7 @@ public interface HiddenEvaluationRecordServiceI { PageResponse userEvalStatisticsPage(UserEvalStatisticsPageQry qry); - PageResponse hidddenEvalPage(HiddenEvalPageQry qry); + PageResponse hiddenEvalPage(HiddenEvalPageQry qry); void exportUserEvalStatisticsPage(Long[] ids, Long corpinfoId,HttpServletResponse httpServletResponse); diff --git a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/HiddenEvalPageQry.java b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/HiddenEvalPageQry.java index 3f08d97..3a1ea83 100644 --- a/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/HiddenEvalPageQry.java +++ b/web-client/src/main/java/com/zcloud/hidden/evaluation/dto/HiddenEvalPageQry.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotNull; +import java.util.List; /** @@ -49,6 +50,7 @@ public class HiddenEvalPageQry extends PageQuery { @ApiModelProperty(value = "兑换标识 0-未兑换 1-已兑换") private Integer exchangeFlag; - + /* @ApiModelProperty(value = "考评结果.1:考核未完成,2:考评合格,3:考核不合格") + private List evaluationResultList;*/ } diff --git a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/mapper/HiddenEvaluationRecordMapper.java b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/mapper/HiddenEvaluationRecordMapper.java index 5fe797c..2167b24 100644 --- a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/mapper/HiddenEvaluationRecordMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/mapper/HiddenEvaluationRecordMapper.java @@ -32,7 +32,7 @@ public interface HiddenEvaluationRecordMapper extends BaseMapper userEvalStatisticsPage(IPage iPage, Map params, String menuPerms); - IPage hidddenEvalPage(IPage iPage, Map params); + IPage hiddenEvalPage(IPage iPage, Map params); IPage corpEvalPage(IPage iPage, Map params, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/HiddenEvaluationRecordRepository.java b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/HiddenEvaluationRecordRepository.java index 5512b6d..2b16d34 100644 --- a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/HiddenEvaluationRecordRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/HiddenEvaluationRecordRepository.java @@ -27,7 +27,7 @@ public interface HiddenEvaluationRecordRepository extends BaseRepository userEvalStatisticsPage(Map params); - PageResponse hidddenEvalPage(Map params); + PageResponse hiddenEvalPage(Map params); List findRecordsToExchange(Long userId); diff --git a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/impl/HiddenEvaluationRecordRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/impl/HiddenEvaluationRecordRepositoryImpl.java index 7cb27c4..2526b56 100644 --- a/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/impl/HiddenEvaluationRecordRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/impl/HiddenEvaluationRecordRepositoryImpl.java @@ -88,9 +88,9 @@ public class HiddenEvaluationRecordRepositoryImpl extends BaseRepositoryImpl hidddenEvalPage(Map params) { + public PageResponse hiddenEvalPage(Map params) { IPage iPage = new Query().getPage(params); - IPage result = hiddenEvaluationRecordMapper.hidddenEvalPage(iPage, params); + IPage result = hiddenEvaluationRecordMapper.hiddenEvalPage(iPage, params); return PageHelper.pageToResponse(result, result.getRecords()); } diff --git a/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml index eff54d8..a656935 100644 --- a/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml @@ -65,7 +65,7 @@ ) ec_all ON ec_all.corpinfo_id = ec.corpinfo_id AND ec_all.evaluation_type = ec.evaluation_type WHERE ec.delete_enum = 'FALSE' AND ci.delete_enum = 'FALSE' - AND ci.type IN (0, 1, 6) + AND ci.type IN (0, 1, 2, 6) AND ci.use_flag = 1 AND ci.corp_name LIKE CONCAT('%', #{params.corpinfoName}, '%') @@ -74,7 +74,7 @@ AND ec.evaluation_type = #{params.evaluationType} - AND u.name LIKE CONCAT('%', #{params.userName}, '%') + AND ec_all.evaluationMembers LIKE CONCAT('%-%', #{params.userName}, '%') GROUP BY ec.corpinfo_id, ec.evaluation_type ORDER BY ecorp.create_time desc @@ -209,7 +209,7 @@ SELECT 1 FROM hidden_evaluation_detail hed2 JOIN hidden_evaluation_record her2 ON hed2.hidden_evaluation_record_id = her2.hidden_evaluation_record_id - WHERE her2.hidden_id = h.id + WHERE her2.hidden_id = h.hidden_id AND hed2.evaluation_user_id = #{params.currentUserId} AND hed2.delete_enum = 'FALSE' ) @@ -220,7 +220,7 @@ SELECT 1 FROM hidden_evaluation_detail hed2 JOIN hidden_evaluation_record her2 ON hed2.hidden_evaluation_record_id = her2.hidden_evaluation_record_id - WHERE her2.hidden_id = h.id + WHERE her2.hidden_id = h.hidden_id AND hed2.evaluation_user_id = #{params.currentUserId} AND hed2.delete_enum = 'FALSE' ) @@ -344,7 +344,7 @@ ORDER BY u.sort ,u.create_time desc - select h.source, h.hidden_id AS hiddenId, h.id AS hiddenSnowFlakeId, @@ -366,6 +366,7 @@ left join user u on hd.evaluation_user_id = u.id and u.delete_enum = 'FALSE' where her.delete_enum = 'FALSE' and her.find_user_id = #{params.findUserId} + and her.evaluation_result=2 AND h.state = 301 -- 已验收 -- 来源4/5必须满足final_check=1，其他只需要state=301 AND (