yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

日常养护记录

master
yangzhe123 2025-12-12 14:26:14 +08:00
parent 22f6fbc165
commit eab482d8c3
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gunshi/project/hsz/mapper/MentenceFarmerRecordMapper.java
View File

@ -31,7 +31,7 @@ public interface MentenceFarmerRecordMapper extends BaseMapper<MentenceFarmerRec
@Select(""" @Select("""
<script> <script>
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 t3.name as mentenceStDetailName,t4.st_name as mentenceStName,t4.id as mentenceStId,t3.id as mentenceStDetailId
from hidden_info t1 from hidden_info t1
join mentence_farmer_record t2 on t1.mentence_farmer_record_id = t2.id join mentence_farmer_record t2 on t1.mentence_farmer_record_id = t2.id

2
src/main/java/com/gunshi/project/hsz/model/MentenceFarmerRecord.java
View File

@ -44,7 +44,7 @@ public class MentenceFarmerRecord {
@Schema(description = "维护人员id") @Schema(description = "维护人员id")
private String mentencePersonId; private String mentencePersonId;
@TableField("mentence_person_name") @TableField(exist = false)
@Schema(description = "维护人员名称") @Schema(description = "维护人员名称")
private String mentencePersonName; private String mentencePersonName;

27
src/main/java/com/gunshi/project/hsz/service/MentenceFarmerRecordService.java
View File

@ -54,12 +54,6 @@ public class MentenceFarmerRecordService extends ServiceImpl<MentenceFarmerRecor
} }
dto.setFillTime(new Date()); dto.setFillTime(new Date());
dto.setId(IdWorker.getId()); dto.setId(IdWorker.getId());
if(dto.getMentencePersonId() != null){
SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(dto.getMentencePersonId()));
if(sysUser != null){
dto.setMentencePersonName(sysUser.getNickName());
}
}
save(dto); save(dto);
List<HiddenInfo> details = dto.getDetails(); List<HiddenInfo> details = dto.getDetails();
if(details.isEmpty()){ if(details.isEmpty()){
@ -80,12 +74,6 @@ public class MentenceFarmerRecordService extends ServiceImpl<MentenceFarmerRecor
if(Objects.isNull(mentenceFarmerRecord)){ if(Objects.isNull(mentenceFarmerRecord)){
throw new IllegalArgumentException("该日常养护记录不存在"); throw new IllegalArgumentException("该日常养护记录不存在");
} }
if(dto.getMentencePersonId() != null){
SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(dto.getMentencePersonId()));
if(sysUser != null){
dto.setMentencePersonName(sysUser.getNickName());
}
}
updateById(dto); updateById(dto);
LambdaQueryWrapper<HiddenInfo> queryHiddenWrapper= new LambdaQueryWrapper<>(); LambdaQueryWrapper<HiddenInfo> queryHiddenWrapper= new LambdaQueryWrapper<>();
queryHiddenWrapper.eq(HiddenInfo::getMentenceFarmerRecordId,dto.getId()); queryHiddenWrapper.eq(HiddenInfo::getMentenceFarmerRecordId,dto.getId());
@ -123,6 +111,12 @@ public class MentenceFarmerRecordService extends ServiceImpl<MentenceFarmerRecor
Page<MentenceFarmerRecord> pageRecord = baseMapper.pageQuery(pageSo.getPageSo().toPage(),pageSo); Page<MentenceFarmerRecord> pageRecord = baseMapper.pageQuery(pageSo.getPageSo().toPage(),pageSo);
List<MentenceFarmerRecord> records = pageRecord.getRecords(); List<MentenceFarmerRecord> records = pageRecord.getRecords();
records.stream().forEach(o ->{ records.stream().forEach(o ->{
if(o.getMentencePersonId() != null){
SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(o.getMentencePersonId()));
if(sysUser != null){
o.setMentencePersonName(sysUser.getNickName());
}
}
LambdaQueryWrapper<HiddenInfo> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<HiddenInfo> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(HiddenInfo::getMentenceFarmerRecordId,o.getId()); queryWrapper.eq(HiddenInfo::getMentenceFarmerRecordId,o.getId());
List<HiddenInfo> hiddenInfos = hiddenInfoMapper.selectList(queryWrapper); List<HiddenInfo> hiddenInfos = hiddenInfoMapper.selectList(queryWrapper);
@ -134,6 +128,15 @@ public class MentenceFarmerRecordService extends ServiceImpl<MentenceFarmerRecor
public Page<MentenceInfoCountVo> pageInfoCountQuery(MentenceFarmerRecordPageSo pageSo) { public Page<MentenceInfoCountVo> pageInfoCountQuery(MentenceFarmerRecordPageSo pageSo) {
Page<MentenceInfoCountVo> voPage = baseMapper.pageInfoCountQuery(pageSo.getPageSo().toPage(),pageSo); Page<MentenceInfoCountVo> voPage = baseMapper.pageInfoCountQuery(pageSo.getPageSo().toPage(),pageSo);
List<MentenceInfoCountVo> 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; return voPage;
} }