BUG修复
This commit is contained in:
parent
2fb9c7df83
commit
8faf5b4e53
@ -32,6 +32,6 @@
|
||||
</select>
|
||||
|
||||
<select id="enterpriseNum" resultType="java.lang.Integer">
|
||||
SELECT COUNT(enterprise_sn) FROM enterprise_score ${ew.customSqlSegment} GROUP BY enterprise_sn
|
||||
SELECT COUNT(enterprise_sn) FROM enterprise_score ${ew.customSqlSegment}
|
||||
</select>
|
||||
</mapper>
|
||||
@ -1,7 +1,7 @@
|
||||
package com.zhgd.xmgl.modules.safety.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
@ -54,18 +54,18 @@ public class EnterpriseScoreServiceImpl extends ServiceImpl<EnterpriseScoreMappe
|
||||
Integer enterpriseType = MapUtils.getInteger(map, "enterpriseType");
|
||||
String enterpriseName = MapUtils.getString(map, "enterpriseName");
|
||||
Integer scoreFlag = MapUtils.getInteger(map, "scoreFlag");
|
||||
LambdaQueryWrapper<EnterpriseScore> wrapper = Wrappers.<EnterpriseScore>lambdaQuery();
|
||||
QueryWrapper<EnterpriseScore> wrapper = Wrappers.<EnterpriseScore>query();
|
||||
if (enterpriseType != null) {
|
||||
wrapper.eq(EnterpriseScore::getEnterpriseType, enterpriseType);
|
||||
wrapper.lambda().eq(EnterpriseScore::getEnterpriseType, enterpriseType);
|
||||
}
|
||||
if (StringUtils.isNotBlank(enterpriseName)) {
|
||||
wrapper.like(EnterpriseScore::getEngineeringName, enterpriseName);
|
||||
wrapper.like("p.enterprise_name", enterpriseName);
|
||||
}
|
||||
if (scoreFlag != null && scoreFlag == 1) {
|
||||
wrapper.isNotNull(EnterpriseScore::getScore);
|
||||
wrapper.lambda().isNotNull(EnterpriseScore::getScore);
|
||||
}
|
||||
if (scoreFlag != null && scoreFlag == 0) {
|
||||
wrapper.isNull(EnterpriseScore::getScore);
|
||||
wrapper.lambda().isNull(EnterpriseScore::getScore);
|
||||
}
|
||||
Page<EnterpriseScore> page = PageUtil.getPage(map);
|
||||
Page<EnterpriseScoreDto> pageList = baseMapper.pageList(page, wrapper);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user