考核问题整改查询增加排序;解决位移监测无数据时报错
parent
5a59239d75
commit
1f96732d34
|
|
@ -70,6 +70,7 @@ public interface AssessTeamRatingMapper extends BaseMapper<AssessTeamRating> {
|
||||||
<if test="obj.status != null">
|
<if test="obj.status != null">
|
||||||
and t.rectify_status = #{obj.status}
|
and t.rectify_status = #{obj.status}
|
||||||
</if>
|
</if>
|
||||||
|
order by t.rectify_status asc,t.rectify_last_date desc
|
||||||
</script>
|
</script>
|
||||||
""")
|
""")
|
||||||
Page<AssessRectifyVo> listPage(Page<AssessRectifyVo> page,@Param("obj") AssessTaskPageSo page1);
|
Page<AssessRectifyVo> listPage(Page<AssessRectifyVo> page,@Param("obj") AssessTaskPageSo page1);
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
package com.gunshi.project.xyt.service;
|
package com.gunshi.project.xyt.service;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
|
@ -249,6 +250,9 @@ public class OsmoticShiftRService extends ServiceImpl<OsmoticShiftRMapper, Osmot
|
||||||
|
|
||||||
public List<OsmoticShiftListVo> listValue() {
|
public List<OsmoticShiftListVo> listValue() {
|
||||||
List<OsmoticShiftListVo> list = baseMapper.listValue();
|
List<OsmoticShiftListVo> list = baseMapper.listValue();
|
||||||
|
if(CollectionUtils.isEmpty(list)){
|
||||||
|
return list;
|
||||||
|
}
|
||||||
OsmoticQuerySo so = new OsmoticQuerySo();
|
OsmoticQuerySo so = new OsmoticQuerySo();
|
||||||
List<String> stationCodes = list.stream().map(OsmoticShiftListVo::getStationCode).collect(Collectors.toList());
|
List<String> stationCodes = list.stream().map(OsmoticShiftListVo::getStationCode).collect(Collectors.toList());
|
||||||
String maxTm = list.stream().filter(o->o.getTm() != null).max(Comparator.comparing(OsmoticShiftListVo::getTm)).get().getTm();
|
String maxTm = list.stream().filter(o->o.getTm() != null).max(Comparator.comparing(OsmoticShiftListVo::getTm)).get().getTm();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue