wxz
|
781dae5c92
|
Merge branch 'dev_footbar_cache' into dev
|
5 years ago |
|
wxz
|
3f08c4e1fa
|
Merge branch 'dev' into dev_footbar_cache
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
|
5 years ago |
wangchao
|
c311d07e81
|
删除无用的类
|
5 years ago |
|
wxz
|
eeede2dee0
|
修复：居民端用户订阅次数，忘了insert
|
5 years ago |
jianjun
|
75a87e21f7
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_difficulty_data
|
5 years ago |
|
jianjun
|
fef3d60418
|
无参构造函数
|
5 years ago |
|
jianjun
|
52ca934a7d
|
Merge remote-tracking branch 'remotes/origin/dev_thirdplatform' into dev
|
5 years ago |
zxc
|
4208adc393
|
党支部新接口添加
|
5 years ago |
zhaoqifeng
|
cbda379962
|
代码模板管理
|
5 years ago |
|
zxc
|
fbffc6be9c
|
党支部新接口添加
|
5 years ago |
|
zxc
|
0b62e94359
|
党支部新接口添加
|
5 years ago |
|
wxz
|
0195e7ec54
|
调整内外部认证，支持同时使用内外部认证
|
5 years ago |
|
wangchao
|
3113a24cd9
|
project_staff关联project_process条件调整
|
5 years ago |
|
zxc
|
2176fa35e4
|
党支部新接口添加
|
5 years ago |
sunyuchao
|
1a915f33bb
|
入参参数校验
|
5 years ago |
|
sunyuchao
|
0a405fd701
|
返参DTO调整
|
5 years ago |
|
sunyuchao
|
87e37842d8
|
代码调整
|
5 years ago |
|
zxc
|
ccd91e28ea
|
党支部新接口添加
|
5 years ago |
|
zxc
|
2822de7c57
|
党支部新接口添加
|
5 years ago |
|
jianjun
|
01b9373440
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix
|
5 years ago |
|
wangchao
|
4d66292a4b
|
在项目节点耗时补全数据时，project_staff与project_process的弱关联时间误差改小到五秒以内并加上orgId、gridId、departmentId的匹配。注:因为project_staff表关联到project_process是流转给当前staff的节点，这个staff处理之后生成的节点没有关联上所以只能弱关联。
|
5 years ago |
|
sunyuchao
|
9e42f11374
|
漏提代码
|
5 years ago |
|
sunyuchao
|
fbde100271
|
新增接口根据staffId查询基本信息
|
5 years ago |
|
zxc
|
39bc9f6f4c
|
党支部新接口添加
|
5 years ago |
|
wangchao
|
02915fc883
|
党员认证提交记录校验去除网格Id，如果居民在一个网格下申请了党员，在其余网格不能再次申请党员。
|
5 years ago |
|
zxc
|
0bc88795f4
|
党支部新接口添加
|
5 years ago |
|
jianjun
|
60d714052c
|
获取下级组织调整
|
5 years ago |
|
wangchao
|
5920b69919
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_difficulty_data
|
5 years ago |
|
zhaoqifeng
|
84a9a392a6
|
项目超期滞留提醒修改
|
5 years ago |
|
wangchao
|
47722c9008
|
难点赌点抽取修改
|
5 years ago |
|
sunyuchao
|
f36175413d
|
工作端查询我的基本信息接口添加手机号返参用于微信消息订阅
|
5 years ago |
liushaowen
|
9107d97bcf
|
模板key修改
|
5 years ago |
|
liushaowen
|
156a257c99
|
消息订阅添加gridId，添加跳转page设置
|
5 years ago |
|
sunyuchao
|
7eed693973
|
订阅消息发送添加gridId入参
|
5 years ago |
|
zxc
|
bd480623df
|
党支部新接口添加
|
5 years ago |
|
jianjun
|
a58441c787
|
调整 sql 判断
|
5 years ago |
|
jianjun
|
53dcbc1aa9
|
查询组织下所有的难点堵点数据，不需要orgType
|
5 years ago |
|
sunyuchao
|
765f1c7046
|
消息发送记录表添加网格ID
|
5 years ago |
|
jianjun
|
f7085b3e67
|
查询组织下所有的难点堵点数据
|
5 years ago |
|
zxc
|
92e24b68cc
|
党支部新接口添加
|
5 years ago |
|
liushaowen
|
4421c0ba75
|
添加gridId字段
|
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 |
|
sunyuchao
|
54f4529c24
|
服务升级
|
5 years ago |
|
sunyuchao
|
b75ceb78f3
|
Merge branch 'dev'
|
5 years ago |
|
sunyuchao
|
bfe8058437
|
按客户查询模板Id列表
|
5 years ago |
|
wangchao
|
c2cec55b80
|
project flyway脚本修改
|
5 years ago |
|
wangchao
|
6972e725b4
|
project flyway脚本修改
|
5 years ago |
|
wangchao
|
76c8e5bb82
|
项目节点耗时数据补充 增加第一次响应时效
|
5 years ago |
