Tree: c2f8c4c994

dev

master

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'c2f8c4c994'

${ noResults }

Commit Graph

6210 Commits (c2f8c4c994e6cd9fce7286d58a18cde76fce8d2c)

 

All Branches   

Search

Author	SHA1	Message	Date
sunyuchao	e3524400a1	Merge branches 'dev' and 'dev_thirdplatform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform	5 years ago
wangchao	e8256162e3	Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_difficulty_data	5 years ago
wangchao	92e6ee41d4	项目节点耗时数据补齐接口	5 years ago
zxc	ca1128f375	备注修改	5 years ago
jianjun	d2f52b40cc	部署report，statis，project 解决：五级指标添加返回值，以及城阳大屏返回项目详情接口	5 years ago
jianjun	cc70f49987	Merge remote-tracking branch 'remotes/origin/dev' # Conflicts: # epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/batch/BatchScoreCalculator.java	5 years ago
jianjun	e1e9ec5f1e	Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev	5 years ago
zxc	ca48ac6fa5	项目详情修改	5 years ago
zxc	1d81408cf4	党支部分布，用户分布，党员分布 调整显示智慧社区要显示的	5 years ago
jianjun	9f3ee08553	添加注释	5 years ago
zhaoqifeng	45071ddf18	项目超期滞留提醒定时任务	5 years ago
jianjun	1949da956b	五级指标原始值 添加权重	5 years ago
sunyuchao	64463005c0	项目结案也要给转项目人发消息	5 years ago
jianjun	79cdd1a2b8	Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_difficulty_data # Conflicts: # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java	5 years ago
zhaoqifeng	40bc5d0320	项目超期滞留提醒定时任务	5 years ago
zxc	23d4e4a8ca	项目详情	5 years ago
jianjun	f4e4299520	删除错误包	5 years ago
jianjun	bc9a7faa60	Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_difficulty_data	5 years ago
wangchao	62093f1bc7	feign注解	5 years ago
jianjun	c13fcd5484	Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_difficulty_data # Conflicts: # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java # epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java # epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java # epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java # epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java # epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java	5 years ago
wxz	f060b2656a	发送微信订阅消息接口，增加try-catch和计时	5 years ago
jianjun	4bcfff380f	Merge remote-tracking branch 'remotes/origin/master_bugfix' into dev_difficulty_data # Conflicts: # epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java # epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml	5 years ago
wxz	3c0f0ac22f	Merge remote-tracking branch 'origin/dev_wx_msg' into dev_wx_msg	5 years ago
wxz	a2680974d8	增加线程池配置 将发送消息逻辑改造成异步的	5 years ago
sunyuchao	40ef8fd6b4	漏提代码	5 years ago
liushaowen	43af53a9fc	Merge branch 'dev_wx_msg' of http://121.42.41.42:7070/r/epmet-cloud into dev_wx_msg	5 years ago
liushaowen	07d737d154	revert	5 years ago
sunyuchao	f4684a499f	议题关闭、议题转项目、项目退回、项目结案添加发送微信订阅消息	5 years ago
wangchao	921c52a10b	因为项目业务改造而需要将历史数据补充到新表的逻辑，从data-stats移动到gov-project下	5 years ago
zxc	ed2739ae60	项目详情	5 years ago
zxc	3007f286f1	项目详情	5 years ago
liushaowen	0aef57ccab	发送订阅：1.热心居民申请 3.建组申请 5.入组申请 7.邀请进组审核 8.组员禁言 9.党员认证申请	5 years ago
sunyuchao	7a0b6ba3cb	发布文章审核、取消活动添加发送微信订阅消息	5 years ago
jianjun	b943131d11	本级及下级 乘以权重	5 years ago
zxc	a5915b1196	项目详情	5 years ago
zxc	328a76a173	项目详情	5 years ago
jianjun	ce6613c174	数据中乘以权重	5 years ago
wangchao	0cc882cc5b	项目改造	5 years ago
jianjun	7be1818afc	部署report 67	5 years ago
jianjun	1625f7969e	Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev	5 years ago
liushaowen	a6157ee07a	发送订阅bug修复	5 years ago
sunyuchao	0ad1c3df8b	项目流转和爱心互助报名审核通过驳回加发送微信消息	5 years ago
jianjun	f0ce88c099	区划限制显示	5 years ago
jianjun	a97838a1d3	Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0	5 years ago
jianjun	c80561d30a	项目详情返回结果调整	5 years ago
zxc	4564033dac	项目详情	5 years ago
jianjun	2a3eb25d1f	项目详情返回结果调整	5 years ago
zxc	27dbc20c8a	项目详情	5 years ago
wxz	23ca1b5fb4	版本升级	5 years ago
jianjun	fd5796353e	大屏组织插入时 添加是否显示字段 默认为 显示	5 years ago