Skip to content

A
amos-boot-biz
Commit e3fb26de authored by maoying's avatar maoying
Browse files
Options

Merge branch 'develop_dl_plan6' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6

parents 70ff508a 31f85241
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 @ e3fb26de
...@@ -218,11 +218,13 @@ public class FilePatrolReportServiceImpl implements IFirePatrolReportService { ...@@ -218,11 +218,13 @@ public class FilePatrolReportServiceImpl implements IFirePatrolReportService {
String qualified_pie_chart = getChartString(pds, "合格情况占比"); String qualified_pie_chart = getChartString(pds, "合格情况占比");
map.put("qualified_pie_chart", qualified_pie_chart); map.put("qualified_pie_chart", qualified_pie_chart);
// 设备巡查饼图 // 设备巡查饼图
DefaultPieDataset pds2 = new DefaultPieDataset(); if (!(checked_equipment_count == 0 && unchecked_equipment_count == 0)) {
pds2.setValue("已查询设备", checked_equipment_count); DefaultPieDataset pds2 = new DefaultPieDataset();
pds2.setValue("漏查设备", unchecked_equipment_count); pds2.setValue("已查询设备", checked_equipment_count);
String equip_pie_chart = getChartString(pds2, "设备巡查占比"); pds2.setValue("漏查设备", unchecked_equipment_count);
map.put("equip_pie_chart", equip_pie_chart); String equip_pie_chart = getChartString(pds2, "设备巡查占比");
map.put("equip_pie_chart", equip_pie_chart);
}
// 业务主题 // 业务主题
map.put("business_title", "消防巡查"); map.put("business_title", "消防巡查");
// 缺陷清单 // 缺陷清单
......
amos-boot-system-equip/src/main/resources/ftl/FirePatrolReport.ftl
View file @ e3fb26de
...@@ -3890,29 +3890,31 @@ ...@@ -3890,29 +3890,31 @@
</w:pict> </w:pict>
</w:r> </w:r>
</w:p> </w:p>
<w:p> <#if equip_pie_chart?exists>
<w:pPr> <w:p>
<w:jc w:val="left"/> <w:pPr>
<w:rPr> <w:jc w:val="left"/>
<w:rFonts w:hint="fareast"/> <w:rPr>
</w:rPr> <w:rFonts w:hint="fareast"/>
</w:pPr> </w:rPr>
<w:r> </w:pPr>
<w:pict> <w:r>
<w:binData w:name="wordml://2.png">${(equip_pie_chart)!''} <w:pict>
</w:binData> <w:binData w:name="wordml://2.png">${(equip_pie_chart)!''}
<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"> </w:binData>
<v:path/> <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:fill on="f" focussize="0,0"/> <v:path/>
<v:stroke on="f"/> <v:fill on="f" focussize="0,0"/>
<v:imagedata src="wordml://2.png" o:title="wordml://2.png"/> <v:stroke on="f"/>
<o:lock v:ext="edit" aspectratio="t"/> <v:imagedata src="wordml://2.png" o:title="wordml://2.png"/>
<w10:wrap type="none"/> <o:lock v:ext="edit" aspectratio="t"/>
<w10:anchorlock/> <w10:wrap type="none"/>
</v:shape> <w10:anchorlock/>
</w:pict> </v:shape>
</w:r> </w:pict>
</w:p> </w:r>
</w:p>
</#if>
</w:tc> </w:tc>
</w:tr> </w:tr>
<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