Merge remote-tracking branch 'origin/develop' into release_temp

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,
                 <if test=' status == "closed" '>
                     COUNT(DISTINCT pc.PROJECT_ID) AS closedProjectTotal
                 </if>

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;
 
 }

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;
 
 }

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<BaseGridInfoDao, Ba
         List<ExDeptEntity> ExList = new ArrayList<>();
         result.getData().forEach(ag->{
             ExDeptEntity entity = new ExDeptEntity();
-            entity.setDeptIdQx(ag.getId());
+            entity.setQxDeptId(ag.getId());
-            entity.setDeptNameQx(ag.getOrganizationName());
+            entity.setQxDeptName(ag.getOrganizationName());
             entity.setGridCode(ag.getCode());
             ExList.add(entity);
         });
@@ -138,8 +138,8 @@ public class BaseGridInfoServiceImpl extends BaseServiceImpl<BaseGridInfoDao, Ba
         List<ExDeptEntity> ExList = new ArrayList<>();
         result.getData().forEach(ag -> {
             ExDeptEntity entity = new ExDeptEntity();
-            entity.setDeptIdQx(ag.getId());
+            entity.setQxDeptId(ag.getId());
-            entity.setDeptNameQx(ag.getGridName());
+            entity.setQxDeptName(ag.getGridName());
             entity.setGridCode(ag.getCode());
             ExList.add(entity);
         });

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<ExDeptDao, ExDeptEntity>
     @Override
     public Map<String, Integer> getDeptMap() {
         LambdaQueryWrapper<ExDeptEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.ne(ExDeptEntity::getGridCode, null);
+        wrapper.isNotNull(ExDeptEntity::getGridCode);
         List<ExDeptEntity> entityList = baseDao.selectList(wrapper);
         if (CollectionUtils.isEmpty(entityList)) {
             return Collections.emptyMap();