Commits · 7330852f67f4703567ed37e5b7f6f14b2c83b318 · wangxiaoming / traffic-front

02 Oct, 2018 17 commits
- [bugfix] fix bb null is not insert when insert datasource · 7330852f
  neo authored Oct 02, 2018
  
  7330852f
- [dev] fix period template and cell not found project id in xml · 189b3fc9
  neo authored Oct 02, 2018
  
  189b3fc9
- [dev] re open comment set entity when update config · 9c69f649
  neo authored Oct 02, 2018
  
  9c69f649
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 705fa1c9
  neo.wang authored Oct 02, 2018
```
Dev oracle neo

See merge request root/atms!132
```
  705fa1c9
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · db1e59fc
  sherlock authored Oct 02, 2018
```
basicData module test and correct

See merge request root/atms!131
```
  db1e59fc
- [bugfix] add default long max for querylist · 5e27a921
  neo authored Oct 02, 2018
  
  5e27a921
- [dev] use max_long_value as default in list · ee6cbf7e
  neo authored Oct 02, 2018
  
  ee6cbf7e
- [dev] use null not space · 644773d5
  neo authored Oct 02, 2018
  
  644773d5
- [bugfix] fixed sql use space not empty in batch insert period config · 3069f24d
  neo authored Oct 02, 2018
  
  3069f24d
- [bugfix] fixed bugs for field error in sql · 6126e0cf
  neo authored Oct 02, 2018
  
  6126e0cf
- [dev] fix sql bugs · 22465cb1
  neo authored Oct 02, 2018
  
  22465cb1
- [bugfix] fixe sql delimiter with '' · ee8c5dcf
  neo authored Oct 02, 2018
  
  ee8c5dcf
- basicData module test and correct · 7985afa7
  sherlock authored Oct 02, 2018
  
  7985afa7
- [dev] add xml for batch insert · 397ba268
  neo authored Oct 02, 2018
  
  397ba268
- [dev] use ' ' from empty value · 82b94634
  neo authored Oct 02, 2018
  
  82b94634
- [dev] batchinsert in report service update config · 1754b7d2
  neo authored Oct 02, 2018
  
  1754b7d2
- [dev] null formula when used in report updateconfig · e48c3334
  neo authored Oct 02, 2018
  
  e48c3334
30 Sep, 2018 13 commits
- [bugfix] oracle not support in '' · 4e1ca4d4
  neo authored Sep 30, 2018
  
  4e1ca4d4
- [dev] add deault templete id for emtpy · acbd176b
  neo authored Sep 30, 2018
  
  acbd176b
- [bugfix] add annoation for mapper · e89577d7
  neo authored Sep 30, 2018
  
  e89577d7
- [dev] misss ; · fa6f7309
  neo authored Sep 30, 2018
  
  fa6f7309
- [dev] user mapper examole clear period cell data · 1467071b
  neo authored Sep 30, 2018
  
  1467071b
- Merge branch 'dev_oracle' of code.tech.tax.asia.pwcinternal.com:root/atms into neo_jpa_withoutgen · 7243be85
  neo authored Sep 30, 2018
  
  7243be85
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 0c150a0e
  neo.wang authored Sep 30, 2018
```
Dev oracle neo

See merge request root/atms!129
```
  0c150a0e
- [dev] use begin and end to multi sql · f33200a9
  neo authored Sep 30, 2018
  
  f33200a9
- fixed font issue · bdddb3a5
  frank.xa.zhang authored Sep 30, 2018
  
  bdddb3a5
- [bugfix] delete bpl template queyr · aaff167f
  neo authored Sep 30, 2018
  
  aaff167f
- [bugfix] fixed get vattemplate group id not bslp · 07016aa9
  neo authored Sep 30, 2018
  
  07016aa9
- Merge branch 'dev_oracle' into dev_oracle_frank · b3d50785
  frank.xa.zhang authored Sep 30, 2018
  
  b3d50785
- fixed SQL issue · 7d9aa4d2
  frank.xa.zhang authored Sep 30, 2018
  
  7d9aa4d2
29 Sep, 2018 10 commits
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · 91497447
  sherlock authored Sep 29, 2018
```
Dev oracle sherlock

See merge request root/atms!127
```
  91497447
- keyValueConfig module test and correct · f11ade1e
  sherlock authored Sep 29, 2018
  
  f11ade1e
- add period table · a391b98a
  frank.xa.zhang authored Sep 29, 2018
  
  a391b98a
- change to periodXXX table · 3706ccc0
  frank.xa.zhang authored Sep 29, 2018
  
  3706ccc0
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 9022afd5
  neo.wang authored Sep 29, 2018
```
[dev] add vat generator for period modify report cell

See merge request root/atms!126
```
  9022afd5
- [dev] add vat generator for period modify report cell · 2883ab04
  neo authored Sep 29, 2018
  
  2883ab04
- Merge branch 'dev_oracle' into dev_oracle_frank · ebe177ae
  frank.xa.zhang authored Sep 29, 2018
```
# Conflicts:
#	atms-api/src/main/java/pwc/taxtech/atms/common/util/SpringContextUtil.java
#	atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/FormulaAgent.java
#	atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
#	atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/VatAbstractService.java
#	atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/FSJZ.java
#	atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/FunctionBase.java
#	atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodStandardAccountMapper.java
```
  ebe177ae
- change to periodXXX table · 8234757b
  frank.xa.zhang authored Sep 29, 2018
  
  8234757b
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 68fdc975
  neo.wang authored Sep 29, 2018
```
[dev] add projectid from tax payer report rule

See merge request root/atms!125
```
  68fdc975
- [dev] add projectid from tax payer report rule · 9a5e87a2
  neo authored Sep 29, 2018
  
  9a5e87a2