diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java index 3111d5136d..bc8a2b53b8 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserTotalDataFormDTO.java @@ -64,8 +64,14 @@ public class UserTotalDataFormDTO implements Serializable { */ private Integer projectTotal; + /** + * 06.01新增:orgType=agency或者grid的时候,此列赋值:当前组织或者当前网格内的网格员人数 + */ + private Integer gridMemberTotal; + /** * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增) */ private String dataEndTime; + } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenUserTotalDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenUserTotalDataDao.xml index c3b3ef7de7..4e228f3fed 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenUserTotalDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenUserTotalDataDao.xml @@ -25,6 +25,7 @@ TOPIC_TOTAL, ISSUE_TOTAL, PROJECT_TOTAL, + GRID_MEMBER_TOTAL, DEL_FLAG, REVISION, CREATED_BY, @@ -47,6 +48,7 @@ #{item.topicTotal}, #{item.issueTotal}, #{item.projectTotal}, + #{item.gridMemberTotal}, 0, 0, 'APP_USER',