预付款及结余汇总增加销售数量字段

backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/constant/AdvancePaymentBalanceSumConstants.java

@@ -37,4 +37,7 @@ public interface AdvancePaymentBalanceSumConstants {
 	public static final String TOTALMARGIN = "totalMargin";
 	/** 保证金退款额*/
 	public static final String MARGINREFUND = "marginRefund";
+	/** 销售数量*/
+	public static final String DEALAMOUNT = "dealAmount";
+	
 }

backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/entity/AdvancePaymentBalanceSum.java

@@ -36,7 +36,10 @@ public class AdvancePaymentBalanceSum {
 	 * 预付款余额
 	 */
 	private String advanceBalance ;
-	
+	/**
+	 * 销售数量
+	 */
+	private String dealAmount ;
 	/**
 	 * 一月销售额
 	 */
@@ -199,5 +202,12 @@ public class AdvancePaymentBalanceSum {
 	public void setDecAmount(String decAmount) {
 		this.decAmount = decAmount;
 	}
+	public String getDealAmount() {
+		return dealAmount;
+	}
+	public void setDealAmount(String dealAmount) {
+		this.dealAmount = dealAmount;
+	}
+
 	
 }

backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/internal/dao/AdvancePaymentBalanceSumDaoImpl.java

@@ -59,6 +59,7 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum
 		hql.append("xx.i1 as i , ");// 预付款余额
 		hql.append("sum( xx.j1 ) as j , ");// 保证金总额
 		hql.append("sum(xx.q1) as q  ");// 保证金退款额
+		hql.append("xx.dealMount as dealMount");//销售数量
 		hql.append("from (").append(
 				" SELECT REGIONALCOMPANY.id AS a1 , PURCHASESANDUNIT.id AS b1, CONTRACT.id AS c1, PROJECT.id AS d1, ");
 		if (!flag) {
@@ -67,6 +68,7 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum
 			hql.append(" 0.00 AS e1, ");
 		}
 		hql.append(" sum( SALESRECODE.amount ) AS f1, ");
+		hql.append(" sum( deal_amount ) AS dealMount ");
 		hql.append(
 				" CASE	WHEN ARTIFICIAL.fund_type = 'DEPOSIT' THEN 0.00 ELSE sum( ARTIFICIAL.recharge_amount )  END AS g1, ");
 		hql.append(
@@ -130,6 +132,7 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum
 					map.put("advance_balance", resule.get(7, BigDecimal.class));
 					map.put("total_margin", resule.get(8, BigDecimal.class));
 					map.put("margin_refund", resule.get(9, BigDecimal.class));
+					map.put("deal_Amount", resule.get(10, BigDecimal.class));
 					// map.put("total_margin", BigDecimal.valueOf(resule.get(8,Double.class)));
 					// map.put("margin_refund", BigDecimal.valueOf(resule.get(9,Double.class)));
 					list.add(map);

backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/internal/service/AdvancePaymentBalanceSumServiceImpl.java

@@ -80,6 +80,7 @@ public class AdvancePaymentBalanceSumServiceImpl implements AdvancePaymentBalanc
 			AdvancePaymentBalanceSum.set(AdvancePaymentBalanceSumConstants.DEALDAY, nowDate.substring(8, 10));
 			AdvancePaymentBalanceSum.set(AdvancePaymentBalanceSumConstants.TOTALMARGIN, (BigDecimal)mp.get("total_margin"));
 			AdvancePaymentBalanceSum.set(AdvancePaymentBalanceSumConstants.MARGINREFUND, (BigDecimal)mp.get("margin_refund"));
+			AdvancePaymentBalanceSum.set(AdvancePaymentBalanceSumConstants.DEALAMOUNT,(BigDecimal)mp.get("deal_Amount"));
 			advancePaymentBalanceSumDao.save(AdvancePaymentBalanceSum);
 			state = true;
 		}}catch (Exception e) {

backend/xyst.dinas.statistics/src/main/model/com/xyst/dinas/statistics/datamodel/AdvancePaymentAndBalanceSummary.mk

@@ -74,6 +74,11 @@
 			<annotation id="0282d7c3-b8a4-484e-9a5f-19c264739f02" attributeId="ed6f6520-045c-4ef9-b73c-02df304faeb8" name="precision" value="12"/>
 			<annotation id="b3e1654e-43b7-442f-a39e-38a692542f64" attributeId="c131a126-c624-432f-b88f-b36bdd94e2fb" name="scale" value="4"/>
 		</attribute>
+		<attribute id="e714bec9-b74e-420b-afd2-9eae0271f859" name="dealAmount" columnName="deal_amount" title="销售数量" type="fixnum" default="" precision="" isArray="false">
+			<annotation id="597e55d9-1bd0-4f82-b90e-6521e8cd52b1" attributeId="c54aa92f-741b-4129-bdb9-0a301842647e" name="length" value="100"/>
+			<annotation id="97010686-d198-4357-8f02-db12bbea1cbd" attributeId="64687122-be70-4eac-b264-4a3d89e5b9d2" name="precision" value="12"/>
+			<annotation id="6bb2ffd8-063c-49d9-a3e9-8ac23ad75faf" attributeId="59efb6ee-3460-4923-b341-7951aa29c882" name="scale" value="4"/>
+		</attribute>
 		<hibernate>/xyst.dinas.statistics/src/main/resources/config/AdvancePaymentAndBalanceSummary.hbm.xml</hibernate>
 	</dataModel>
 </content>