危大bug修改

This commit is contained in:
guoshengxiong 2024-05-16 14:02:52 +08:00
parent de8898deae
commit 6a2ada7070
3 changed files with 3 additions and 5 deletions

View File

@ -26,7 +26,7 @@
and project_sn = #{param.projectSn} and project_sn = #{param.projectSn}
</if> </if>
<if test="param.engineeringId != null and param.engineeringId != ''"> <if test="param.engineeringId != null and param.engineeringId != ''">
and enterprise_id = #{param.engineeringId} and engineering_id = #{param.engineeringId}
</if> </if>
AND `status` in (2, 3, 4) AND `status` in (2, 3, 4)
AND type = 1 AND type = 1

View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringProgressRecord; import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringProgressRecord;
import com.zhgd.xmgl.modules.dangerous.mapper.DangerousEngineeringProgressRecordMapper; import com.zhgd.xmgl.modules.dangerous.mapper.DangerousEngineeringProgressRecordMapper;
import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringProgressRecordService; import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringProgressRecordService;
import com.zhgd.xmgl.util.MapUtil;
import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.PageUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -28,13 +29,11 @@ public class DangerousEngineeringProgressRecordServiceImpl extends ServiceImpl<D
@Override @Override
public List<DangerousEngineeringProgressRecord> selectEngineeringProgressList(Map<String, Object> map) { public List<DangerousEngineeringProgressRecord> selectEngineeringProgressList(Map<String, Object> map) {
map.putIfAbsent("type", 1);
return dangerousEngineeringProgressRecordMapper.selectEngineeringProgressList(map); return dangerousEngineeringProgressRecordMapper.selectEngineeringProgressList(map);
} }
@Override @Override
public Page<DangerousEngineeringProgressRecord> selectEngineeringProgressPage(Map<String, Object> map) { public Page<DangerousEngineeringProgressRecord> selectEngineeringProgressPage(Map<String, Object> map) {
map.putIfAbsent("type", 1);
Page page = PageUtil.getPage(map); Page page = PageUtil.getPage(map);
return dangerousEngineeringProgressRecordMapper.selectEngineeringProgressList(map, page); return dangerousEngineeringProgressRecordMapper.selectEngineeringProgressList(map, page);
} }

View File

@ -5,6 +5,7 @@ import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringSideStation; import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringSideStation;
import com.zhgd.xmgl.modules.dangerous.mapper.DangerousEngineeringSideStationMapper; import com.zhgd.xmgl.modules.dangerous.mapper.DangerousEngineeringSideStationMapper;
import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringSideStationService; import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringSideStationService;
import com.zhgd.xmgl.util.MapUtil;
import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.PageUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -29,13 +30,11 @@ public class DangerousEngineeringSideStationServiceImpl extends ServiceImpl<Dang
@Override @Override
public List<DangerousEngineeringSideStation> selectSideStationList(Map<String, Object> map) { public List<DangerousEngineeringSideStation> selectSideStationList(Map<String, Object> map) {
map.putIfAbsent("type", 1);
return dangerousEngineeringSideStationMapper.selectSideStationList(map); return dangerousEngineeringSideStationMapper.selectSideStationList(map);
} }
@Override @Override
public Page<DangerousEngineeringSideStation> selectSideStationPage(Map<String, Object> map) { public Page<DangerousEngineeringSideStation> selectSideStationPage(Map<String, Object> map) {
map.putIfAbsent("type", 1);
Page page = PageUtil.getPage(map); Page page = PageUtil.getPage(map);
return dangerousEngineeringSideStationMapper.selectSideStationList(map, page); return dangerousEngineeringSideStationMapper.selectSideStationList(map, page);
} }