Skip to content

A
amos-boot-biz
Commit 31f85241 authored by KeYong's avatar KeYong
Browse files
Options

修改报表设备巡查占比饼图

parent 536ac158
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 28 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FilePatrolReportServiceImpl.java
View file @ 31f85241
......@@ -218,11 +218,13 @@ public class FilePatrolReportServiceImpl implements IFirePatrolReportService {
String qualified_pie_chart = getChartString(pds, "合格情况占比");
map.put("qualified_pie_chart", qualified_pie_chart);
// 设备巡查饼图
DefaultPieDataset pds2 = new DefaultPieDataset();
pds2.setValue("已查询设备", checked_equipment_count);
pds2.setValue("漏查设备", unchecked_equipment_count);
String equip_pie_chart = getChartString(pds2, "设备巡查占比");
map.put("equip_pie_chart", equip_pie_chart);
if (!(checked_equipment_count == 0 && unchecked_equipment_count == 0)) {
DefaultPieDataset pds2 = new DefaultPieDataset();
pds2.setValue("已查询设备", checked_equipment_count);
pds2.setValue("漏查设备", unchecked_equipment_count);
String equip_pie_chart = getChartString(pds2, "设备巡查占比");
map.put("equip_pie_chart", equip_pie_chart);
}
// 业务主题
map.put("business_title", "消防巡查");
// 缺陷清单
......
amos-boot-system-equip/src/main/resources/ftl/FirePatrolReport.ftl
View file @ 31f85241
......@@ -3890,29 +3890,31 @@
</w:pict>
</w:r>
</w:p>
<w:p>
<w:pPr>
<w:jc w:val="left"/>
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
</w:pPr>
<w:r>
<w:pict>
<w:binData w:name="wordml://2.png">${(equip_pie_chart)!''}
</w:binData>
<v:shape id="_x0000_s1028" o:spt="75" alt="" type="#_x0000_t75" style="height:240pt;width:414.95pt;" filled="f" o:preferrelative="t" stroked="f" coordsize="21600,21600">
<v:path/>
<v:fill on="f" focussize="0,0"/>
<v:stroke on="f"/>
<v:imagedata src="wordml://2.png" o:title="wordml://2.png"/>
<o:lock v:ext="edit" aspectratio="t"/>
<w10:wrap type="none"/>
<w10:anchorlock/>
</v:shape>
</w:pict>
</w:r>
</w:p>
<#if equip_pie_chart?exists>
<w:p>
<w:pPr>
<w:jc w:val="left"/>
<w:rPr>
<w:rFonts w:hint="fareast"/>
</w:rPr>
</w:pPr>
<w:r>
<w:pict>
<w:binData w:name="wordml://2.png">${(equip_pie_chart)!''}
</w:binData>
<v:shape id="_x0000_s1028" o:spt="75" alt="" type="#_x0000_t75" style="height:240pt;width:414.95pt;" filled="f" o:preferrelative="t" stroked="f" coordsize="21600,21600">
<v:path/>
<v:fill on="f" focussize="0,0"/>
<v:stroke on="f"/>
<v:imagedata src="wordml://2.png" o:title="wordml://2.png"/>
<o:lock v:ext="edit" aspectratio="t"/>
<w10:wrap type="none"/>
<w10:anchorlock/>
</v:shape>
</w:pict>
</w:r>
</w:p>
</#if>
</w:tc>
</w:tr>
<w:tr>
......
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