From d674b4d350236301d0e31929661d53796e0e89df Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期四, 11 八月 2022 15:17:17 +0800
Subject: [PATCH] 目标合并fix
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/repository/RewardPunishmentDetailRepository.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/repository/RewardPunishmentDetailRepository.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/repository/RewardPunishmentDetailRepository.java
index e7c6d7d..1658606 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/repository/RewardPunishmentDetailRepository.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/repository/RewardPunishmentDetailRepository.java
@@ -20,12 +20,12 @@
@Repository
public interface RewardPunishmentDetailRepository extends BaseMapper<RewardPunishmentDetail> {
- @Select("<script> select a.id,a.person_id,a.create_time ,b.standard_type ,b.content ,b.q_name ,b.reason " +
+ @Select("<script> select a.id,a.person_id,a.person_name,a.create_time ,a.memo,b.standard_type ,b.content ,b.q_name ,b.reason " +
"from reward_punishment_detail a left join reward_punishment_standard b on a.reward_punishment_standard_id=b.id where 1=1 " +
"<if test =\"personId !='' and personId !=null\">and a.person_id =#{personId}</if> </script> ")
IPage<RewardPunishmentDetailDto> queryAll(IPage<RewardPunishmentDetailDto> page, @Param("personId") String personId);
- @Select("<script> select a.id,a.person_id,a.create_time ,b.standard_type ,b.content ,b.q_name ,b.reason " +
+ @Select("<script> select a.id,a.person_id,a.person_name,a.create_time ,a.memo,b.standard_type ,b.content ,b.q_name ,b.reason " +
"from reward_punishment_detail a left join reward_punishment_standard b on a.reward_punishment_standard_id=b.id where 1=1 " +
"<if test =\"personId !='' and personId !=null\">and a.person_id =#{personId}</if> </script> ")
List<RewardPunishmentDetail> queryAll( @Param("personId")String personId);
--
Gitblit v1.9.2