sunyuchao
|
f5ff0fbcac
|
Merge remote-tracking branch 'origin/dev_import' into dev_import
|
4 years ago |
|
sunyuchao
|
680327f7de
|
社会自组织导入bug修改
|
4 years ago |
zxc
|
786c702100
|
bug
|
4 years ago |
yinzuomei
|
5d2dcbdb8d
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
dda659cd3e
|
榆山发积分
|
4 years ago |
|
yinzuomei
|
9cd3023ef6
|
temp
|
4 years ago |
|
zxc
|
7c2b57fa25
|
楼栋导入新增更新户数
|
4 years ago |
|
sunyuchao
|
7af68bb9f8
|
平阴组织网格项目统计调整引起的查询调整，三个街道的同一组织或网格一天会存在两条统计数据 只是客户Id不同
|
4 years ago |
|
sunyuchao
|
a5602afed2
|
第一版项目统计，平阴数据统计时只统计了五个街道的其他三个是上报的，现在这三个街道在小程序也产生了数据需要统计上，因此修改获取组织网格维度的逻辑 查询的时候平阴的同一天统一组织就会存在两条数据了 就需要sum和了
|
4 years ago |
wangxianzhang
|
56ceeaf58b
|
Merge remote-tracking branch 'origin/dev_import' into dev_import
|
4 years ago |
|
wangxianzhang
|
706b91ee31
|
导入任务创建-修改进行中的导入的提示语
|
4 years ago |
|
zxc
|
34af77d0c6
|
提示语
|
4 years ago |
|
wangxianzhang
|
b340125289
|
新增脚本
|
4 years ago |
zhaoqifeng
|
3256f76f32
|
居民端活动详情
|
4 years ago |
|
sunyuchao
|
1593bf6362
|
第一版项目统计，平阴数据统计时只统计了五个街道的其他三个是上报的，现在这三个街道在小程序也产生了数据需要统计上，因此修改获取组织网格维度的逻辑
|
4 years ago |
|
zxc
|
170ad7426f
|
名字
|
4 years ago |
|
zhaoqifeng
|
d039e04e8f
|
联建活动旧数据处理脚本
|
4 years ago |
jianjun
|
c265a18ffb
|
条件位置调整
|
4 years ago |
|
sunyuchao
|
23cbac8d61
|
Merge remote-tracking branch 'origin/dev_import' into dev_import
|
4 years ago |
|
sunyuchao
|
a33160a77d
|
社会自组织导入 必要列设置不能为空
|
4 years ago |
|
zhaoqifeng
|
0c14dfeeca
|
联建活动旧数据处理脚本
|
4 years ago |
|
zxc
|
ecf2914573
|
del
|
4 years ago |
|
wangxianzhang
|
fbedcc1ad0
|
Merge branch 'dev_import' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_import
|
4 years ago |
|
wangxianzhang
|
fa473bb10c
|
修改：
【居民信息导入】模板变更。bug修复
|
4 years ago |
|
yinzuomei
|
11718139e8
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
b07057b14c
|
NullPointerException
|
4 years ago |
|
sunyuchao
|
b7b4f97ca8
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
sunyuchao
|
a195f89323
|
项目分类统计导出文件日期不对问题
|
4 years ago |
|
jianjun
|
99ded4a8ea
|
添加防重复提交
|
4 years ago |
|
zxc
|
fdd3bb8c0d
|
del
|
4 years ago |
|
yinzuomei
|
8c15ef9859
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
19f1d22d1d
|
add index sql
|
4 years ago |
|
yinzuomei
|
936932d060
|
calCpcPartyAbilityV2
|
4 years ago |
|
yinzuomei
|
31f0e4878a
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
e6f1298f4e
|
顿号改逗号
|
4 years ago |
|
sunyuchao
|
4e22972fe4
|
导入程序调整
|
4 years ago |
|
yinzuomei
|
51025f5058
|
党员自建群活跃群众人数
|
4 years ago |
|
zxc
|
49cde60fb0
|
del
|
4 years ago |
|
zxc
|
391b37ed9d
|
del
|
4 years ago |
|
yinzuomei
|
b7b2c2270f
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
861d46638e
|
500
|
4 years ago |
|
zxc
|
5d9534da94
|
error code
|
4 years ago |
|
wangxianzhang
|
e5a354a4f5
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_import
Conflicts:
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
|
4 years ago |
|
yinzuomei
|
fb1f35904d
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
d5bca533c5
|
calCpcPartyAbilityV2试试
|
4 years ago |
|
yinzuomei
|
64787e6ef8
|
calCpcPartyAbilityV2试试
|
4 years ago |
|
wangxianzhang
|
993b303b17
|
Merge branch 'wxz_threadpool' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
e16f28f121
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
848f82f3d6
|
验证码改为纯小写字母
|
4 years ago |
|
jianjun
|
94ec1cceb9
|
stats 去掉线程池定义 直接使用服务定义的线程池
|
4 years ago |
