yinzuomei
|
fda7232373
|
立项、结案、退回、事件立项，存储targetId，messageType
|
4 years ago |
|
yinzuomei
|
4b4c53acba
|
项目流转，存储targetId，messageType
|
4 years ago |
|
yinzuomei
|
2b9f9ee4d4
|
议题关闭、议题转项目，存储targetId，messageType
|
4 years ago |
|
yinzuomei
|
3eeffaab90
|
修改下key
|
4 years ago |
|
yinzuomei
|
5ab79e7c85
|
连接入组的，通知组长xx加入了,存储targetId，messageType
|
4 years ago |
|
yinzuomei
|
9f89d01355
|
组长审核完入群申请，通知居民结果,存储targetId，messageType
|
4 years ago |
|
yinzuomei
|
e7da49b02d
|
居民单申请入群，通知组长审核,存储targetId，messageType
|
4 years ago |
|
yinzuomei
|
5c42eb58fb
|
工作端审核建群申请后，通知建组人结果，存储targetId，messageType
|
4 years ago |
|
yinzuomei
|
4f4e8f3123
|
居民端用户申请创建小组，提交小组信息后，通知网格长，存储targetId，messageType
|
4 years ago |
|
yinzuomei
|
d5843a3708
|
热心居民申请，审核结果通知居民。记录targetId、messageType
|
4 years ago |
|
yinzuomei
|
c22f5070f6
|
党员审核申请通知网格长、审核结果通知居民。记录targetId、messageType
|
4 years ago |
|
yinzuomei
|
b72f9f8887
|
热心居民申请，给网格长发送消息记录消息类型、申请id到user_message
|
4 years ago |
sunyuchao
|
3028fe1a36
|
Merge remote-tracking branch 'origin/dev_group_msg' into dev_group_msg
|
4 years ago |
|
sunyuchao
|
cb0c6f7730
|
bug修改
|
4 years ago |
wxz
|
6068aa0279
|
修改：
1.我的小组排名接口，去掉userId传入，改用token取
|
4 years ago |
|
wxz
|
2eebe89a5d
|
修改：
【小组排名】，去掉PageData，直接展示列表
|
4 years ago |
|
wxz
|
6d467bf163
|
Merge branch 'dev_group_msg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_group_msg
|
4 years ago |
|
wxz
|
0955cf0500
|
【新增】1.完成我所在的小组排名
|
4 years ago |
|
sunyuchao
|
76cc97293f
|
接口加返参、人员列表顺序调整
|
4 years ago |
|
wxz
|
9a66324acf
|
【新增】1.完成小组总排名接口
|
4 years ago |
|
wxz
|
41f73d4253
|
【新增】1.完成网格内小组排名接口
|
4 years ago |
|
sunyuchao
|
7ab738da40
|
漏提代码
|
4 years ago |
|
sunyuchao
|
50985c9532
|
程序调整优化
|
4 years ago |
|
sunyuchao
|
05f3762f41
|
8、活动/通知/话题评论允许有图片
|
4 years ago |
|
sunyuchao
|
4e4ddadd94
|
五种入组方式均需要推送站内信、微信消息
|
4 years ago |
zxc
|
2ec305e6fe
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
906dd81205
|
添加新字段
|
4 years ago |
|
yinzuomei
|
30c306ba71
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev
|
4 years ago |
|
sunyuchao
|
a61fd17deb
|
组织下不允许看到非组织添加的人员、部门网格下添加的人不允许再部门网格下移除
|
4 years ago |
|
yinzuomei
|
f21f8f2a5e
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev
|
4 years ago |
|
sunyuchao
|
a2c2f99b2a
|
评价指标模块 设置分值的按照【总分=各个能力值四舍五入保留一位 * 权重 相加，结果值四舍五入保留一位；
三大能力的分=原始值四舍五入保留一位* 权重，结果值四舍五入保留一位；
单项原始值：直接四舍五入保留一位小数；】调整
|
4 years ago |
|
zxc
|
e7571f0538
|
四舍五入
|
4 years ago |
|
yinzuomei
|
084be558ed
|
month/indexscore接口修改
|
4 years ago |
|
yinzuomei
|
3dfb39724f
|
/report/fact/index/scorelist接口修改
|
4 years ago |
|
yinzuomei
|
24c02ab557
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
yinzuomei
|
7d2ccc1906
|
selectMonthPieChart修改
|
4 years ago |
|
zxc
|
8d08abc80c
|
screenProjectOrgDaily修改
|
4 years ago |
|
sunyuchao
|
23936ab743
|
组织内有单位领导标签的人排在前面，网格内有网格长标签的人排在前面，部门内有部门领导标签的人排在前面，相同职位及其他职位按创建顺序排序
|
4 years ago |
jianjun
|
a574ef5683
|
差值 差值 代码微调
|
4 years ago |
|
jianjun
|
7e1a228191
|
差值 差值
|
4 years ago |
|
sunyuchao
|
b1c45ef558
|
sql优化
|
4 years ago |
|
jianjun
|
6e41c8f4a9
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_staff_info
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
|
4 years ago |
|
jianjun
|
59f134ef54
|
。。。
|
4 years ago |
|
jianjun
|
65d8cbcd19
|
倒序
|
4 years ago |
|
jianjun
|
d657ee22cc
|
再次修改
|
4 years ago |
|
jianjun
|
1549a7a1f5
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
bdc0ab6e20
|
修改工作实况日期bug
|
4 years ago |
zhaoqifeng
|
9491ab4989
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
8df605b3cd
|
党员认证bug
|
4 years ago |
|
wxz
|
2557b58325
|
补充提交：漏了openapi-sdk依赖
|
4 years ago |
