Commits · 9b65181c97b68e4e5c8a5cd6511c847f67bcfffd · wangxiaoming / traffic-front

19 Jul, 2018 1 commit
- add parse formula function in the cell_template_config table · 9b65181c
  frank.xa.zhang authored Jul 19, 2018
  
  9b65181c
18 Jul, 2018 8 commits
- add formula parse method · 014ec32d
  frank.xa.zhang authored Jul 18, 2018
  
  014ec32d
- Merge branch 'dev' into dev_frank · 7c46546f
  frank.xa.zhang authored Jul 18, 2018
  
  7c46546f
- fixed ftp get file too slow issue · 69c03978
  frank.xa.zhang authored Jul 18, 2018
  
  69c03978
- add key value formula to report for calculate · e6495005
  frank.xa.zhang authored Jul 18, 2018
  
  e6495005
- Merge branch 'dev_neo' into 'dev' · 56496b35
  neo.wang authored Jul 18, 2018
```
Dev neo

See merge request root/atms!73
```
  56496b35
- [DEV] delete formula agent sycll dependence · a7221ed5
  neo authored Jul 18, 2018
  
  a7221ed5
- add one column for keyValue formula save function · 3e33988f
  frank.xa.zhang authored Jul 18, 2018
  
  3e33988f
- add code for JFQC, not finished yet · f3957724
  frank.xa.zhang authored Jul 18, 2018
```
according to requirement to do this
```
  f3957724
17 Jul, 2018 6 commits
- [DEV] delete exclude aop config use mapper directly in formula agent · 63c4e918
  neo authored Jul 17, 2018
  
  63c4e918
- [fixed issues]add code for fwnd, need debug later · 96bd74d8
  frank.xa.zhang authored Jul 17, 2018
  
  96bd74d8
- add code for fwnd, need debug later · 4c98efa8
  frank.xa.zhang authored Jul 17, 2018
  
  4c98efa8
- add table AssetGroupResult and AssetsList to script · b6ba1fd7
  frank.xa.zhang authored Jul 17, 2018
  
  b6ba1fd7
- add code for zc, need debug later · b3207384
  frank.xa.zhang authored Jul 17, 2018
  
  b3207384
- add code for jxfpmx, need debug later · f9227c49
  frank.xa.zhang authored Jul 17, 2018
  
  f9227c49
16 Jul, 2018 13 commits
- add code for jxfpmx, not finish yet · 5ace3d48
  frank.xa.zhang authored Jul 16, 2018
  
  5ace3d48
- fixed null to NumberEval.ZERO · e1f76cee
  frank.xa.zhang authored Jul 16, 2018
  
  e1f76cee
- Merge branch 'dev_frank' into dev · 18ffb5bf
  frank.xa.zhang authored Jul 16, 2018
  
  18ffb5bf
- add function JXFP code, need debug later · eb5daca4
  frank.xa.zhang authored Jul 16, 2018
  
  eb5daca4
- Merge branch 'dev_neo' into 'dev' · b44cc9f0
  neo.wang authored Jul 16, 2018
```
Dev neo

See merge request root/atms!71
```
  b44cc9f0
- [Bugfix] fixed current year by bb para no use content · 900b46ef
  neo authored Jul 16, 2018
  
  900b46ef
- [Bugfix] period args get wrong in bb formula · 5deb68de
  neo authored Jul 16, 2018
  
  5deb68de
- add function GZSD code, need debug later, · 246ab479
  frank.xa.zhang authored Jul 16, 2018
```
some logic didn't finished yet ,   need make a solution for the keyValue function handle
```
  246ab479
- add function XXPF code, need debug later · c55b5c98
  frank.xa.zhang authored Jul 16, 2018
```
refactor previous code, make some method as base class public method
```
  c55b5c98
- Merge branch 'dev_neo' into 'dev' · 2487f476
  neo.wang authored Jul 16, 2018
```
[DEV] query all project distinct

See merge request root/atms!70
```
  2487f476
- [DEV] query all project distinct · 0a70c86f
  neo authored Jul 16, 2018
  
  0a70c86f
- Merge branch 'dev_neo' into 'dev' · 236d84d5
  neo.wang authored Jul 16, 2018
```
[DEV] fixed create project and del some not used java

See merge request root/atms!69
```
  236d84d5
- [DEV] fixed create project and del some not used java · b371a2da
  neo authored Jul 16, 2018
  
  b371a2da
13 Jul, 2018 10 commits
- Merge branch 'dev' into dev_frank · c8b6338d
  frank.xa.zhang authored Jul 13, 2018
  
  c8b6338d
- fixed issues about create new db · a3310810
  frank.xa.zhang authored Jul 13, 2018
  
  a3310810
- fixed issues for the new apis · a2cde1f4
  frank.xa.zhang authored Jul 13, 2018
  
  a2cde1f4
- add some apis for report cell pop up window · 15990732
  frank.xa.zhang authored Jul 13, 2018
  
  15990732
- Merge branch 'dev_neo' into 'dev' · 577a7b36
  neo.wang authored Jul 13, 2018
```
[DEV] add default remap batch id

See merge request root/atms!68
```
  577a7b36
- [DEV] add default remap batch id · 6063f0b3
  neo authored Jul 13, 2018
  
  6063f0b3
- fixed issues for formula validate · cb092a3f
  frank.xa.zhang authored Jul 13, 2018
  
  cb092a3f
- Merge branch 'dev_neo' into 'dev' · a5d269b1
  neo.wang authored Jul 13, 2018
```
Dev neo

See merge request root/atms!67
```
  a5d269b1
- [DEV] delete formula factory and use formula base · ca1d2cdd
  neo authored Jul 13, 2018
  
  ca1d2cdd
- [bugfix] formula datasource insert use cell datasouce · f1d87ace
  neo authored Jul 13, 2018
  
  f1d87ace
12 Jul, 2018 2 commits
- Merge branch 'dev_neo' into 'dev' · 7d75d2c6
  neo.wang authored Jul 12, 2018
```
[DEV] add some  data for data save in bb

See merge request root/atms!66
```
  7d75d2c6
- [DEV] add some data for data save in bb · 4c8882f2
  neo authored Jul 12, 2018
  
  4c8882f2