jianjun
|
497b7fd162
|
删除多余代码
|
4 years ago |
|
jianjun
|
a2f689e807
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into develop
|
4 years ago |
|
jianjun
|
85e8b36fd0
|
定时任务修改参数
|
4 years ago |
wxz
|
603ef5cb56
|
Merge branch 'wxz_feign_datetime' into develop
|
4 years ago |
|
wxz
|
6e5eeb123a
|
修改：将WebMvcConfig.java中的日期时间格式改为yyyy-mm-dd HH:mm:ss
|
4 years ago |
zhaoqifeng
|
269285f347
|
Merge branch 'dev_grid_member_statistics' into develop
|
4 years ago |
|
zhaoqifeng
|
a680fb2f61
|
网格员数据统计
|
4 years ago |
|
wxz
|
b14e987f65
|
Merge branch 'wxz_permission_async' into dev
|
4 years ago |
|
zhaoqifeng
|
7536fe271b
|
Merge branch 'dev_grid_member_statistics' into develop
|
4 years ago |
|
zhaoqifeng
|
5c093d64ee
|
网格员数据统计
|
4 years ago |
|
zhaoqifeng
|
f4a5996570
|
Merge branch 'dev_grid_member_statistics' into develop
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
|
4 years ago |
|
zhaoqifeng
|
e25cdc018b
|
网格员数据统计
|
4 years ago |
|
wxz
|
7eaae8e414
|
Merge branch 'dev_grid_member_statistics' into develop
|
4 years ago |
|
wxz
|
ea4e93117e
|
修复：网格员数据统计查询逻辑错误，网格员-我的查询条件去掉网格id
|
4 years ago |
|
wxz
|
4dddbad6f2
|
Merge branch 'dev_grid_member_statistics' into develop
|
4 years ago |
|
wxz
|
00299bbd18
|
Merge branch 'dev_grid_member_statistics' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_grid_member_statistics
|
4 years ago |
|
wxz
|
b3b505d3a9
|
修改：网格员统计数据列表，修为月份可以不传，不传返回所有月份sum
|
4 years ago |
|
zhaoqifeng
|
9db1dcd66a
|
网格员数据统计
|
4 years ago |
|
wxz
|
147e0889b9
|
Merge branch 'dev_grid_member_statistics' into develop
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
|
4 years ago |
|
wxz
|
2d08d4e979
|
Merge branch 'dev_grid_member_statistics' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_grid_member_statistics
|
4 years ago |
|
wxz
|
89904c5c26
|
新增：我的-网格员议题项目统计数据
|
4 years ago |
sunyuchao
|
9b07eb31e3
|
Merge branch 'dev_patrol_stats' into develop
|
4 years ago |
|
sunyuchao
|
f005428803
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
sunyuchao
|
3cf4bc042c
|
bug修改
|
4 years ago |
|
zhaoqifeng
|
d640a5c467
|
Merge branch 'dev_data_fusion' into develop
|
4 years ago |
|
zhaoqifeng
|
acdcd8c423
|
治理指数数据查询接口修改
|
4 years ago |
|
sunyuchao
|
fde8c1c453
|
Merge branch 'dev_patrol_stats' into develop
|
4 years ago |
|
sunyuchao
|
e805f40924
|
......
|
4 years ago |
|
jianjun
|
c56bc7f4e4
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into develop
|
4 years ago |
|
jianjun
|
a01a585c8c
|
项目数错误
|
4 years ago |
|
zhaoqifeng
|
1894916f3f
|
网格员数据统计
|
4 years ago |
|
wxz
|
567c23b9fb
|
补充:网格员数据查询，补充del_flag=0
|
4 years ago |
|
wxz
|
65a4408338
|
新增：网格员统计
|
4 years ago |
|
sunyuchao
|
fd7ac80225
|
Merge branch 'dev_patrol_stats' into develop
|
4 years ago |
|
sunyuchao
|
a6b49b471f
|
工作端-个人中心-网格员巡查记录汇总数据
|
4 years ago |
|
jianjun
|
99522533bf
|
代码微调
|
4 years ago |
|
wxz
|
10524e3811
|
Merge branch 'dev_patrol_stats' into dev_grid_member_statistics
|
4 years ago |
|
jianjun
|
149e10f975
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
6af8eedbed
|
Merge branch 'dev_patrol_stats' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
3f515a9991
|
任务参数问题
|
4 years ago |
yinzuomei
|
68ef60a8f2
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
|
4 years ago |
|
yinzuomei
|
838dd04a0f
|
agencydetail-multic
|
4 years ago |
|
jianjun
|
cd669955b2
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into develop
|
4 years ago |
|
jianjun
|
eccc227503
|
任务改名
|
4 years ago |
|
yinzuomei
|
959cbe35af
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
|
4 years ago |
|
yinzuomei
|
5e39d144e9
|
agencydetail-multic
|
4 years ago |
|
jianjun
|
e902cbb98e
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into develop
|
4 years ago |
|
yinzuomei
|
3f086da82e
|
getstaffoperations日志改为warn
|
4 years ago |
|
jianjun
|
80a6ca4851
|
网格员巡查统计定时任务统一起来
|
4 years ago |
|
sunyuchao
|
6f1936e52e
|
Merge branch 'dev_patrol_stats' into develop
|
4 years ago |
