目标合并fix

songhuangfeng123

2022-08-11 d674b4d350236301d0e31929661d53796e0e89df

 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);