Skip to content

T
traffic-front
Commit 517f7832 authored by frank.xa.zhang's avatar frank.xa.zhang
Browse files
Options

fixed hard code url to config file

parent 2dad154a
Show whitespace changes
Inline Side-by-side
Showing with 53 additions and 39 deletions
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java
View file @ 517f7832
...@@ -348,7 +348,21 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen ...@@ -348,7 +348,21 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
} else { } else {
data = EMPTY; 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()); 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 periodFormulaBlockExample = new PeriodFormulaBlockExample();
periodFormulaBlockExample.createCriteria().andPeriodEqualTo(period) periodFormulaBlockExample.createCriteria().andPeriodEqualTo(period)
.andCellTemplateIdEqualTo(tempPeriodCellTemplate.get().getCellTemplateId()); .andCellTemplateIdEqualTo(tempPeriodCellTemplate.get().getCellTemplateId());
......
atms-api/src/main/resources/applicationContext-mvc.xml
View file @ 517f7832
...@@ -32,45 +32,45 @@ ...@@ -32,45 +32,45 @@
<!-- 整合Thymeleaf3 --> <!-- 整合Thymeleaf3 -->
<!-- See: http://www.thymeleaf.org/doc/tutorials/3.0/thymeleafspring.html --> <!-- See: http://www.thymeleaf.org/doc/tutorials/3.0/thymeleafspring.html -->
<!-- **************************************************************** --> <!-- **************************************************************** -->
<bean id="templateResolver" <!--<bean id="templateResolver"-->
class="org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver"> <!--class="org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver">-->
<property name="prefix" value="/WEB-INF/templates/" /> <!--<property name="prefix" value="/WEB-INF/templates/" />-->
<property name="suffix" value=".html" /> <!--<property name="suffix" value=".html" />-->
<property name="templateMode" value="HTML" /> <!--<property name="templateMode" value="HTML" />-->
<property name="cacheable" value="false" /> <!--<property name="cacheable" value="false" />-->
<property name="characterEncoding" value="UTF-8" /> <!--<property name="characterEncoding" value="UTF-8" />-->
</bean> <!--</bean>-->
<bean id="templateEngine" class="org.thymeleaf.spring4.SpringTemplateEngine"> <!--<bean id="templateEngine" class="org.thymeleaf.spring4.SpringTemplateEngine">-->
<property name="templateResolver" ref="templateResolver" /> <!--<property name="templateResolver" ref="templateResolver" />-->
<property name="enableSpringELCompiler" value="true" /> <!--<property name="enableSpringELCompiler" value="true" />-->
<property name="additionalDialects"> <!--<property name="additionalDialects">-->
<set> <!--<set>-->
<!-- Note the package would change to 'springsecurity3' if you are using <!--&lt;!&ndash; Note the package would change to 'springsecurity3' if you are using -->
that version --> <!--that version &ndash;&gt;-->
<bean <!--<bean-->
class="org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect" /> <!--class="org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect" />-->
</set> <!--</set>-->
</property> <!--</property>-->
</bean> <!--</bean>-->
<!-- html文件不能放在这个目录:WEB-INF/templates/jsp --> <!--&lt;!&ndash; html文件不能放在这个目录:WEB-INF/templates/jsp &ndash;&gt;-->
<bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver"> <!--<bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">-->
<property name="templateEngine" ref="templateEngine" /> <!--<property name="templateEngine" ref="templateEngine" />-->
<property name="characterEncoding" value="UTF-8" /> <!--<property name="characterEncoding" value="UTF-8" />-->
<property name="order" value="100" /> <!--<property name="order" value="100" />-->
</bean> <!--</bean>-->
<!-- 共用jsp与thymeleaf,为了避免冲突,jsp viewname的前缀必须是jsp/ --> <!--&lt;!&ndash; 共用jsp与thymeleaf,为了避免冲突,jsp viewname的前缀必须是jsp/ &ndash;&gt;-->
<!-- jsp文件必须放在这个目录:WEB-INF/templates/jsp --> <!--&lt;!&ndash; jsp文件必须放在这个目录:WEB-INF/templates/jsp &ndash;&gt;-->
<bean id="viewResolver" <!--<bean id="viewResolver"-->
class="org.springframework.web.servlet.view.InternalResourceViewResolver"> <!--class="org.springframework.web.servlet.view.InternalResourceViewResolver">-->
<property name="viewClass" <!--<property name="viewClass"-->
value="org.springframework.web.servlet.view.JstlView" /> <!--value="org.springframework.web.servlet.view.JstlView" />-->
<property name="prefix" value="/WEB-INF/templates/" /> <!--<property name="prefix" value="/WEB-INF/templates/" />-->
<property name="suffix" value=".jsp" /> <!--<property name="suffix" value=".jsp" />-->
<property name="order" value="50" /> <!--<property name="order" value="50" />-->
<property name="viewNames" value="jsp/*" /> <!--<property name="viewNames" value="jsp/*" />-->
</bean> <!--</bean>-->
</beans> </beans>
\ No newline at end of file
atms-web/src/main/resources/applicationContext-mvc.xml
View file @ 517f7832
...@@ -38,8 +38,7 @@ ...@@ -38,8 +38,7 @@
<set> <set>
<!-- Note the package would change to 'springsecurity3' if you are using <!-- Note the package would change to 'springsecurity3' if you are using
that version --> that version -->
<bean <bean class="org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect"/>
class="org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect"/>
</set> </set>
</property> </property>
</bean> </bean>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment