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 |
|
sunyuchao
|
204b4482dd
|
转小时，保留一位小数
|
4 years ago |
|
sunyuchao
|
cf8144f330
|
Merge branch 'dev_patrol_stats' into develop
|
4 years ago |
|
sunyuchao
|
6a7330e21f
|
Merge remote-tracking branch 'origin/dev_patrol_stats' into dev_patrol_stats
|
4 years ago |
|
sunyuchao
|
3f4961b347
|
更多-巡查记录列表-V2--接口调整
|
4 years ago |
|
jianjun
|
4e6da8fc5f
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into develop
|
4 years ago |
|
jianjun
|
4ab94a58fb
|
网格员巡查统计定时任务错误修改
|
4 years ago |
|
yinzuomei
|
ddb5767d50
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
|
4 years ago |
|
yinzuomei
|
8bb347cba1
|
agencydetail-multic
|
4 years ago |
|
jianjun
|
750300a101
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into develop
|
4 years ago |
|
jianjun
|
ac797ecaa2
|
网格员巡查统计定时任务
|
4 years ago |
|
sunyuchao
|
f7d65b5c05
|
Merge branch 'dev_patrol_stats' into develop
|
4 years ago |
|
sunyuchao
|
acaee9bd8b
|
更多-巡查记录列表-V2
|
4 years ago |
|
jianjun
|
93ee4c55e5
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into develop
|
4 years ago |
|
jianjun
|
ffb1f30b13
|
网格员巡查统计定时任务
|
4 years ago |
zxc
|
1b81bd8c56
|
Merge remote-tracking branch 'origin/dev_patrol_stats' into develop
|
4 years ago |
|
zxc
|
9967c2b46e
|
结束时间+ 59s
|
4 years ago |
|
jianjun
|
5053694b35
|
网格员巡查统计实际结束时间只用于记录 不参与计算
|
4 years ago |
|
jianjun
|
5986a22d27
|
网格员巡查统计执行
|
4 years ago |
|
yinzuomei
|
dfc383e0ae
|
Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
|
4 years ago |
|
yinzuomei
|
3baf2d910b
|
agencydetail-multic
|
4 years ago |
|
zxc
|
6e97f029ee
|
Merge remote-tracking branch 'origin/dev_patrol_stats' into develop
|
4 years ago |
|
zxc
|
c91c94d833
|
时间按照实际结束时间
|
4 years ago |
|
zxc
|
5b1585a234
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
zxc
|
2c557df98f
|
Merge remote-tracking branch 'origin/dev_patrol_stats' into develop
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
# epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
|
4 years ago |
|
sunyuchao
|
2ed055c6c6
|
Merge branch 'dev_data_fusion' into develop
|
4 years ago |
|
zxc
|
58eb90af5d
|
修改巡查时间格式
|
4 years ago |
|
sunyuchao
|
4b4d866aa6
|
查询当前组织是不是跟组织添加客户Id查询条件
|
4 years ago |
|
jianjun
|
3f284db455
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into develop
|
4 years ago |
|
jianjun
|
d633cf201d
|
网格员巡查统计脚本添加
|
4 years ago |
|
yinzuomei
|
0a5b552da3
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
99a91d01a2
|
candidateList
|
4 years ago |
|
yinzuomei
|
332c6f1851
|
rollback
|
4 years ago |
|
jianjun
|
dd60be189a
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into develop
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
# epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
|
4 years ago |
|
jianjun
|
ab0fe9ddad
|
网格员巡查统计初始化几重新计算代码
|
4 years ago |
|
yinzuomei
|
5e279b8ae5
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
|
4 years ago |
|
yinzuomei
|
aa83c9f476
|
rollback
|
4 years ago |
|
sunyuchao
|
dd001f8e5d
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
sunyuchao
|
44ccd40122
|
居民端首页推荐小组不展示支部组
|
4 years ago |
|
yinzuomei
|
d2c4e3e559
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
|
4 years ago |
