yinzuomei
|
e5f6ad08ad
|
Merge remote-tracking branch 'origin/dev_areaCode' into dev
|
5 years ago |
|
yinzuomei
|
f4ad94db7b
|
sql脚本修改
|
5 years ago |
|
yinzuomei
|
7fd834477d
|
Merge remote-tracking branch 'origin/dev_areaCode' into dev
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java
# epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java
# epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java
# epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java
# epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
|
5 years ago |
|
yinzuomei
|
3c64fcc666
|
工作日志删除participateTotal列
|
5 years ago |
|
yinzuomei
|
25518643f7
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev
|
5 years ago |
|
yinzuomei
|
f1c13d2471
|
平阴事件分析-事件类型分析错误代码删除。3
|
5 years ago |
|
yinzuomei
|
94e7c4c055
|
平阴事件分析-事件类型分析错误代码删除。2
|
5 years ago |
|
yinzuomei
|
fee2c4547c
|
平阴事件分析-事件类型分析错误代码删除。
|
5 years ago |
|
yinzuomei
|
a0d7671bf1
|
工作日志删除/data/stats/plugins/workrecord/grid-monthly接口
|
5 years ago |
|
yinzuomei
|
3d95f062e0
|
add /data/report/screen/agency/addstreetcomm api v3
|
5 years ago |
|
yinzuomei
|
1f8905fd24
|
add /data/report/screen/agency/addstreetcomm api v2
|
5 years ago |
|
yinzuomei
|
b51412b6f0
|
大屏工作日志相关输出接口 todo
|
5 years ago |
|
yinzuomei
|
f28a86dd82
|
工作日志新增按日统计采集接口v2:screen_work_record_org_monthly、screen_work_record_org_daily去掉parentId
|
5 years ago |
|
yinzuomei
|
664c57387d
|
工作日志新增按日统计采集接口v1暂存
|
5 years ago |
|
yinzuomei
|
4444fcd625
|
add /data/report/screen/agency/addstreetcomm api v1
|
5 years ago |
|
yinzuomei
|
0ecae3f05f
|
add /data/report/screen/agency/addstreetcomm api
|
5 years ago |
wangchao
|
f23d31a9db
|
workrecord接口修改
|
5 years ago |
|
yinzuomei
|
6901e30030
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev_areaCode
|
5 years ago |
|
yinzuomei
|
8c72895a78
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev
|
5 years ago |
|
yinzuomei
|
88e4b34298
|
行政地区编码查询接口修改，返回parentCode
|
5 years ago |
|
yinzuomei
|
9c4ef8a756
|
queryStaffAgencyTree方法修改
|
5 years ago |
zxc
|
cb1ef62f8f
|
parentCode
|
5 years ago |
|
yinzuomei
|
6045a406d7
|
screen_customer_agency新增parent_area_code;screen_customer_grid|dept新增area_code;
调整三个表的初始化任务（evaIndexScreenDimInitTask)接口路径：(eidim/init-all)
|
5 years ago |
|
yinzuomei
|
aa56cbbd86
|
screen_customer_agency表新增parent_area_code列;对应修改组织信息采集接口(screen_screencoll/customeragency)
|
5 years ago |
|
yinzuomei
|
19651b73de
|
customer_agency表新增PARENT_AREA_CODE列
|
5 years ago |
|
zxc
|
4e89be5fc5
|
去掉隐藏注释
|
5 years ago |
|
yinzuomei
|
c105e98d55
|
/epmet/ext/staff/permissionv2 zancun
|
5 years ago |
|
wangchao
|
b8271c2638
|
workrecord接口
|
5 years ago |
|
yinzuomei
|
bbcc918b35
|
批量插入
|
5 years ago |
|
yinzuomei
|
6fe6508add
|
工作日志数据采集新增screen_customer_work_record_dict
|
5 years ago |
|
yinzuomei
|
909d77a70a
|
/epmet/ext/staff/permissionv2 暂存
|
5 years ago |
|
yinzuomei
|
ad543d88f0
|
工作日志数据采集入口
|
5 years ago |
|
yinzuomei
|
f816d8d341
|
修改/epmet/ext/staff/permission接口，返参添加customerId
|
5 years ago |
|
yinzuomei
|
e89d0a328b
|
工作日志相关表脚本
|
5 years ago |
|
yinzuomei
|
9e99baa374
|
146数据采集接口地址修改
|
5 years ago |
wxz
|
2212986a13
|
以下操作增加分布式锁
1.mq监听器初始化客户Home
2.mq监听器初始化客户org
3.mq监听器初始化客户角色列表
|
5 years ago |
|
yinzuomei
|
4ac78d99dc
|
customer_relation 脚本放到crm服务 新增pids
|
5 years ago |
|
yinzuomei
|
18fe79310d
|
根据客户id查询根客户信息
|
5 years ago |
|
yinzuomei
|
0088c45ab7
|
Merge remote-tracking branch 'origin/dev_jcet' into dev
|
5 years ago |
|
yinzuomei
|
5131ec0cfa
|
tokenDto增加customerId
|
5 years ago |
|
zxc
|
ce68c5d97f
|
修改
|
5 years ago |
|
wangchao
|
1f13fd5f51
|
Merge remote-tracking branch 'origin/dev_jcet' into dev
|
5 years ago |
|
zxc
|
0ca8c61909
|
screenProjectQuantityOrgMonth
|
5 years ago |
|
wangchao
|
182bfe798d
|
sso陌生人导览网格列表 增加customerId校验 从token中获取客户Id
|
5 years ago |
|
yinzuomei
|
1e4b584018
|
customer_relation增加area_code、LEVEL
|
5 years ago |
|
wangchao
|
a4a8034c54
|
sso陌生人导览网格列表 增加customerId校验 从token中获取客户Id
|
5 years ago |
|
yinzuomei
|
60f45dc3d9
|
customer_relation放到oper_crm库
|
5 years ago |
|
zxc
|
cca5e752ab
|
screenProjectOrgDaily
|
5 years ago |
|
yinzuomei
|
e0e674c5c8
|
事件分析：数量统计、月度数量分析、效率分析查询api
|
5 years ago |
|
zxc
|
3d4ad49b29
|
screenProjectGridDaily
screenProjectQuantityGrid
|
5 years ago |
