Commits · f8eba1039052859b15bd7b2aa99f2afcce9c60b1 · wangxiaoming / traffic-front

08 Nov, 2018 2 commits
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · f8eba103
  sherlock authored Nov 08, 2018
```
bug:app-overview:listView\cardView

See merge request root/atms!176
```
  f8eba103
- bug 19773\19789 · 9d8a5dcf
  sherlock authored Nov 08, 2018
  
  9d8a5dcf
07 Nov, 2018 14 commits
- bug:app-overview:listView\cardView · 413352a3
  sherlock authored Nov 07, 2018
  
  413352a3
- [Bugfix] merge some compile error and delete unused button · 786164b8
  neo authored Nov 07, 2018
  
  786164b8
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 2e318195
  neo.wang authored Nov 07, 2018
```
Dev oracle neo

See merge request root/atms!175
```
  2e318195
- [DEV] fixed async report control js · d96c5d2c
  neo authored Nov 07, 2018
  
  d96c5d2c
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 72af8cf9
  sherlock authored Nov 07, 2018
```
添加报表未取到公式

See merge request root/atms!174
```
  72af8cf9
- 添加报表未取到公式 · c28f4dd6
  sherlock authored Nov 07, 2018
  
  c28f4dd6
- [DEV] delete no used path para in gen all data · 619d8073
  neo authored Nov 07, 2018
  
  619d8073
- [DEV] add async js control for gen report data · 1af4c042
  neo authored Nov 07, 2018
  
  1af4c042
- [DEV] add gentask and return job entity · d9b57f27
  neo authored Nov 07, 2018
  
  d9b57f27
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 656b3165
  sherlock authored Nov 07, 2018
```
import template with formula/ export output-invoice

See merge request root/atms!173
```
  656b3165
- import template with formula/ export output-invoice · 4dfe6ef0
  sherlock authored Nov 07, 2018
  
  4dfe6ef0
- [DEv] add get job api impl · 6cb2f1fd
  neo authored Nov 07, 2018
  
  6cb2f1fd
- [Bugfix] fixed resource set period · 63bedb84
  neo authored Nov 07, 2018
  
  63bedb84
- [Bugfix] fixe query period template used id should use templateid · 7d0fa51e
  neo authored Nov 07, 2018
  
  7d0fa51e
06 Nov, 2018 4 commits
- [Bugfix] fixed assert peroject id shoud not empty but empty · 8ebd5674
  neo authored Nov 06, 2018
  
  8ebd5674
- [Optimial] fixed gen data to async · aae9f6a9
  neo authored Nov 06, 2018
  
  aae9f6a9
- [DEV] add period job entity mapper and genconfig · 178b5b36
  neo authored Nov 06, 2018
  
  178b5b36
- [optimize] fixed gen all report data · abb89b56
  neo authored Nov 06, 2018
  
  abb89b56
05 Nov, 2018 12 commits
- [Bugfix] fixed bb else is wrong positon · 8541823a
  neo authored Nov 05, 2018
  
  8541823a
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · d10dc4f0
  neo authored Nov 05, 2018
  
  d10dc4f0
- [Bugfix] fixed bb conbert double value when errorEval · 52b04315
  neo authored Nov 05, 2018
  
  52b04315
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · bb5b86e7
  sherlock authored Nov 05, 2018
```
bug:19213\纳税申报表排序\preview 优化

See merge request root/atms!172
```
  bb5b86e7
- [Bugfix] add log for bb not find report code · fd70f77e
  neo authored Nov 05, 2018
  
  fd70f77e
- bug:19213\纳税申报表排序\preview 优化 · 34e82a7f
  sherlock authored Nov 05, 2018
  
  34e82a7f
- [Bugfix] fixed only copy template where is active · 06cd3b39
  neo authored Nov 05, 2018
  
  06cd3b39
- [Bugfix] fixed celltemplate config may be empty where batch insert · 2605ea45
  neo authored Nov 05, 2018
  
  2605ea45
- [Bugfix] fixed templateid not use int copy celltemplate and config · 156161c9
  neo authored Nov 05, 2018
  
  156161c9
- [Bugfix] fixed missed ; and can not compile · 5009435f
  neo authored Nov 05, 2018
  
  5009435f
- [DEV] split mualt select to singel select · f3d2ceac
  neo authored Nov 05, 2018
  
  f3d2ceac
- [DEV] fixed maven dependence for gcexecl · b422bd93
  Your Name authored Nov 05, 2018
  
  b422bd93
02 Nov, 2018 8 commits
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · 5d365403
  neo authored Nov 02, 2018
  
  5d365403
- [dev] bugfix and download report sheet impl · f6e2174c
  neo authored Nov 02, 2018
  
  f6e2174c
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 96dbe8ac
  sherlock authored Nov 02, 2018
```
Dev oracle sherlock

See merge request root/atms!171
```
  96dbe8ac
- bug:19216 · 52408455
  sherlock authored Nov 02, 2018
  
  52408455
- Merge remote-tracking branch 'origin/dev_oracle' into dev_oracle_sherlock · e48d186a
  sherlock authored Nov 02, 2018
  
  e48d186a
- Merge remote-tracking branch 'origin/dev_oracle_sherlock' into dev_oracle_sherlock · 7bdb2138
  sherlock authored Nov 02, 2018
  
  7bdb2138
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 5f760aa4
  sherlock authored Nov 02, 2018
```
xxfp bug

See merge request root/atms!170
```
  5f760aa4
- Merge branch 'dev_oracle' into 'dev_oracle_sherlock' · a957930f
  sherlock authored Nov 02, 2018
```
# Conflicts:
#   atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java
```
  a957930f