wangchao
|
f341c0f3e7
|
project +1 -> 49
|
5 years ago |
|
wangchao
|
809244a1e2
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp
|
5 years ago |
|
wangchao
|
fa34bb2f47
|
更新时间一并置空
|
5 years ago |
|
wangchao
|
5dcba91dab
|
项目退回时，防止将被退回的项目相关人员节点的创建时间赋值给新增的相关人员节点的创建时间，否则数据统计将出现误差
|
5 years ago |
|
wangchao
|
3054940803
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix
|
5 years ago |
jianjun
|
87fa379c57
|
部署stits
|
5 years ago |
|
jianjun
|
da406ec1e1
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
jianjun
|
4fff0c0180
|
如果最大值最小值一致 则使用反正切函数计算分数;2:修改计算校验
|
5 years ago |
wxz
|
88fccb65fd
|
去掉错误提交的Feignclient
|
5 years ago |
|
jianjun
|
e9c18d99e1
|
Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
5 years ago |
|
wxz
|
bb565e0df3
|
xiufu
|
5 years ago |
|
jianjun
|
c2e14f5681
|
部署report
|
5 years ago |
|
wxz
|
7b4e338460
|
xiufu
|
5 years ago |
|
wxz
|
aea3788c8c
|
版本升级
|
5 years ago |
|
wxz
|
a652633c55
|
Merge branch 'dev_screen_data' into dev_temp
|
5 years ago |
|
wxz
|
70cba3bff2
|
修改kcscreen白名单
|
5 years ago |
|
wxz
|
79c8a7d276
|
版本升级
|
5 years ago |
|
wxz
|
2052992327
|
Merge branch 'dev_screen_data' into dev_temp
|
5 years ago |
|
wxz
|
2af96ddbc1
|
修改：增加部分接口的分页
修改：调整部分接口的排序
|
5 years ago |
|
wxz
|
e0bc79068b
|
版本升级
|
5 years ago |
|
wxz
|
fbf2e85aef
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
wxz
|
fdf90cd2ff
|
Merge branch 'dev_screen_data' into dev_temp
|
5 years ago |
|
wxz
|
3fb974787f
|
Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
|
5 years ago |
|
wxz
|
cbae166d00
|
孔村大屏接口开发完成
|
5 years ago |
sunyuchao
|
e6e837b992
|
孔村大屏查询部分模块接口
|
5 years ago |
|
sunyuchao
|
a752a7045c
|
Merge branch 'dev_screen_data' into dev_temp
|
5 years ago |
|
jianjun
|
86dd1e7afb
|
Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data
|
5 years ago |
|
jianjun
|
a84eed60c4
|
部署report，stits
|
5 years ago |
zxc
|
8df3145445
|
三大能力求和四舍五入
|
5 years ago |
|
zxc
|
b4f7add54c
|
sql补漏
|
5 years ago |
|
jianjun
|
ad0675dc8a
|
部署report
|
5 years ago |
|
jianjun
|
0084e755eb
|
部署stits
|
5 years ago |
|
jianjun
|
2461dac20b
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
jianjun
|
cd217f2030
|
平均值的 不需要 再次归一计算了 只需要乘以权重
|
5 years ago |
|
zxc
|
c42e3b2377
|
小数修改
|
5 years ago |
|
jianjun
|
823c3570f0
|
下级组织/部门指数排行 去掉 部门的数据
|
5 years ago |
|
sunyuchao
|
3cb4d7e6e0
|
孔村大屏接口自测问题修改
|
5 years ago |
|
jianjun
|
098c4d0e2e
|
没有总分
|
5 years ago |
|
jianjun
|
81ac10db52
|
修改错误
|
5 years ago |
|
wxz
|
c77b0495d9
|
补充合并丢失的@Autowired
|
5 years ago |
|
wxz
|
5ab01b2488
|
Merge branch 'dev_screen_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_screen_data
Conflicts:
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/KcScreenController.java
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/KcScreenService.java
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/KcScreenServiceImpl.java
|
5 years ago |
|
wxz
|
aee7e9e134
|
孔村大屏-项目-还剩最后一个接口
|
5 years ago |
|
jianjun
|
cce73f07e5
|
修改错误
|
5 years ago |
|
jianjun
|
4d77a18708
|
修改错误
|
5 years ago |
|
jianjun
|
05a760d74a
|
修改错误
|
5 years ago |
|
jianjun
|
4f49c4d5b1
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp
|
5 years ago |
|
jianjun
|
0e5981c4f6
|
修改错误
|
5 years ago |
|
jianjun
|
71548a3fe2
|
修改错误
|
5 years ago |
|
jianjun
|
d1226a2d4b
|
修改错误
|
5 years ago |
|
sunyuchao
|
4e60223a0d
|
孔村大屏-邻里党群部分接口
|
5 years ago |
