fixed hard code url to config file

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java

@@ -348,7 +348,21 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
                             } else {
                                 data = EMPTY;
                             }
+
+                            if(StringUtils.isNotBlank(data)) {
+                                Pattern pattern = Pattern.compile("[0-9.]*");
+                                Matcher isNum = pattern.matcher(data);
+                                if (isNum.matches()) {
                                     cellData.setData(new BigDecimal(data).toString());
+                                } else {
+                                    cellData.setData(data);
+                                }
+                            }
+                            else{
+                                cellData.setData(data);
+                            }
+
+                            //cellData.setData(new BigDecimal(data).toString());
                             PeriodFormulaBlockExample periodFormulaBlockExample = new PeriodFormulaBlockExample();
                             periodFormulaBlockExample.createCriteria().andPeriodEqualTo(period)
                                     .andCellTemplateIdEqualTo(tempPeriodCellTemplate.get().getCellTemplateId());

atms-api/src/main/resources/applicationContext-mvc.xml

@@ -32,45 +32,45 @@
 	<!-- 整合Thymeleaf3 -->
 	<!-- See: http://www.thymeleaf.org/doc/tutorials/3.0/thymeleafspring.html -->
 	<!-- **************************************************************** -->
-	<bean id="templateResolver"
-		class="org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver">
-		<property name="prefix" value="/WEB-INF/templates/" />
-		<property name="suffix" value=".html" />
-		<property name="templateMode" value="HTML" />
-		<property name="cacheable" value="false" />
-		<property name="characterEncoding" value="UTF-8" />
-	</bean>
+	<!--<bean id="templateResolver"-->
+		<!--class="org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver">-->
+		<!--<property name="prefix" value="/WEB-INF/templates/" />-->
+		<!--<property name="suffix" value=".html" />-->
+		<!--<property name="templateMode" value="HTML" />-->
+		<!--<property name="cacheable" value="false" />-->
+		<!--<property name="characterEncoding" value="UTF-8" />-->
+	<!--</bean>-->
 
-	<bean id="templateEngine" class="org.thymeleaf.spring4.SpringTemplateEngine">
-		<property name="templateResolver" ref="templateResolver" />
-		<property name="enableSpringELCompiler" value="true" />
-		<property name="additionalDialects">
-			<set>
-				<!-- Note the package would change to 'springsecurity3' if you are using 
-					that version -->
-				<bean
-					class="org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect" />
-			</set>
-		</property>
-	</bean>
+	<!--<bean id="templateEngine" class="org.thymeleaf.spring4.SpringTemplateEngine">-->
+		<!--<property name="templateResolver" ref="templateResolver" />-->
+		<!--<property name="enableSpringELCompiler" value="true" />-->
+		<!--<property name="additionalDialects">-->
+			<!--<set>-->
+				<!--&lt;!&ndash; Note the package would change to 'springsecurity3' if you are using -->
+					<!--that version &ndash;&gt;-->
+				<!--<bean-->
+					<!--class="org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect" />-->
+			<!--</set>-->
+		<!--</property>-->
+	<!--</bean>-->
 
-	<!-- html文件不能放在这个目录:WEB-INF/templates/jsp -->
-	<bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">
-		<property name="templateEngine" ref="templateEngine" />
-		<property name="characterEncoding" value="UTF-8" />
-		<property name="order" value="100" />
-	</bean>
+	<!--&lt;!&ndash; html文件不能放在这个目录:WEB-INF/templates/jsp &ndash;&gt;-->
+	<!--<bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">-->
+		<!--<property name="templateEngine" ref="templateEngine" />-->
+		<!--<property name="characterEncoding" value="UTF-8" />-->
+		<!--<property name="order" value="100" />-->
+	<!--</bean>-->
 
-	<!-- 共用jsp与thymeleaf,为了避免冲突,jsp viewname的前缀必须是jsp/ -->
-	<!-- jsp文件必须放在这个目录:WEB-INF/templates/jsp -->
-	<bean id="viewResolver"
-		class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		<property name="viewClass"
-			value="org.springframework.web.servlet.view.JstlView" />
-		<property name="prefix" value="/WEB-INF/templates/" />
-		<property name="suffix" value=".jsp" />
-		<property name="order" value="50" />
-		<property name="viewNames" value="jsp/*" />
-	</bean>
+	<!--&lt;!&ndash; 共用jsp与thymeleaf,为了避免冲突,jsp viewname的前缀必须是jsp/ &ndash;&gt;-->
+	<!--&lt;!&ndash; jsp文件必须放在这个目录:WEB-INF/templates/jsp &ndash;&gt;-->
+	<!--<bean id="viewResolver"-->
+		<!--class="org.springframework.web.servlet.view.InternalResourceViewResolver">-->
+		<!--<property name="viewClass"-->
+			<!--value="org.springframework.web.servlet.view.JstlView" />-->
+		<!--<property name="prefix" value="/WEB-INF/templates/" />-->
+		<!--<property name="suffix" value=".jsp" />-->
+		<!--<property name="order" value="50" />-->
+		<!--<property name="viewNames" value="jsp/*" />-->
+	<!--</bean>-->
 
 </beans>
\ No newline at end of file

atms-web/src/main/resources/applicationContext-mvc.xml

@@ -38,8 +38,7 @@
             <set>
                 <!-- Note the package would change to 'springsecurity3' if you are using
                     that version -->
-                <bean
-                        class="org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect"/>
+                <bean class="org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect"/>
             </set>
         </property>
     </bean>