Index: ssts-web/src/main/webapp/jasperRtp/monthReport.jrxml
===================================================================
diff -u -r27617 -r27621
--- ssts-web/src/main/webapp/jasperRtp/monthReport.jrxml	(.../monthReport.jrxml)	(revision 27617)
+++ ssts-web/src/main/webapp/jasperRtp/monthReport.jrxml	(.../monthReport.jrxml)	(revision 27621)
@@ -52,6 +52,9 @@
 	<field name="columnTitle" class="java.lang.String">
 		<fieldDescription><![CDATA[columnTitle]]></fieldDescription>
 	</field>
+	<field name="sequence" class="java.lang.Integer">
+		<fieldDescription><![CDATA[sequence]]></fieldDescription>
+	</field>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
@@ -81,35 +84,10 @@
 						</staticText>
 					</cellContents>
 				</crosstabHeaderCell>
-				<rowGroup name="rowNum" width="0" totalPosition="End">
-					<bucket class="java.lang.String">
-						<bucketExpression><![CDATA[$F{rowNum}]]></bucketExpression>
-					</bucket>
-					<crosstabRowHeader>
-						<cellContents backcolor="#F0F8FF" mode="Opaque">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabRowHeader>
-					<crosstabTotalRowHeader>
-						<cellContents backcolor="#FFFFFF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-							<staticText>
-								<reportElement uuid="1311756a-eafc-440e-926f-b78c03af13a7" x="0" y="0" width="117" height="25" forecolor="#000000"/>
-								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12" isBold="true"/>
-								</textElement>
-								<text><![CDATA[合计]]></text>
-							</staticText>
-						</cellContents>
-					</crosstabTotalRowHeader>
-				</rowGroup>
 				<rowGroup name="department" width="117" totalPosition="End">
 					<bucket class="java.lang.String">
 						<bucketExpression><![CDATA[$F{department}]]></bucketExpression>
+						<orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression>
 					</bucket>
 					<crosstabRowHeader>
 						<cellContents backcolor="#FFFFFF" mode="Transparent">
@@ -207,6 +185,9 @@
 				<measure name="moneyMeasure" class="java.lang.Double" calculation="Sum">
 					<measureExpression><![CDATA[$F{money}]]></measureExpression>
 				</measure>
+				<measure name="sequenceMeasure" class="java.lang.Integer" calculation="First">
+					<measureExpression><![CDATA[$F{sequence}==null?99999:$F{sequence}]]></measureExpression>
+				</measure>
 				<crosstabCell width="79" height="25">
 					<cellContents>
 						<box>
@@ -221,34 +202,13 @@
 						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell width="79" height="25" rowTotalGroup="rowNum">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField pattern="###0.0000">
-							<reportElement uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35" style="Crosstab Data Text" x="0" y="0" width="79" height="25" forecolor="#000000"/>
-							<textElement verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
-							</textElement>
-							<textFieldExpression><![CDATA[$V{moneyMeasure}]]></textFieldExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
 				<crosstabCell width="0" height="25" columnTotalGroup="columnNum">
 					<cellContents backcolor="#005FB3" mode="Opaque">
 						<box>
 							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
 						</box>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell width="0" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnNum">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-					</cellContents>
-				</crosstabCell>
 				<crosstabCell width="81" height="25" columnTotalGroup="columnTitle">
 					<cellContents backcolor="#FFFFFF" mode="Transparent">
 						<box>
@@ -263,20 +223,6 @@
 						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell width="81" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnTitle">
-					<cellContents backcolor="#FFFFFF" mode="Transparent">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField pattern="###0.0000">
-							<reportElement uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111" style="Crosstab Data Text" x="0" y="0" width="81" height="25" forecolor="#000000"/>
-							<textElement verticalAlignment="Middle">
-								<font size="12" isBold="true"/>
-							</textElement>
-							<textFieldExpression><![CDATA[$V{moneyMeasure}]]></textFieldExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
 				<crosstabCell width="79" height="0" rowTotalGroup="department">
 					<cellContents backcolor="#BFE1FF" mode="Opaque">
 						<box>
@@ -301,9 +247,6 @@
 				<crosstabCell columnTotalGroup="columnName">
 					<cellContents/>
 				</crosstabCell>
-				<crosstabCell rowTotalGroup="rowNum" columnTotalGroup="columnName">
-					<cellContents/>
-				</crosstabCell>
 				<crosstabCell rowTotalGroup="department" columnTotalGroup="columnName">
 					<cellContents/>
 				</crosstabCell>