Index: ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jrxml
===================================================================
diff -u -r27621 -r35562
--- ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jrxml	(.../deviceMaintenanceCusReport.jrxml)	(revision 27621)
+++ ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jrxml	(.../deviceMaintenanceCusReport.jrxml)	(revision 35562)
@@ -1,9 +1,10 @@
 <?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="QualityMonitoringReport" language="groovy" pageWidth="7000" pageHeight="1083" columnWidth="7000" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="7a1b4557-a774-4276-982f-6340b58433e3">
+<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
+<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="QualityMonitoringReport" language="groovy" pageWidth="767" pageHeight="1083" columnWidth="767" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="7a1b4557-a774-4276-982f-6340b58433e3">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
-	<style name="Crosstab Data Text" hAlign="Center"/>
+	<style name="Crosstab Data Text" hTextAlign="Center" hImageAlign="Center"/>
 	<style name="table">
 		<box>
 			<pen lineWidth="1.0" lineColor="#000000"/>
@@ -79,6 +80,9 @@
 	<field name="projectName" class="java.lang.String">
 		<fieldDescription><![CDATA[projectName]]></fieldDescription>
 	</field>
+	<field name="remark" class="java.lang.String">
+		<fieldDescription><![CDATA[remark]]></fieldDescription>
+	</field>
 	<variable name="index" class="java.lang.Integer" resetType="Column" calculation="Count">
 		<variableExpression><![CDATA[new Integer("1")]]></variableExpression>
 	</variable>
@@ -88,8 +92,10 @@
 	<title>
 		<band height="41" splitType="Stretch">
 			<textField>
-				<reportElement uuid="64157d03-19f2-4c2d-8fd9-99cb2ac19259" x="0" y="0" width="4390" height="41"/>
-				<textElement verticalAlignment="Middle">
+				<reportElement x="0" y="0" width="767" height="41" uuid="64157d03-19f2-4c2d-8fd9-99cb2ac19259">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
@@ -99,37 +105,96 @@
 	<summary>
 		<band height="150" splitType="Stretch">
 			<crosstab ignoreWidth="true">
-				<reportElement uuid="760d1e08-1e22-4dcc-872b-4c115269897e" style="table_TD" x="0" y="0" width="7000" height="150"/>
+				<reportElement style="table_TD" x="0" y="0" width="767" height="150" uuid="760d1e08-1e22-4dcc-872b-4c115269897e">
+					<property name="com.jaspersoft.studio.crosstab.style.detail" value="Crosstab Data Text"/>
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+				</reportElement>
+				<crosstabDataset>
+					<dataset resetType="Report"/>
+				</crosstabDataset>
 				<crosstabHeaderCell>
-					<cellContents style="Crosstab Data Text">
+					<cellContents mode="Opaque" style="Crosstab Data Text">
+						<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.grid.JSSGridBagLayout"/>
 						<staticText>
-							<reportElement uuid="63f70f13-ab4d-4113-af49-541c7007b3a2" style="table_TH" x="268" y="0" width="55" height="84"/>
+							<reportElement style="table_TH" x="0" y="0" width="91" height="84" uuid="63f70f13-ab4d-4113-af49-541c7007b3a2">
+								<property name="com.jaspersoft.layout.grid.x" value="-1"/>
+								<property name="com.jaspersoft.layout.grid.y" value="-1"/>
+								<property name="com.jaspersoft.layout.grid.weight.x" value="1.0"/>
+								<property name="com.jaspersoft.layout.grid.weight.y" value="1.0"/>
+								<property name="com.jaspersoft.layout.grid.rowspan" value="1"/>
+								<property name="com.jaspersoft.layout.grid.colspan" value="1"/>
+								<property name="com.jaspersoft.layout.grid.weight.fixed" value="true"/>
+								<property name="com.jaspersoft.studio.unit.width" value="px"/>
+							</reportElement>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="13" isBold="true"/>
 							</textElement>
 							<text><![CDATA[登记人]]></text>
 						</staticText>
 						<staticText>
-							<reportElement uuid="1256f540-aa3a-4b0b-af19-1f89d16f5c02" style="table_TH" x="91" y="0" width="177" height="84"/>
+							<reportElement style="table_TH" x="91" y="0" width="177" height="84" uuid="1256f540-aa3a-4b0b-af19-1f89d16f5c02">
+								<property name="com.jaspersoft.layout.grid.x" value="-1"/>
+								<property name="com.jaspersoft.layout.grid.y" value="-1"/>
+								<property name="com.jaspersoft.layout.grid.weight.x" value="1.0"/>
+								<property name="com.jaspersoft.layout.grid.weight.y" value="1.0"/>
+								<property name="com.jaspersoft.layout.grid.rowspan" value="1"/>
+								<property name="com.jaspersoft.layout.grid.colspan" value="1"/>
+								<property name="com.jaspersoft.layout.grid.weight.fixed" value="true"/>
+								<property name="com.jaspersoft.studio.unit.width" value="px"/>
+							</reportElement>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="13" isBold="true"/>
 							</textElement>
 							<text><![CDATA[设备维护名称]]></text>
 						</staticText>
 						<staticText>
-							<reportElement uuid="60b275b2-3adb-43c6-8a16-3ffda04f0023" style="table_TH" x="0" y="0" width="91" height="84"/>
+							<reportElement style="table_TH" x="268" y="0" width="55" height="84" uuid="60b275b2-3adb-43c6-8a16-3ffda04f0023">
+								<property name="com.jaspersoft.layout.grid.x" value="-1"/>
+								<property name="com.jaspersoft.layout.grid.y" value="-1"/>
+								<property name="com.jaspersoft.layout.grid.weight.x" value="1.0"/>
+								<property name="com.jaspersoft.layout.grid.weight.y" value="1.0"/>
+								<property name="com.jaspersoft.layout.grid.rowspan" value="1"/>
+								<property name="com.jaspersoft.layout.grid.colspan" value="1"/>
+								<property name="com.jaspersoft.layout.grid.weight.fixed" value="true"/>
+								<property name="com.jaspersoft.studio.unit.width" value="px"/>
+							</reportElement>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="13" isBold="true"/>
 							</textElement>
 							<text><![CDATA[维护时间]]></text>
 						</staticText>
 						<staticText>
-							<reportElement uuid="63f70f13-ab4d-4113-af49-541c7007b3a2" style="table_TH" x="323" y="0" width="170" height="84"/>
+							<reportElement style="table_TH" x="323" y="0" width="170" height="84" uuid="63f70f13-ab4d-4113-af49-541c7007b3a2">
+								<property name="com.jaspersoft.layout.grid.x" value="-1"/>
+								<property name="com.jaspersoft.layout.grid.y" value="-1"/>
+								<property name="com.jaspersoft.layout.grid.weight.x" value="1.0"/>
+								<property name="com.jaspersoft.layout.grid.weight.y" value="1.0"/>
+								<property name="com.jaspersoft.layout.grid.rowspan" value="1"/>
+								<property name="com.jaspersoft.layout.grid.colspan" value="1"/>
+								<property name="com.jaspersoft.layout.grid.weight.fixed" value="true"/>
+								<property name="com.jaspersoft.studio.unit.width" value="px"/>
+							</reportElement>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="13" isBold="true"/>
 							</textElement>
 							<text><![CDATA[项目名称]]></text>
 						</staticText>
+						<staticText>
+							<reportElement style="table_TH" x="493" y="0" width="170" height="84" uuid="ae0f5971-9d95-4378-ab91-da64b99922b5">
+								<property name="com.jaspersoft.layout.grid.x" value="-1"/>
+								<property name="com.jaspersoft.layout.grid.y" value="-1"/>
+								<property name="com.jaspersoft.layout.grid.weight.x" value="1.0"/>
+								<property name="com.jaspersoft.layout.grid.weight.y" value="1.0"/>
+								<property name="com.jaspersoft.layout.grid.rowspan" value="1"/>
+								<property name="com.jaspersoft.layout.grid.colspan" value="1"/>
+								<property name="com.jaspersoft.layout.grid.weight.fixed" value="true"/>
+								<property name="com.jaspersoft.studio.unit.width" value="px"/>
+							</reportElement>
+							<textElement textAlignment="Center" verticalAlignment="Middle">
+								<font size="13" isBold="true"/>
+							</textElement>
+							<text><![CDATA[备注]]></text>
+						</staticText>
 					</cellContents>
 				</crosstabHeaderCell>
 				<rowGroup name="dateTime" width="91" headerPosition="Stretch">
@@ -141,8 +206,8 @@
 							<box>
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
-							<textField isStretchWithOverflow="true">
-								<reportElement uuid="c74af6f6-5059-4a0b-8386-8a8891ec5f4c" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="91" height="55" isPrintWhenDetailOverflows="true"/>
+							<textField textAdjust="StretchHeight" isBlankWhenNull="true">
+								<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="91" height="66" isPrintWhenDetailOverflows="true" uuid="c74af6f6-5059-4a0b-8386-8a8891ec5f4c"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
@@ -160,8 +225,8 @@
 					</bucket>
 					<crosstabRowHeader>
 						<cellContents>
-							<textField isStretchWithOverflow="true">
-								<reportElement uuid="c74af6f6-5059-4a0b-8386-8a8891ec5f4c" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="177" height="55" isPrintWhenDetailOverflows="true"/>
+							<textField textAdjust="StretchHeight" isBlankWhenNull="true">
+								<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="177" height="66" isPrintWhenDetailOverflows="true" uuid="c74af6f6-5059-4a0b-8386-8a8891ec5f4c"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
@@ -179,8 +244,8 @@
 					</bucket>
 					<crosstabRowHeader>
 						<cellContents>
-							<textField isStretchWithOverflow="true">
-								<reportElement uuid="c74af6f6-5059-4a0b-8386-8a8891ec5f4c" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="55" height="55" isPrintWhenDetailOverflows="true"/>
+							<textField textAdjust="StretchHeight" isBlankWhenNull="true">
+								<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="55" height="66" isPrintWhenDetailOverflows="true" uuid="c74af6f6-5059-4a0b-8386-8a8891ec5f4c"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
@@ -198,8 +263,8 @@
 					</bucket>
 					<crosstabRowHeader>
 						<cellContents>
-							<textField isStretchWithOverflow="true">
-								<reportElement uuid="c74af6f6-5059-4a0b-8386-8a8891ec5f4c" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="170" height="55" isPrintWhenDetailOverflows="true"/>
+							<textField textAdjust="StretchHeight" isBlankWhenNull="true">
+								<reportElement style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="170" height="66" isPrintWhenDetailOverflows="true" uuid="c74af6f6-5059-4a0b-8386-8a8891ec5f4c"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
@@ -211,6 +276,30 @@
 						<cellContents/>
 					</crosstabTotalRowHeader>
 				</rowGroup>
+				<rowGroup name="remark" width="170">
+					<bucket class="java.lang.String">
+						<bucketExpression><![CDATA[$F{remark}]]></bucketExpression>
+					</bucket>
+					<crosstabRowHeader>
+						<cellContents>
+							<textField textAdjust="StretchHeight" isBlankWhenNull="true">
+								<reportElement style="Crosstab Data Text" stretchType="RelativeToBandHeight" x="0" y="0" width="170" height="66" uuid="2edc7ed1-d9fb-4bbf-91c0-752f501123df"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="12" isBold="false"/>
+								</textElement>
+								<textFieldExpression><![CDATA[$V{remark}]]></textFieldExpression>
+							</textField>
+						</cellContents>
+					</crosstabRowHeader>
+					<crosstabTotalRowHeader>
+						<cellContents>
+							<staticText>
+								<reportElement x="0" y="0" width="91" height="20" uuid="c1129602-a778-4b4e-8af1-474e1d765ba1"/>
+								<text><![CDATA[Total remark]]></text>
+							</staticText>
+						</cellContents>
+					</crosstabTotalRowHeader>
+				</rowGroup>
 				<columnGroup name="orderNumber" height="0" headerPosition="Stretch">
 					<bucket class="java.lang.Integer">
 						<bucketExpression><![CDATA[$F{orderNumber}]]></bucketExpression>
@@ -235,8 +324,8 @@
 							<box>
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
-							<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-								<reportElement uuid="34e1ddb9-9d19-406a-8a3d-2218db8002cd" style="table_TH" positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="104" height="42" isRemoveLineWhenBlank="true" isPrintInFirstWholeBand="true" isPrintWhenDetailOverflows="true"/>
+							<textField textAdjust="StretchHeight" isBlankWhenNull="true">
+								<reportElement style="table_TH" positionType="Float" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="104" height="42" isRemoveLineWhenBlank="true" isPrintInFirstWholeBand="true" isPrintWhenDetailOverflows="true" uuid="34e1ddb9-9d19-406a-8a3d-2218db8002cd"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12" isBold="true"/>
 									<paragraph tabStopWidth="40"/>
@@ -256,7 +345,7 @@
 					<crosstabColumnHeader>
 						<cellContents>
 							<textField pattern="" isBlankWhenNull="true">
-								<reportElement uuid="7ec92dc6-d92d-4bf5-82aa-0aac3fb95ebb" style="table_TH" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="104" height="42"/>
+								<reportElement style="table_TH" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="104" height="42" uuid="7ec92dc6-d92d-4bf5-82aa-0aac3fb95ebb"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12" isBold="true" isUnderline="false" isStrikeThrough="false"/>
 									<paragraph lineSpacing="Single"/>
@@ -272,13 +361,13 @@
 				<measure name="answerMeasure" class="java.lang.String" calculation="First">
 					<measureExpression><![CDATA[$F{answer}]]></measureExpression>
 				</measure>
-				<crosstabCell width="104" height="55">
-					<cellContents>
+				<crosstabCell width="104" height="66">
+					<cellContents mode="Opaque" style="Crosstab Data Text">
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField isBlankWhenNull="true">
-							<reportElement uuid="0040ed3b-81c5-4886-881d-1d8f4a7b237d" style="table_TD" x="0" y="0" width="104" height="55"/>
+							<reportElement style="table_TD" x="0" y="0" width="104" height="66" uuid="0040ed3b-81c5-4886-881d-1d8f4a7b237d"/>
 							<textElement textAlignment="Center" verticalAlignment="Middle">
 								<font size="12"/>
 							</textElement>
@@ -292,8 +381,7 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="40d41a97-6b16-4805-b06a-910be7ba2c23" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="50" height="0" forecolor="#FFFFFF" uuid="40d41a97-6b16-4805-b06a-910be7ba2c23"/>
 							<textFieldExpression><![CDATA[$V{answerMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
@@ -304,8 +392,7 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="110fc358-1ed6-4f08-927d-44cc93dc8d74" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
-							<textElement/>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="50" height="0" uuid="110fc358-1ed6-4f08-927d-44cc93dc8d74"/>
 							<textFieldExpression><![CDATA[$V{answerMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
@@ -316,8 +403,7 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="498c7426-4371-4e72-bff8-59cf153f5b8a" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
-							<textElement/>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="0" height="25" uuid="498c7426-4371-4e72-bff8-59cf153f5b8a"/>
 							<textFieldExpression><![CDATA[$V{answerMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
@@ -328,8 +414,7 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="7b655a50-0b69-41d1-98ca-d2fa88d8769e" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="0" height="0" forecolor="#FFFFFF" uuid="7b655a50-0b69-41d1-98ca-d2fa88d8769e"/>
 							<textFieldExpression><![CDATA[$V{answerMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
@@ -340,8 +425,7 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="aa07b3db-8033-4903-af8d-7e4eb6ec6459" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
-							<textElement/>
+							<reportElement style="Crosstab Data Text" x="0" y="0" width="0" height="0" uuid="aa07b3db-8033-4903-af8d-7e4eb6ec6459"/>
 							<textFieldExpression><![CDATA[$V{answerMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
@@ -388,6 +472,18 @@
 				<crosstabCell rowTotalGroup="projectName" columnTotalGroup="option">
 					<cellContents/>
 				</crosstabCell>
+				<crosstabCell height="20" rowTotalGroup="remark">
+					<cellContents/>
+				</crosstabCell>
+				<crosstabCell height="20" rowTotalGroup="remark" columnTotalGroup="orderNumber">
+					<cellContents/>
+				</crosstabCell>
+				<crosstabCell height="20" rowTotalGroup="remark" columnTotalGroup="questionName">
+					<cellContents/>
+				</crosstabCell>
+				<crosstabCell height="20" rowTotalGroup="remark" columnTotalGroup="option">
+					<cellContents/>
+				</crosstabCell>
 			</crosstab>
 		</band>
 	</summary>