yinzuomei
|
bfba7c19ff
|
Merge remote-tracking branch 'origin/dev_evaluate_add_20210510' into dev
|
5 years ago |
zxc
|
486ba7a206
|
Merge branch 'dev_bug_group_member_name' into dev_temp
|
5 years ago |
|
zxc
|
798c1b80aa
|
name
|
5 years ago |
|
zxc
|
cb0e0dd354
|
Merge branch 'dev_bug_group_member_name' into dev_temp
|
5 years ago |
|
zxc
|
27c525f026
|
组员名字修改
|
5 years ago |
wxz
|
e6030cbeb5
|
Merge branch 'dev_third_data' into dev_temp
|
5 years ago |
|
wxz
|
751ca4516a
|
Merge branch 'dev_third_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_third_data
|
5 years ago |
|
wxz
|
77e2146f22
|
新增：先进排行->居民积分排行列表(不含党员)
新增：先进排行->党员积分排行
|
5 years ago |
sunyuchao
|
054e20801d
|
部分方法代码调整
|
5 years ago |
|
zxc
|
a009990e2f
|
Merge remote-tracking branch 'origin/dev_evaluate_add_20210510' into dev_temp
|
5 years ago |
|
zxc
|
0996b8726c
|
啊哈哈
|
5 years ago |
|
zxc
|
9e03b67549
|
Merge remote-tracking branch 'origin/dev_evaluate_add_20210510' into dev_temp
|
5 years ago |
|
zxc
|
1d6f16178d
|
项目结案添加项目评价初始化数据
|
5 years ago |
jianjun
|
fa5303ec97
|
代码暂存
|
5 years ago |
|
jianjun
|
2176fdba6f
|
代码暂存
|
5 years ago |
|
sunyuchao
|
93c015157f
|
合代码
|
5 years ago |
|
sunyuchao
|
bd5b3d8379
|
Merge branch 'dev_third_data' into dev_temp
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectSatisfactionStatisticsDao.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectSatisfactionStatisticsEntity.java
# epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSatisfactionStatisticsDao.xml
|
5 years ago |
|
sunyuchao
|
598828cad6
|
基础数据部分查询接口及小组总数定时任务
|
5 years ago |
|
yinzuomei
|
1b8908c281
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
|
5 years ago |
|
yinzuomei
|
b666def708
|
小组组织活动按天累计值统计
|
5 years ago |
|
jianjun
|
5cd2ff433f
|
网格相关指标明细 暂存
|
5 years ago |
|
sunyuchao
|
443a1a26a4
|
代码调整
|
5 years ago |
|
jianjun
|
183977481f
|
代码暂存 怕丢
|
5 years ago |
|
sunyuchao
|
4ca51fec88
|
组织、网格层级用户数据
|
5 years ago |
|
zxc
|
356451982c
|
新增接口，查询项目评价得分
|
5 years ago |
|
sunyuchao
|
57882c837f
|
Merge branch 'dev_prod_bug_syc' into dev_temp
# Conflicts:
# epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java
# epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml
# epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
|
5 years ago |
|
sunyuchao
|
d956f30461
|
解决生产上平音提出的下级实际超过十个组织，总数却最大只显示十个的问题【代码被修改过造成的】
|
5 years ago |
|
sunyuchao
|
3b36db48a3
|
基础数据-组织下五项基础数据汇总
|
5 years ago |
|
yinzuomei
|
f2f88790e4
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
|
5 years ago |
|
yinzuomei
|
ca96a3f348
|
网格相关：党员参加“三会一课”人次
|
5 years ago |
|
zxc
|
df72dae365
|
项目评价分数DTO
|
5 years ago |
zhaoqifeng
|
827b66b4cc
|
小组成员添加是否党员身份
|
5 years ago |
|
yinzuomei
|
3b9ca27d03
|
网格相关：组织”三会一课“次数
|
5 years ago |
|
zxc
|
5aa6328ebc
|
Merge remote-tracking branch 'origin/dev_evaluate_add_20210510' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java
|
5 years ago |
|
yinzuomei
|
bb2b3eede9
|
zancun
|
5 years ago |
|
zxc
|
4485a303ed
|
添加customerId
|
5 years ago |
|
zxc
|
e757d4234c
|
..
|
5 years ago |
|
zxc
|
42d192bdb2
|
项目评价统计补全
|
5 years ago |
|
sunyuchao
|
caee4b0ce9
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
|
5 years ago |
|
sunyuchao
|
6cf0f40b6d
|
dada_aggregator引入data_statistical数据源
|
5 years ago |
|
yinzuomei
|
3640f3740b
|
党员相关：参加三一会一课次数joinThreeMeetsCount字段赋值 sql修改
|
5 years ago |
|
yinzuomei
|
9108b5ef31
|
党员相关：参加三一会一课次数joinThreeMeetsCount字段赋值
|
5 years ago |
|
yinzuomei
|
4d24dc0a56
|
bug
|
5 years ago |
|
yinzuomei
|
08de8e3b88
|
项目详情接口调整
|
5 years ago |
|
yinzuomei
|
61fb99325f
|
category-analysis接口修改
|
5 years ago |
|
sunyuchao
|
1d0f29b3fa
|
群组数统计代码调整
|
5 years ago |
|
zxc
|
669e6e59ee
|
补全 项目评价时，添加项目评价统计
|
5 years ago |
|
yinzuomei
|
5df0dc3f6d
|
level=1
|
5 years ago |
|
yinzuomei
|
5ee01fc4a9
|
monthId:yyyyMM
|
5 years ago |
|
sunyuchao
|
55f78905d1
|
Merge branch 'dev_third_data' into dev_temp
|
5 years ago |
