zxc
|
5db2e6c3e6
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
zxc
|
70ac51304c
|
难点堵点分数修改
满意度分数默认值80
|
4 years ago |
zhaoqifeng
|
1daa6270bb
|
Merge branch 'dev_agency_govern_daily' into dev
|
4 years ago |
zxc
|
13bd6e4340
|
难点堵点加分数字段
|
4 years ago |
sunyuchao
|
966c89bda1
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
sunyuchao
|
9c115a708e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
sunyuchao
|
e3e33c0b7f
|
应胡科家要求将平阴之前居民端热心居民改为网格员的在改回去,前期要求改的是胡小雷、林伟伟
|
4 years ago |
jianjun
|
11680926f8
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
jianjun
|
364955346a
|
删除模版
|
4 years ago |
zxc
|
5527271138
|
难点堵点加分数字段
|
4 years ago |
yinzuomei
|
9bb0ac0dba
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
yinzuomei
|
e2127015c5
|
费钉钉
|
4 years ago |
wangxianzhang
|
1e44d01054
|
修改:修改居民信息导入成功和失败后,返回excel的文件名
|
4 years ago |
jianjun
|
80b24f7d19
|
获取工作人员信息 从缓存获取 2.5
|
4 years ago |
jianjun
|
36a396afda
|
获取工作人员信息 从缓存获取 2
|
4 years ago |
zhaoqifeng
|
78cf991f16
|
治理榜单查询修改
|
4 years ago |
jianjun
|
1ddada911c
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj
|
4 years ago |
jianjun
|
d50d40557d
|
获取工作人员信息 从缓存获取
|
4 years ago |
yinzuomei
|
5e6d007ed0
|
都正常返回了,没必要再发个error钉钉
|
4 years ago |
sunyuchao
|
70bafa0a71
|
市平台对接 mq只执行平阴数据
|
4 years ago |
yinzuomei
|
84510605d8
|
/gov/org/customergrid/getgridlistbygridids中error日志降为warn
|
4 years ago |
zhaoqifeng
|
8e53562673
|
Merge branch 'dev_agency_govern_daily' into dev
|
4 years ago |
zhaoqifeng
|
5ebbd35276
|
治理指数统计修改
|
4 years ago |
jianjun
|
acddd3e675
|
Merge remote-tracking branch 'remotes/origin/dev_ic_v2' into dev
|
4 years ago |
zxc
|
c73fd60ae1
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
zxc
|
3186b286cc
|
删除多余代码
|
4 years ago |
zxc
|
63ed47884d
|
统计事件
|
4 years ago |
zxc
|
66eee3a2f5
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerPartyBranchServiceImpl.java
|
4 years ago |
zxc
|
f7b756d15e
|
添加日志
|
4 years ago |
zxc
|
8b0dfac4f2
|
缓存获取议题表决信息方法修改
|
4 years ago |
yinzuomei
|
85d9f6639c
|
calCpcIndexService.calCpcPartyAbility,党员相关党建能力指标抽取,放开代码
|
4 years ago |
jianjun
|
b1a81526e8
|
党建声音支持视频上传 不限格式只限制是视频
|
4 years ago |
jianjun
|
f24296e141
|
org删除无用 redis类
|
4 years ago |
jianjun
|
fca309c70b
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
jianjun
|
e196dfcad8
|
难点堵点bug
|
4 years ago |
jianjun
|
d5d5379500
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
jianjun
|
fd417f7101
|
统一抽取接口 添加参数 方便部分抽取以及难点堵点bug
|
4 years ago |
jianjun
|
a98ffa1469
|
Revert "话题 议题 项目 重新跑 需撤回"
This reverts commit 3a7134a1
|
4 years ago |
jianjun
|
3a7134a147
|
话题 议题 项目 重新跑 需撤回
|
4 years ago |
jianjun
|
2daa3c79bb
|
Revert "暂时注释掉其他方法,跑一下话题的 需撤回"
This reverts commit 3be462d9
|
4 years ago |
jianjun
|
3be462d994
|
暂时注释掉其他方法,跑一下话题的 需撤回
|
4 years ago |
jianjun
|
8862f455ba
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
jianjun
|
c116f453c1
|
加个日志
|
4 years ago |
jianjun
|
f047f2318d
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
jianjun
|
4b81f167df
|
修改话题总数抽取逻辑bug,时间维度默认前一天;原来是默认空截止到了任务执行的时间了 导致数据比想要的要多 ->ression:转议题时间 从log里取
|
4 years ago |
yinzuomei
|
2f6a52def7
|
区域化党建单位满意度,四舍五入保留两位小数
|
4 years ago |
jianjun
|
837eb8b617
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
jianjun
|
1bc26450be
|
修改话题总数抽取逻辑bug,时间维度默认前一天;原来是默认空截止到了任务执行的时间了 导致数据比想要的要多
|
4 years ago |
yinzuomei
|
8580a2c467
|
区域化党建单位满意度
|
4 years ago |
yinzuomei
|
7908623213
|
区域化党建单位群众满意度
|
4 years ago |