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

白蚁日志

master
yangzhe123 2025-12-12 14:22:25 +08:00
parent ad2aff5d3d
commit ea8459209f
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gunshi/project/hsz/mapper/ByLogDetailMapper.java
View File

@ -16,7 +16,7 @@ public interface ByLogDetailMapper extends BaseMapper<ByLogDetail> {
@Select("""
<script>
select t1.id,t1.by_log_id,t1.pre_place_detail_id as ppdi,t1.pre_person,t1.pre_method,t1.pre_effect,
select t1.id,t1.by_log_id,t1.pre_place_detail_id as ppdi,t1.pre_method,t1.pre_effect,t1.pre_person_id,
t2.detail_name as ppdn,t3.id as ppi,t3.pre_name as ppn
from by_log_detail t1
join pre_place_detail t2
@ -32,7 +32,7 @@ public interface ByLogDetailMapper extends BaseMapper<ByLogDetail> {
List<ByLogDetail> selectDetail(@Param("logId") Long id,@Param("dto") ByLogPageSo pageSo);
@Select("""
select t1.id,t1.by_log_id,t1.pre_place_detail_id as ppdi,t1.pre_person,t1.pre_method,t1.pre_effect,
select t1.id,t1.by_log_id,t1.pre_place_detail_id as ppdi,t1.pre_method,t1.pre_effect,t1.pre_person_id,
t2.detail_name as ppdn,t3.id as ppi,t3.pre_name as ppn
from by_log_detail t1
join pre_place_detail t2

6
src/main/java/com/gunshi/project/hsz/model/ByLogDetail.java
View File

@ -50,10 +50,14 @@ public class ByLogDetail {
@Schema(description = "防治点名称")
private String ppn;
@TableField(value = "pre_person")
@TableField(exist = false)
@Schema(description = "防治人员")
private String prePerson;
@TableField(value = "pre_person_id")
@Schema(description = "防治人员ID")
private String prePersonId;
@TableField(value = "pre_method")
@Schema(description = "防治方法")
private String preMethod;

23
src/main/java/com/gunshi/project/hsz/service/ByLogService.java
View File

@ -38,6 +38,9 @@ public class ByLogService extends ServiceImpl<ByLogMapper, ByLog> {
@Autowired
private ByLogDetailMapper byLogDetailMapper;
@Autowired
private SysUserMapper sysUserMapper;
public boolean update(ByLog dto) {
ByLog byId = getById(dto.getId());
@ -63,6 +66,10 @@ public class ByLogService extends ServiceImpl<ByLogMapper, ByLog> {
if(!StringUtils.isBlank(pageSo.getLogNmae())){
queryWrapper.like(ByLog::getLogName, pageSo.getLogNmae());
}
if(pageSo.getDateTimeRangeSo() != null){
queryWrapper.ge(ByLog::getPreDate,pageSo.getDateTimeRangeSo().getStart());
queryWrapper.le(ByLog::getPreDate,pageSo.getDateTimeRangeSo().getEnd());
}
queryWrapper.orderByDesc(ByLog::getPreDate);
Page<ByLog> byLogPage = this.baseMapper.selectPage(pageSo.getPageSo().toPage(), queryWrapper);
List<ByLog> records = byLogPage.getRecords();
@ -78,6 +85,14 @@ public class ByLogService extends ServiceImpl<ByLogMapper, ByLog> {
}
//这里要显示全部数据
List<ByLogDetail> details = byLogDetailMapper.selectDetail(record.getId(), null);
for (ByLogDetail detail : details) {
if(detail.getPrePersonId() != null){
SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(detail.getPrePersonId()));
if(sysUser != null){
detail.setPrePerson(sysUser.getNickName());
}
}
}
record.setDetails(details);
}
return byLogPage;
@ -89,6 +104,14 @@ public class ByLogService extends ServiceImpl<ByLogMapper, ByLog> {
List<ByLog> byLogs = this.baseMapper.selectList(queryWrapper);
byLogs.stream().forEach(o ->{
List<ByLogDetail> details = byLogDetailMapper.selectDetailList(o.getId());
for (ByLogDetail detail : details) {
if(detail.getPrePersonId() != null){
SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(detail.getPrePersonId()));
if(sysUser != null){
detail.setPrePerson(sysUser.getNickName());
}
}
}
o.setDetails(details);
});
return byLogs;