Index: ssts-web/src/main/webapp/jasperRtp/deviceMaintenance.jrxml
===================================================================
diff -u -r12331 -r17504
--- ssts-web/src/main/webapp/jasperRtp/deviceMaintenance.jrxml	(.../deviceMaintenance.jrxml)	(revision 12331)
+++ ssts-web/src/main/webapp/jasperRtp/deviceMaintenance.jrxml	(.../deviceMaintenance.jrxml)	(revision 17504)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="deviceMaintenance" language="groovy" pageWidth="880" pageHeight="842" columnWidth="880" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="4d2ae3f2-9dcb-4ed8-bb24-76367f555bb9">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="deviceMaintenance" language="groovy" pageWidth="1480" pageHeight="842" columnWidth="1480" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="4d2ae3f2-9dcb-4ed8-bb24-76367f555bb9">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -49,6 +49,9 @@
 	<field name="titleSort" class="java.lang.String">
 		<fieldDescription><![CDATA[titleSort]]></fieldDescription>
 	</field>
+	<field name="totalPrice" class="java.lang.String">
+		<fieldDescription><![CDATA[totalPrice]]></fieldDescription>
+	</field>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -66,30 +69,37 @@
 	<summary>
 		<band height="120" splitType="Stretch">
 			<crosstab>
-				<reportElement uuid="27b59a7f-349a-443d-9ac4-3f60a8aa96bc" x="0" y="0" width="880" height="120"/>
+				<reportElement uuid="27b59a7f-349a-443d-9ac4-3f60a8aa96bc" x="0" y="0" width="1480" height="120"/>
 				<crosstabHeaderCell>
 					<cellContents>
 						<staticText>
 							<reportElement uuid="65ac8b29-e924-4c11-a114-9bd2a1e20e99" style="table_TH" x="0" y="0" width="66" height="38"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="14" isBold="true"/>
 							</textElement>
-							<text><![CDATA[日期]]></text>
+							<text><![CDATA[时间]]></text>
 						</staticText>
 						<staticText>
-							<reportElement uuid="dd21690d-3f2c-4ffc-84a7-84968f9caa55" style="table_TH" x="66" y="0" width="132" height="38"/>
+							<reportElement uuid="dd21690d-3f2c-4ffc-84a7-84968f9caa55" style="table_TH" x="284" y="0" width="86" height="38"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="14" isBold="true"/>
 							</textElement>
 							<text><![CDATA[设备名称]]></text>
 						</staticText>
 						<staticText>
-							<reportElement uuid="4f794963-a3f3-46cd-bad3-27fb7b3fb54d" style="table_TH" x="198" y="0" width="68" height="38"/>
+							<reportElement uuid="4f794963-a3f3-46cd-bad3-27fb7b3fb54d" style="table_TH" x="66" y="0" width="132" height="38"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="14" isBold="true"/>
 							</textElement>
 							<text><![CDATA[耗材名称]]></text>
 						</staticText>
+						<staticText>
+							<reportElement uuid="4f794963-a3f3-46cd-bad3-27fb7b3fb54d" style="table_TH" x="198" y="0" width="86" height="38"/>
+							<textElement textAlignment="Center" verticalAlignment="Middle">
+								<font size="14" isBold="true"/>
+							</textElement>
+							<text><![CDATA[总价]]></text>
+						</staticText>
 					</cellContents>
 				</crosstabHeaderCell>
 				<rowGroup name="date" width="66">
@@ -136,17 +146,34 @@
 						<cellContents/>
 					</crosstabTotalRowHeader>
 				</rowGroup>
-				<rowGroup name="materialName" width="68" headerPosition="Stretch">
+				<rowGroup name="totalPrice" width="86" headerPosition="Stretch">
 					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{materialName}]]></bucketExpression>
+						<bucketExpression><![CDATA[$F{totalPrice}]]></bucketExpression>
 					</bucket>
 					<crosstabRowHeader>
 						<cellContents>
-							<textField>
-								<reportElement uuid="9ec6ee0b-c8b7-4e63-946b-716fcbd2cb94" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="68" height="47"/>
+							<textField isBlankWhenNull="true">
+								<reportElement uuid="27af647c-ba74-448a-a81f-b114532ee807" style="table_TH" positionType="FixRelativeToBottom" stretchType="RelativeToBandHeight" x="0" y="0" width="86" height="47"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12"/>
+									<font size="13"/>
 								</textElement>
+								<textFieldExpression><![CDATA[$V{totalPrice}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabRowHeader>
+					<crosstabTotalRowHeader>
+						<cellContents/>
+					</crosstabTotalRowHeader>
+				</rowGroup>
+				<rowGroup name="materialName" width="86" headerPosition="Stretch">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{materialName}]]></bucketExpression>
+					</bucket>
+					<crosstabRowHeader>
+						<cellContents>
+							<textField>
+								<reportElement uuid="9ec6ee0b-c8b7-4e63-946b-716fcbd2cb94" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="86" height="47"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle"/>
 								<textFieldExpression><![CDATA[$V{materialName}]]></textFieldExpression>
 							</textField>
 						</cellContents>
@@ -180,7 +207,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField>
-								<reportElement uuid="1df36417-4aee-4d1c-b4ac-2ec1356ac984" style="Crosstab Data Text" x="0" y="0" width="76" height="38"/>
+								<reportElement uuid="1df36417-4aee-4d1c-b4ac-2ec1356ac984" style="Crosstab Data Text" x="1" y="0" width="76" height="38"/>
 								<textElement verticalAlignment="Middle">
 									<font size="14" isBold="true"/>
 								</textElement>
@@ -195,13 +222,13 @@
 				<measure name="resultMeasure" class="java.lang.String" calculation="First">
 					<measureExpression><![CDATA[$F{result}]]></measureExpression>
 				</measure>
-				<crosstabCell width="76" height="47">
+				<crosstabCell width="77" height="47">
 					<cellContents>
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField isBlankWhenNull="true">
-							<reportElement uuid="72dfc928-614d-4a91-b9c2-ad4738ad6a8c" style="Crosstab Data Text" x="0" y="0" width="76" height="47"/>
+							<reportElement uuid="72dfc928-614d-4a91-b9c2-ad4738ad6a8c" style="Crosstab Data Text" x="1" y="0" width="76" height="47"/>
 							<textElement verticalAlignment="Middle">
 								<font size="12"/>
 							</textElement>
@@ -314,6 +341,15 @@
 				<crosstabCell rowTotalGroup="materialName" columnTotalGroup="title">
 					<cellContents/>
 				</crosstabCell>
+				<crosstabCell rowTotalGroup="totalPrice">
+					<cellContents/>
+				</crosstabCell>
+				<crosstabCell rowTotalGroup="totalPrice" columnTotalGroup="titleSort">
+					<cellContents/>
+				</crosstabCell>
+				<crosstabCell rowTotalGroup="totalPrice" columnTotalGroup="title">
+					<cellContents/>
+				</crosstabCell>
 			</crosstab>
 		</band>
 	</summary>