diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
index a4fe50c84c..775ee259cb 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
@@ -373,7 +373,7 @@
#{a.pid} AS pid,
#{a.pids} AS pids,
#{a.orgType} AS orgType,
- pc.`LEVEL`,
+ 1 AS level,
COUNT(DISTINCT pc.PROJECT_ID) AS closedProjectTotal
diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ExDeptDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ExDeptDTO.java
index cd092d52ba..fee4ca7ad1 100644
--- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ExDeptDTO.java
+++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ExDeptDTO.java
@@ -68,14 +68,24 @@ public class ExDeptDTO implements Serializable {
*/
private String gridCode;
+ /**
+ * 组织类型
+ */
+ private String isCgorg;
+
/**
* (区县平台)部门id
*/
- private String deptIdQx;
+ private String qxDeptId;
+
+ /**
+ * (区县平台)部门/网格名称
+ */
+ private String qxDeptCode;
/**
* (区县平台)部门/网格名称
*/
- private String deptNameQx;
+ private String qxDeptName;
}
\ No newline at end of file
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java
index 7a2d2e3ff8..950b8d3e5e 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java
@@ -65,18 +65,28 @@ public class ExDeptEntity {
private String deptCode;
/**
- *
+ * (省标准)区划编码/网格编码
*/
private String gridCode;
+ /**
+ * 组织类型
+ */
+ private String isCgorg;
+
/**
* (区县平台)部门id
*/
- private String deptIdQx;
+ private String qxDeptId;
+
+ /**
+ * (区县平台)部门/网格名称
+ */
+ private String qxDeptCode;
/**
* (区县平台)部门/网格名称
*/
- private String deptNameQx;
+ private String qxDeptName;
}
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java
index e50d9404e4..ea56575936 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java
@@ -90,8 +90,8 @@ public class BaseGridInfoServiceImpl extends BaseServiceImpl ExList = new ArrayList<>();
result.getData().forEach(ag->{
ExDeptEntity entity = new ExDeptEntity();
- entity.setDeptIdQx(ag.getId());
- entity.setDeptNameQx(ag.getOrganizationName());
+ entity.setQxDeptId(ag.getId());
+ entity.setQxDeptName(ag.getOrganizationName());
entity.setGridCode(ag.getCode());
ExList.add(entity);
});
@@ -138,8 +138,8 @@ public class BaseGridInfoServiceImpl extends BaseServiceImpl ExList = new ArrayList<>();
result.getData().forEach(ag -> {
ExDeptEntity entity = new ExDeptEntity();
- entity.setDeptIdQx(ag.getId());
- entity.setDeptNameQx(ag.getGridName());
+ entity.setQxDeptId(ag.getId());
+ entity.setQxDeptName(ag.getGridName());
entity.setGridCode(ag.getCode());
ExList.add(entity);
});
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java
index 44b519e95b..bf699eb3b9 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java
@@ -104,7 +104,7 @@ public class ExDeptServiceImpl extends BaseServiceImpl
@Override
public Map getDeptMap() {
LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
- wrapper.ne(ExDeptEntity::getGridCode, null);
+ wrapper.isNotNull(ExDeptEntity::getGridCode);
List entityList = baseDao.selectList(wrapper);
if (CollectionUtils.isEmpty(entityList)) {
return Collections.emptyMap();