Skip to content

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

add exception handle code

parent 79c52a48
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 4 deletions
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java
View file @ ffa8025d
......@@ -239,7 +239,10 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
for (PeriodCellTemplateConfig periodCellTemplateConfig : periodCellTemplateConfigs) {
PeriodFormulaBlockExample periodFormulaBlockExample2 = new PeriodFormulaBlockExample();
periodFormulaBlockExample2.createCriteria().andCellTemplateIdEqualTo(periodCellTemplateConfig.getCellTemplateId());
periodFormulaBlockExample2.createCriteria()
.andCellTemplateIdEqualTo(periodCellTemplateConfig.getCellTemplateId())
.andReportIdEqualTo(reportID)
.andPeriodEqualTo(period);
List<PeriodFormulaBlock> periodFormulaBlocks = periodFormulaBlockMapper.selectByExample(periodFormulaBlockExample2);
//TODO：如果formula 为 ND(100) +ND(22) ,需要使用正则表达式拆分出自定义公式，然后根据自定义公式取formulablock 的数据进行替换
......@@ -363,9 +366,9 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
}
//cellData.setData(new BigDecimal(data).toString());
PeriodFormulaBlockExample periodFormulaBlockExample = new PeriodFormulaBlockExample();
periodFormulaBlockExample.createCriteria().andPeriodEqualTo(period)
.andCellTemplateIdEqualTo(tempPeriodCellTemplate.get().getCellTemplateId());
// PeriodFormulaBlockExample periodFormulaBlockExample = new PeriodFormulaBlockExample();
// periodFormulaBlockExample.createCriteria().andPeriodEqualTo(period)
// .andCellTemplateIdEqualTo(tempPeriodCellTemplate.get().getCellTemplateId());
// if (isFind) {
cellData.setFormulaExp(resultFormula);
......
atms-web/src/main/webapp/bundles/images/images.html 0 → 100644
View file @ ffa8025d
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<title></title>
</head>
<body>
<p>
<img border="0" src="note.gif" width="1" height="1">
<img border="0" src="newwindow.gif" width="1" height="1">
<img border="0" src="ui-bg_flat_0_aaaaaa_40x100.png" width="1" height="1">
<img border="0" src="ui-bg_glass_55_fbf9ee_1x400.png" width="1" height="1">
<img border="0" src="ui-bg_glass_65_ffffff_1x400.png" width="1" height="1">
<img border="0" src="ui-bg_glass_75_dadada_1x400.png" width="1" height="1">
<img border="0" src="ui-bg_glass_75_e6e6e6_1x400.png" width="1" height="1">
<img border="0" src="ui-bg_glass_75_ffffff_1x400.png" width="1" height="1">
<img border="0" src="ui-bg_highlight-soft_75_cccccc_1x100.png" width="1" height="1">
<img border="0" src="ui-bg_inset-soft_95_fef1ec_1x100.png" width="1" height="1">
<img border="0" src="ui-icons_222222_256x240.png" width="1" height="1">
<img border="0" src="ui-icons_2e83ff_256x240.png" width="1" height="1">
<img border="0" src="ui-icons_454545_256x240.png" width="1" height="1">
<img border="0" src="ui-icons_888888_256x240.png" width="1" height="1">
<img border="0" src="ui-icons_cd0a0a_256x240.png" width="1" height="1">
</p>
</body>
</html>
\ No newline at end of file
atms-web/src/main/webapp/bundles/images/summary-demo-resource/close.svg 0 → 100644
View file @ ffa8025d
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="18" height="10" viewBox="0 0 18 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<g id="Page-1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
<g id="close" sketch:type="MSArtboardGroup" fill="#ffffff">
<path d="M8.67067845,9.27101296 L8.65428726,9.28839318 L8.03983472,8.71618141 L0.614452539,1.80125987 L0,1.22904809 L1.15167591,0.00788171237 L1.76612845,0.580093485 L8.66273008,7.00258569 L15.5677952,0.572211772 L16.1822478,0 L17.3339237,1.22116638 L16.7194712,1.79337815 L9.29408898,8.70829969 L8.67963644,9.28051147 L8.67067845,9.27101296 Z" id="Shape" sketch:type="MSShapeGroup"/>
</g>
</g>
</svg>
atms-web/src/main/webapp/bundles/images/summary-demo-resource/close_hover.svg 0 → 100644
View file @ ffa8025d
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="19" height="10" viewBox="0 0 19 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<g id="Page-1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
<g id="close_hover" sketch:type="MSArtboardGroup" transform="translate(0.667847, 0.000000)" fill="#8f949a">
<path d="M8.67067845,9.27101296 L8.65428726,9.28839318 L8.03983472,8.71618141 L0.614452539,1.80125987 L0,1.22904809 L1.15167591,0.00788171237 L1.76612845,0.580093485 L8.66273008,7.00258569 L15.5677952,0.572211772 L16.1822478,0 L17.3339237,1.22116638 L16.7194712,1.79337815 L9.29408898,8.70829969 L8.67963644,9.28051147 L8.67067845,9.27101296 Z" id="Shape" sketch:type="MSShapeGroup"/>
</g>
</g>
</svg>
atms-web/src/main/webapp/bundles/images/summary-demo-resource/divider.svg 0 → 100644
View file @ ffa8025d
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="58" height="2" viewBox="0 0 58 2" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<defs>
<path id="path-1" d="M245.5,521 L305.5,521" stroke-linejoin="round" stroke="#bababa" stroke-dasharray="1 8" stroke-width="2" stroke-linecap="round"/>
</defs>
<g id="Axshare---Web-View" fill="none" fill-rule="evenodd" sketch:type="MSPage">
<g id="Share-Page-Notes-Copy" sketch:type="MSArtboardGroup" transform="translate(-244.000000, -520.000000)">
<g id="divider">
<use xlink:href="#path-1"/>
</g>
</g>
</g>
</svg>
atms-web/src/main/webapp/bundles/images/summary-demo-resource/expand.svg 0 → 100644
View file @ ffa8025d
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="18" height="10" viewBox="0 0 18 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<g id="Page-1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
<g id="expand" sketch:type="MSArtboardGroup" transform="translate(0.333924, 0.000000)" fill="#ffffff">
<path d="M8.67067845,9.27101296 L8.65428726,9.28839318 L8.03983472,8.71618141 L0.614452539,1.80125987 L0,1.22904809 L1.15167591,0.00788171237 L1.76612845,0.580093485 L8.66273008,7.00258569 L15.5677952,0.572211772 L16.1822478,0 L17.3339237,1.22116638 L16.7194712,1.79337815 L9.29408898,8.70829969 L8.67963644,9.28051147 L8.67067845,9.27101296 Z" id="Shape" sketch:type="MSShapeGroup" transform="translate(8.666962, 4.644197) scale(1, -1) translate(-8.666962, -4.644197) "/>
</g>
</g>
</svg>
atms-web/src/main/webapp/bundles/images/summary-demo-resource/expand_hover.svg 0 → 100644
View file @ ffa8025d
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="18" height="10" viewBox="0 0 18 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<g id="Page-1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
<g id="expand_hover" sketch:type="MSArtboardGroup" transform="translate(0.001771, 0.000000)" fill="#8f949a">
<path d="M8.67067845,9.27101296 L8.65428726,9.28839318 L8.03983472,8.71618141 L0.614452539,1.80125987 L0,1.22904809 L1.15167591,0.00788171237 L1.76612845,0.580093485 L8.66273008,7.00258569 L15.5677952,0.572211772 L16.1822478,0 L17.3339237,1.22116638 L16.7194712,1.79337815 L9.29408898,8.70829969 L8.67963644,9.28051147 L8.67067845,9.27101296 Z" id="Shape" sketch:type="MSShapeGroup" transform="translate(8.666962, 4.644197) scale(1, -1) translate(-8.666962, -4.644197) "/>
</g>
</g>
</svg>
atms-web/src/main/webapp/bundles/images/summary-demo-resource/images.html 0 → 100644
View file @ ffa8025d
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<title></title>
</head>
<body>
<p>
<img border="0" src="transparent.gif" width="1" height="1">
<img border="0" src="259_close_12rollover1.png" width="1" height="1">
<img border="0" src="259_close_12rollover2.png" width="1" height="1">
<img border="0" src="260_collapse_12rollover1.png" width="1" height="1">
<img border="0" src="260_collapse_12rollover2.png" width="1" height="1">
<img border="0" src="261_expand_12rollover1.png" width="1" height="1">
<img border="0" src="261_expand_12rollover2.png" width="1" height="1">
</p>
</body>
</html>
\ No newline at end of file
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