Commits · e89577d74745c92fb11c66870813f8259e44a8c4 · wangxiaoming / traffic-front

30 Sep, 2018 11 commits
- [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 21 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
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 29735f86
  neo.wang authored Sep 29, 2018
```
[dev] add project id for period formula block

See merge request root/atms!124
```
  29735f86
- [dev] add project id for period formula block · a34a02c0
  neo authored Sep 29, 2018
  
  a34a02c0
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 9e7efe14
  neo.wang authored Sep 29, 2018
```
Dev oracle neo

See merge request root/atms!123
```
  9e7efe14
- [dev] add project id form period standard acouunt · e890c39b
  neo authored Sep 29, 2018
  
  e890c39b
- [dev] add project for period report logic · bc398078
  neo authored Sep 29, 2018
  
  bc398078
- [dev] fixed period template project id · d4ce6f59
  neo authored Sep 29, 2018
  
  d4ce6f59
- [dev] use period tax rule setting projectid in vat logic · d244664d
  neo authored Sep 29, 2018
  
  d244664d
- add period_cell_comment replace cell_comment · 698f9c26
  frank.xa.zhang authored Sep 29, 2018
  
  698f9c26
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 5d382a4d
  neo.wang authored Sep 29, 2018
```
Dev oracle neo

See merge request root/atms!122
```
  5d382a4d
- [dev] add input and ouput page filed in vatjs · 393c7d7f
  neo authored Sep 29, 2018
  
  393c7d7f
- [dev] add input and output page file in js · 7abe67ac
  neo authored Sep 29, 2018
  
  7abe67ac
28 Sep, 2018 8 commits
- basicData module test and correct · 4ceb6cde
  sherlock authored Sep 28, 2018
  
  4ceb6cde
- [dev] get output page · 79baf726
  neo authored Sep 28, 2018
  
  79baf726
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 00112873
  neo.wang authored Sep 28, 2018
```
[dev] add vat fixed mapper

See merge request root/atms!121
```
  00112873
- [dev] add vat fixed mapper · 36231758
  neo authored Sep 28, 2018
  
  36231758
- Merge branch 'dev_oracle_neo' into 'dev_oracle' · 69bb5f36
  neo.wang authored Sep 28, 2018
```
Dev oracle neo

See merge request root/atms!120
```
  69bb5f36
- [dev] add entity and mapper · f1e52b40
  neo authored Sep 28, 2018
  
  f1e52b40
- [dev] add vat gen xml · 5f9f88ea
  neo authored Sep 28, 2018
  
  5f9f88ea
- Merge branch 'dev_oracle_sherlock' into 'dev_oracle' · fb389b47
  sherlock authored Sep 28, 2018
```
Dev oracle sherlock

See merge request root/atms!119
```
  fb389b47