jianjun
|
6d1299fb6e
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
jianjun
|
f0e4240e6b
|
Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
|
5 years ago |
|
jianjun
|
3291170ed6
|
调整判断
|
5 years ago |
sunyuchao
|
b887184649
|
查询客户小程序模板列表
|
5 years ago |
|
sunyuchao
|
2440ebc200
|
Merge branches 'dev' and 'dev_wx_msg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_wx_msg
Conflicts:
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
|
5 years ago |
wxz
|
a3ca90a60c
|
Merge branch 'dev_newversion' into dev_temp
# Conflicts:
# epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
|
5 years ago |
|
wxz
|
8d00b1362f
|
修改compose-test.yml的版本，使用时间戳版本
|
5 years ago |
|
sunyuchao
|
bfe8058437
|
按客户查询模板Id列表
|
5 years ago |
wangchao
|
cea1aa99a1
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
wangchao
|
c2cec55b80
|
project flyway脚本修改
|
5 years ago |
|
wangchao
|
6972e725b4
|
project flyway脚本修改
|
5 years ago |
|
wangchao
|
fb8d664482
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
wangchao
|
76c8e5bb82
|
项目节点耗时数据补充 增加第一次响应时效
|
5 years ago |
|
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
|
390761ab0f
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp
|
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
|
e1e9ec5f1e
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev
|
5 years ago |
|
jianjun
|
e0177da038
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
ca48ac6fa5
|
项目详情修改
|
5 years ago |
|
jianjun
|
23b7685102
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
zxc
|
1d81408cf4
|
党支部分布，用户分布，党员分布 调整显示智慧社区要显示的
|
5 years ago |
|
jianjun
|
9f3ee08553
|
添加注释
|
5 years ago |
zhaoqifeng
|
45071ddf18
|
项目超期滞留提醒定时任务
|
5 years ago |
|
jianjun
|
dccc9a8b1b
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
jianjun
|
1949da956b
|
五级指标原始值 添加权重
|
5 years ago |
|
sunyuchao
|
64463005c0
|
项目结案也要给转项目人发消息
|
5 years ago |
|
jianjun
|
436f798caf
|
Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp
|
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 |
|
jianjun
|
974622bfdd
|
Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp
|
5 years ago |
|
jianjun
|
14ed396fc9
|
删除错误包
|
5 years ago |
|
zhaoqifeng
|
40bc5d0320
|
项目超期滞留提醒定时任务
|
5 years ago |
|
jianjun
|
04bddf2285
|
Merge remote-tracking branch 'remotes/origin/dev_difficulty_data' into dev_temp
# 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/impl/ProjectProcessServiceImpl.java
|
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
|
84bcaf98f7
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp
# Conflicts:
# epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java
|
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 |
|
wangchao
|
b74d86536c
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_temp
# 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 |
|
jianjun
|
69f3a55a0c
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp
|
5 years ago |
|
sunyuchao
|
f4684a499f
|
议题关闭、议题转项目、项目退回、项目结案添加发送微信订阅消息
|
5 years ago |
