diff --git a/src/main/java/com/gunshi/project/hsz/mapper/MentenceFarmerRecordMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/MentenceFarmerRecordMapper.java index b5b059b..86edf6e 100644 --- a/src/main/java/com/gunshi/project/hsz/mapper/MentenceFarmerRecordMapper.java +++ b/src/main/java/com/gunshi/project/hsz/mapper/MentenceFarmerRecordMapper.java @@ -31,7 +31,7 @@ public interface MentenceFarmerRecordMapper extends BaseMapper - select t1.*,t2.mentence_person_id as mentencePersonId,t2.mentence_person_name as mentencePersonName, + select t1.*,t2.mentence_person_id as mentencePersonId, t3.name as mentenceStDetailName,t4.st_name as mentenceStName,t4.id as mentenceStId,t3.id as mentenceStDetailId from hidden_info t1 join mentence_farmer_record t2 on t1.mentence_farmer_record_id = t2.id diff --git a/src/main/java/com/gunshi/project/hsz/model/MentenceFarmerRecord.java b/src/main/java/com/gunshi/project/hsz/model/MentenceFarmerRecord.java index 63f1553..5ffa6a2 100644 --- a/src/main/java/com/gunshi/project/hsz/model/MentenceFarmerRecord.java +++ b/src/main/java/com/gunshi/project/hsz/model/MentenceFarmerRecord.java @@ -44,7 +44,7 @@ public class MentenceFarmerRecord { @Schema(description = "维护人员id") private String mentencePersonId; - @TableField("mentence_person_name") + @TableField(exist = false) @Schema(description = "维护人员名称") private String mentencePersonName; diff --git a/src/main/java/com/gunshi/project/hsz/service/MentenceFarmerRecordService.java b/src/main/java/com/gunshi/project/hsz/service/MentenceFarmerRecordService.java index 67cb39d..7aab724 100644 --- a/src/main/java/com/gunshi/project/hsz/service/MentenceFarmerRecordService.java +++ b/src/main/java/com/gunshi/project/hsz/service/MentenceFarmerRecordService.java @@ -54,12 +54,6 @@ public class MentenceFarmerRecordService extends ServiceImpl details = dto.getDetails(); if(details.isEmpty()){ @@ -80,12 +74,6 @@ public class MentenceFarmerRecordService extends ServiceImpl queryHiddenWrapper= new LambdaQueryWrapper<>(); queryHiddenWrapper.eq(HiddenInfo::getMentenceFarmerRecordId,dto.getId()); @@ -123,6 +111,12 @@ public class MentenceFarmerRecordService extends ServiceImpl pageRecord = baseMapper.pageQuery(pageSo.getPageSo().toPage(),pageSo); List records = pageRecord.getRecords(); records.stream().forEach(o ->{ + if(o.getMentencePersonId() != null){ + SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(o.getMentencePersonId())); + if(sysUser != null){ + o.setMentencePersonName(sysUser.getNickName()); + } + } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(HiddenInfo::getMentenceFarmerRecordId,o.getId()); List hiddenInfos = hiddenInfoMapper.selectList(queryWrapper); @@ -134,6 +128,15 @@ public class MentenceFarmerRecordService extends ServiceImpl pageInfoCountQuery(MentenceFarmerRecordPageSo pageSo) { Page voPage = baseMapper.pageInfoCountQuery(pageSo.getPageSo().toPage(),pageSo); + List records = voPage.getRecords(); + for (MentenceInfoCountVo record : records) { + if(record.getMentencePersonId() != null){ + SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(record.getMentencePersonId())); + if(sysUser != null){ + record.setMentencePersonName(sysUser.getNickName()); + } + } + } return voPage; }