Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

backend/xyst.dinas.finance/src/main/java/com/xyst/dinas/finance/internal/service/StatementAccountServiceImpl.java

@@ -115,7 +115,7 @@ public class StatementAccountServiceImpl implements StatementAccountService{
 			    statementAccounts.add(statementAccount);
 			}
 		}
-		map.put("advanceExpenseAdjustAmount", advanceFinanceRefundAmount);
+		map.put("advanceExpenseAdjustAmount", advanceExpenseAdjustAmount);
 		map.put("depositExpenseAdjustAmount", depositExpenseAdjustAmount);
 		//销售
 		BigDecimal salesAmount = new BigDecimal("0"); //销售总额

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsDailyReportsAdvQuery.jmx

@@ -42,7 +42,7 @@ GROUP BY
 	SalesSummary.station UNION ALL
 SELECT
 	'总计' AS stationName,
-	'————' AS dinasTypeName,
+	'———' AS dinasTypeName,
 	SUM( SalesSummary.saleDealAmount ) AS saleDealAmount,
 	SUM( SalesSummary.saleAmount ) AS saleAmount 
 FROM
@@ -53,9 +53,7 @@ WHERE
 	( SalesSummary.dealTime >= :?startDate AND SalesSummary.dealTime < :?endDate ) 
 	AND Station.id IN (  :?stationList  ) 
 ORDER BY
-	 stationName = '总计'  DESC,
-	stationName,
-	 dinasTypeName = '小计'  ASC
+	stationName
 				</sql>
 		</template>
 	</content>

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/OperationsOtherReportsAdvQuery.jmx

@@ -42,7 +42,7 @@ GROUP BY
 	SalesSummary.station UNION ALL
 SELECT
 	'总计' AS stationName,
-	'————' AS dinasTypeName,
+	'———' AS dinasTypeName,
 	SUM( SalesSummary.saleDealAmount ) AS saleDealAmount,
 	SUM( SalesSummary.saleAmount ) AS saleAmount 
 FROM
@@ -53,9 +53,7 @@ WHERE
 	( SalesSummary.dealTime >= :?startDate AND SalesSummary.dealTime < :?endDate ) 
 	AND Station.id IN (  :?stationList  ) 
 ORDER BY
-	 stationName = '总计'  DESC,
-	stationName,
-	 dinasTypeName = '小计'  ASC
+	 stationName
 				</sql>
 		</template>
 	</content>

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/PaymentDetailsAdvQuery.jmx

@@ -22,7 +22,7 @@
 	    END
 	       as  fundType,
 	       artificialRecharge.rechargeAmount AS rechargeAmount,
-	       '' AS actualRefundAmount,
+	       '-' AS actualRefundAmount,
 	       artificialRecharge.remark AS remark 
 	    FROM
 	     ArtificialRecharge as artificialRecharge
@@ -73,7 +73,7 @@
 	    ELSE '预付款退费'
 	    END
 	      as fundType,
-			'' AS rechargeAmount,
+			'-' AS rechargeAmount,
 			financeRefund.actualRefundAmount AS actualRefundAmount,
 			financeRefund.refundExplain AS remark 
 		FROM