Index: ssts-web/src/main/webapp/jasperRtp/strengthenStatisticalWorkloadDisposableGood.jrxml
===================================================================
diff -u -r29441 -r35558
--- ssts-web/src/main/webapp/jasperRtp/strengthenStatisticalWorkloadDisposableGood.jrxml	(.../strengthenStatisticalWorkloadDisposableGood.jrxml)	(revision 29441)
+++ ssts-web/src/main/webapp/jasperRtp/strengthenStatisticalWorkloadDisposableGood.jrxml	(.../strengthenStatisticalWorkloadDisposableGood.jrxml)	(revision 35558)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- 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="workload" language="groovy" pageWidth="309" pageHeight="1200" whenNoDataType="AllSectionsNoDetail" columnWidth="309" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="b6209d28-6c93-40a9-beb3-71a741da002e">
 	<property name="ireport.zoom" value="0.6830134553650713"/>
 	<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"/>
@@ -61,7 +62,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<textField>
-				<reportElement uuid="4f96bdd9-75d8-4bb7-b3c7-eed54a1c886a" x="0" y="0" width="2200" height="30"/>
+				<reportElement x="0" y="0" width="2200" height="30" uuid="4f96bdd9-75d8-4bb7-b3c7-eed54a1c886a"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true"/>
 				</textElement>
@@ -72,14 +73,17 @@
 	<summary>
 		<band height="30" splitType="Stretch">
 			<crosstab>
-				<reportElement uuid="648fe906-6aed-4eff-8977-38ddace66c2c" x="0" y="0" width="2200" height="30"/>
+				<reportElement x="0" y="0" width="2200" height="30" uuid="648fe906-6aed-4eff-8977-38ddace66c2c"/>
 				<crosstabParameter name="parameter1">
 					<parameterValueExpression><![CDATA[$P{showDisposableGoods}]]></parameterValueExpression>
 				</crosstabParameter>
+				<crosstabDataset>
+					<dataset resetType="Report"/>
+				</crosstabDataset>
 				<crosstabHeaderCell>
 					<cellContents>
 						<staticText>
-							<reportElement uuid="dd714099-88ea-4b06-a98f-a50bc4a332b8" style="table_TH" x="0" y="0" width="76" height="40" backcolor="#FFFFFF"/>
+							<reportElement style="table_TH" x="0" y="0" width="76" height="40" backcolor="#FFFFFF" uuid="dd714099-88ea-4b06-a98f-a50bc4a332b8"/>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -104,7 +108,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField>
-								<reportElement uuid="1b98ec54-1096-461c-85a0-dd2f24dbfd6d" style="table_TD" mode="Opaque" x="0" y="0" width="76" height="25"/>
+								<reportElement style="table_TD" mode="Opaque" x="0" y="0" width="76" height="25" uuid="1b98ec54-1096-461c-85a0-dd2f24dbfd6d"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="14"/>
 								</textElement>
@@ -118,7 +122,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<staticText>
-								<reportElement uuid="518aa8fe-9fd3-4237-9852-10c18bc8e31a" x="0" y="0" width="76" height="25"/>
+								<reportElement x="0" y="0" width="76" height="25" uuid="518aa8fe-9fd3-4237-9852-10c18bc8e31a"/>
 								<box>
 									<pen lineWidth="0.5"/>
 									<topPen lineWidth="0.5"/>
@@ -151,14 +155,14 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<staticText>
-								<reportElement uuid="c23bc7e2-1f6c-465d-b1c5-e816b5a2167c" style="table_CH" x="0" y="0" width="43" height="40" forecolor="#000000"/>
+								<reportElement style="table_CH" x="0" y="0" width="43" height="40" forecolor="#000000" uuid="c23bc7e2-1f6c-465d-b1c5-e816b5a2167c"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font isBold="true"/>
 								</textElement>
 								<text><![CDATA[总评分]]></text>
 							</staticText>
 							<staticText>
-								<reportElement uuid="c23bc7e2-1f6c-465d-b1c5-e816b5a2167c" style="table_CH" mode="Opaque" x="43" y="0" width="95" height="40" forecolor="#000000"/>
+								<reportElement style="table_CH" mode="Opaque" x="43" y="0" width="95" height="40" forecolor="#000000" uuid="c23bc7e2-1f6c-465d-b1c5-e816b5a2167c"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font isBold="true"/>
 									<paragraph lineSpacing="1_1_2"/>
@@ -178,7 +182,7 @@
 								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 							</box>
 							<textField>
-								<reportElement uuid="6eab765c-c933-44aa-8d42-7a1e876bca4e" style="Crosstab Data Text" x="0" y="0" width="190" height="20"/>
+								<reportElement style="Crosstab Data Text" x="0" y="0" width="190" height="20" uuid="6eab765c-c933-44aa-8d42-7a1e876bca4e"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -192,7 +196,7 @@
 								<textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression>
 							</textField>
 							<staticText>
-								<reportElement uuid="a33a36e9-3ed0-4a12-b2ba-5cae843bb127" style="Crosstab Data Text" x="0" y="20" width="75" height="20"/>
+								<reportElement style="Crosstab Data Text" x="0" y="20" width="75" height="20" uuid="a33a36e9-3ed0-4a12-b2ba-5cae843bb127"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -206,7 +210,7 @@
 								<text><![CDATA[包数]]></text>
 							</staticText>
 							<staticText>
-								<reportElement uuid="db370b31-880c-44a3-a8e1-ba9570c3262f" style="Crosstab Data Text" x="75" y="20" width="75" height="20"/>
+								<reportElement style="Crosstab Data Text" x="75" y="20" width="75" height="20" uuid="db370b31-880c-44a3-a8e1-ba9570c3262f"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -220,7 +224,7 @@
 								<text><![CDATA[件数]]></text>
 							</staticText>
 							<staticText>
-								<reportElement uuid="fb8589c5-0e02-42dd-a7a4-59b371a85877" style="Crosstab Data Text" mode="Opaque" x="150" y="20" width="40" height="20" backcolor="#CCFFCC"/>
+								<reportElement style="Crosstab Data Text" mode="Opaque" x="150" y="20" width="40" height="20" backcolor="#CCFFCC" uuid="fb8589c5-0e02-42dd-a7a4-59b371a85877"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -261,7 +265,9 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField pattern="" isBlankWhenNull="false">
-							<reportElement uuid="1de502ee-792a-4517-ae65-33bb35ce3412" style="table_TD" mode="Opaque" x="0" y="0" width="75" height="25" forecolor="#000000" backcolor="#FFFFFF"/>
+							<reportElement style="table_TD" mode="Opaque" x="0" y="0" width="75" height="25" forecolor="#000000" backcolor="#FFFFFF" uuid="1de502ee-792a-4517-ae65-33bb35ce3412">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -271,12 +277,14 @@
 							</box>
 							<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 								<font fontName="SansSerif" size="14" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-								<paragraph lineSpacing="Single"/>
+								<paragraph lineSpacing="Single" rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
 						<textField>
-							<reportElement uuid="7d295ce1-db02-45c3-8c3b-de0656a1887a" style="table_TD" x="75" y="0" width="75" height="25"/>
+							<reportElement style="table_TD" x="75" y="0" width="75" height="25" uuid="7d295ce1-db02-45c3-8c3b-de0656a1887a">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -286,11 +294,14 @@
 							</box>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{materialAmountMeasure}]]></textFieldExpression>
 						</textField>
 						<textField>
-							<reportElement uuid="c0b0fff6-222c-40bc-aa1c-b4ce2e96b542" style="Crosstab Data Text" mode="Opaque" x="150" y="0" width="40" height="25" backcolor="#CCFFCC"/>
+							<reportElement style="Crosstab Data Text" mode="Opaque" x="150" y="0" width="40" height="25" backcolor="#CCFFCC" uuid="c0b0fff6-222c-40bc-aa1c-b4ce2e96b542">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -300,6 +311,7 @@
 							</box>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{scoreMeasure}]]></textFieldExpression>
 						</textField>
@@ -311,24 +323,32 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="e277e6b2-eb9d-409f-b558-226f59b070e9" style="table_CH" x="0" y="0" width="75" height="25"/>
+							<reportElement style="table_CH" x="0" y="0" width="75" height="25" uuid="e277e6b2-eb9d-409f-b558-226f59b070e9">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14" isBold="true"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
 						<textField>
-							<reportElement uuid="4d5762e5-7d05-4067-a81e-93e4012380dd" style="table_CH" x="75" y="0" width="75" height="25"/>
+							<reportElement style="table_CH" x="75" y="0" width="75" height="25" uuid="4d5762e5-7d05-4067-a81e-93e4012380dd">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14" isBold="true"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{materialAmountMeasure}]]></textFieldExpression>
 						</textField>
 						<textField pattern="" isBlankWhenNull="false">
-							<reportElement uuid="a564467a-ca21-4baa-a759-8dbe37e3ba9f" style="table_CH" mode="Opaque" x="150" y="0" width="40" height="25" forecolor="#000000" backcolor="#BFE1FF"/>
+							<reportElement style="table_CH" mode="Opaque" x="150" y="0" width="40" height="25" forecolor="#000000" backcolor="#BFE1FF" uuid="a564467a-ca21-4baa-a759-8dbe37e3ba9f">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
 								<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-								<paragraph lineSpacing="Single"/>
+								<paragraph lineSpacing="Single" rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{scoreMeasure}]]></textFieldExpression>
 						</textField>
@@ -340,16 +360,22 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField>
-							<reportElement uuid="51ee9976-ad1a-4a02-bc10-1a0b58a09d9f" style="table_CH" x="0" y="0" width="43" height="25"/>
+							<reportElement style="table_CH" x="0" y="0" width="43" height="25" uuid="51ee9976-ad1a-4a02-bc10-1a0b58a09d9f">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="8"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{scoreMeasure}]]></textFieldExpression>
 						</textField>
 						<textField isBlankWhenNull="true">
-							<reportElement uuid="51ee9976-ad1a-4a02-bc10-1a0b58a09d9f" style="table_CH" x="43" y="0" width="95" height="25"/>
+							<reportElement style="table_CH" x="43" y="0" width="95" height="25" uuid="51ee9976-ad1a-4a02-bc10-1a0b58a09d9f">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="8"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{disposableGoodAmountMeasure}]]></textFieldExpression>
 						</textField>
@@ -361,7 +387,9 @@
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 						<textField isBlankWhenNull="true">
-							<reportElement uuid="31961583-d6f6-4d84-b526-90bd59ead2ac" style="Crosstab Data Text" mode="Opaque" x="43" y="0" width="95" height="25" isRemoveLineWhenBlank="true" isPrintInFirstWholeBand="true" backcolor="#BFE1FF"/>
+							<reportElement style="Crosstab Data Text" mode="Opaque" x="43" y="0" width="95" height="25" isRemoveLineWhenBlank="true" isPrintInFirstWholeBand="true" backcolor="#BFE1FF" uuid="31961583-d6f6-4d84-b526-90bd59ead2ac">
+								<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+							</reportElement>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -371,11 +399,12 @@
 							</box>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="8"/>
+								<paragraph rightIndent="8"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{disposableGoodAmountMeasure}]]></textFieldExpression>
 						</textField>
 						<staticText>
-							<reportElement uuid="aa794333-b763-4baf-8b0b-5714c41f42f2" style="Crosstab Data Text" mode="Opaque" x="0" y="0" width="43" height="25" backcolor="#BFE1FF"/>
+							<reportElement style="Crosstab Data Text" mode="Opaque" x="0" y="0" width="43" height="25" backcolor="#BFE1FF" uuid="aa794333-b763-4baf-8b0b-5714c41f42f2"/>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>