diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringRecordMapper.xml
index 928aa7237..7cb1dec04 100644
--- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringRecordMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringRecordMapper.xml
@@ -26,7 +26,7 @@
and project_sn = #{param.projectSn}
- and enterprise_id = #{param.engineeringId}
+ and engineering_id = #{param.engineeringId}
AND `status` in (2, 3, 4)
AND type = 1
diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringProgressRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringProgressRecordServiceImpl.java
index d79c7e3b2..c2b136446 100644
--- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringProgressRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringProgressRecordServiceImpl.java
@@ -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.mapper.DangerousEngineeringProgressRecordMapper;
import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringProgressRecordService;
+import com.zhgd.xmgl.util.MapUtil;
import com.zhgd.xmgl.util.PageUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -28,13 +29,11 @@ public class DangerousEngineeringProgressRecordServiceImpl extends ServiceImpl selectEngineeringProgressList(Map map) {
- map.putIfAbsent("type", 1);
return dangerousEngineeringProgressRecordMapper.selectEngineeringProgressList(map);
}
@Override
public Page selectEngineeringProgressPage(Map map) {
- map.putIfAbsent("type", 1);
Page page = PageUtil.getPage(map);
return dangerousEngineeringProgressRecordMapper.selectEngineeringProgressList(map, page);
}
diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringSideStationServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringSideStationServiceImpl.java
index 3a6107e22..7287ecb90 100644
--- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringSideStationServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringSideStationServiceImpl.java
@@ -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.mapper.DangerousEngineeringSideStationMapper;
import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringSideStationService;
+import com.zhgd.xmgl.util.MapUtil;
import com.zhgd.xmgl.util.PageUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -29,13 +30,11 @@ public class DangerousEngineeringSideStationServiceImpl extends ServiceImpl selectSideStationList(Map map) {
- map.putIfAbsent("type", 1);
return dangerousEngineeringSideStationMapper.selectSideStationList(map);
}
@Override
public Page selectSideStationPage(Map map) {
- map.putIfAbsent("type", 1);
Page page = PageUtil.getPage(map);
return dangerousEngineeringSideStationMapper.selectSideStationList(map, page);
}