Merge branch 'dev_oracle_neo' into 'dev_oracle'

[dev] add period approve gen.xml

See merge request root/atms!145

atms-api/src/main/java/pwc/taxtech/atms/controller/ApprovalController.java

@@ -44,7 +44,7 @@ public class ApprovalController {
     public ApprovalDto approval(@RequestBody ApprovalDto dto) {
         ProcessInstance pi = runtimeService.startProcessInstanceByKey("approvalProcess");
         dto.setInstaceId(pi.getId());
-        mocoInsert(dto);//todo use service insert
+        mocoInsert(dto);
         return dto;
     }
 

atms-dao/etc/generator-oracle/vatGeneratorConfig.xml

@@ -221,5 +221,12 @@
             <columnOverride column="TEMPLATE_ID" javaType="java.lang.Long" />
         </table>
 
+        <table tableName="PERIOD_APPROVE" schema="tax_admin" domainObjectName="PeriodApprove">
+            <property name="useActualColumnNames" value="false"/>
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+            <columnOverride column="PERIOD" javaType="java.lang.Integer" />
+            <columnOverride column="YEAR" javaType="java.lang.Integer" />
+        </table>
+
   </context>
 </generatorConfiguration>
\ No newline at end of file

atms-dao/etc/generator-oracle/vat_run.bat

 rem see http://www.mybatis.org/generator/running/runningFromCmdLine.html
 cd /d %~dp0
-call java -classpath .;./* org.mybatis.generator.api.ShellRunner -configfile vatGeneratorConfig.xml -overwrite -verbose
+call java -classpath .;./* org.mybatis.generator.api.ShellRunner -configfile vatGeneratorConfig.xml -overwrite -verbose -tables PERIOD_APPROVE
 echo @@@@@@@@@@@ DONE @@@@@@@@@@@
 pause
\ No newline at end of file

atms-web/.gitignore

@@ -7,4 +7,5 @@ rebel.xml
 /target
 /build
 /logs
-/src/main/webapp/node_modules
\ No newline at end of file
+/src/main/webapp/node_modules
+/src/main/webapp/bundles
\ No newline at end of file