wxz
|
3485f34881
|
新增：
给scan添加平阴私有话服务器的外网ip，并且将所有已有的IP列表放到src/resources/readme下
|
4 years ago |
zxc
|
d47324bb8a
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
a5d41c6f62
|
替换回来
|
4 years ago |
sunyuchao
|
0e54ab3da5
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
sunyuchao
|
fb0bf99901
|
第一版用户统计数据代码优化后还原-相成
|
4 years ago |
yinzuomei
|
1ef07c1406
|
项目详情，只有工作人员查询缓存接口，需要发布：user、report服务
|
4 years ago |
|
yinzuomei
|
4147a7291e
|
添加注释：大屏新增普通事件列表：首次查询平阴整个客户下，近30天内的项目，展示分类名称（前端截取第一个-之前的文字）、颜色等级、项目标题。点击8个街道，联动。
|
4 years ago |
|
yinzuomei
|
2dd9efcb11
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
325a834d2a
|
平阴项目分布接口调整 bugfix
|
4 years ago |
|
yinzuomei
|
f38bb5c719
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
1ecef89fb0
|
平阴项目分布接口调整
|
4 years ago |
jianjun
|
94e7f017cb
|
1
|
4 years ago |
|
jianjun
|
babd4c73c2
|
wxController迁移
|
4 years ago |
|
jianjun
|
c2f45bc4b6
|
wxController迁移
|
4 years ago |
|
jianjun
|
4777b56d32
|
wxController
|
4 years ago |
|
jianjun
|
f5d1c068e0
|
Merge remote-tracking branch 'remotes/origin/dev_statistical_optimize' into dev
|
4 years ago |
|
yinzuomei
|
1298b0acd7
|
去除多余的error信息
|
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 |
|
wxz
|
e71b2c5f78
|
Merge branches 'dev' and 'wxz_pingyin_push_weixin' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_pingyin_push_weixin
|
4 years ago |
|
wxz
|
b5d66cebfd
|
1.提取openapi-sdk
2.调整third apiService相关逻辑
3.完成推送component access token到私有化平台接口
|
4 years ago |
|
sunyuchao
|
a4b5a6b3b9
|
组织/部门/网格名称不能超过20字
|
4 years ago |
|
zxc
|
70a8406ac3
|
再改
|
4 years ago |
|
zxc
|
3314c0355f
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
fa70a90619
|
在修改
|
4 years ago |
|
zxc
|
d9ef3477ee
|
啊
|
4 years ago |
|
zxc
|
b1e3614c5a
|
再次修改
|
4 years ago |
