#1575 修复敞口报表问题

models/ermcp3Report.go

@@ -705,47 +705,49 @@ func (r *Ermcp3ExposureContractDetail) calc() {
 }
 
 func (r *Ermcp3ExposureContractDetail) buildSql() string {
-	var sqlId utils.SQLVal = "select t.middlegoodsid," +
-		"       t.deliverygoodsid," +
-		"       t.convertratio," +
-		"       s.userid," +
-		"       to_char(s.spotcontractid) spotcontractid," +
-		"       s.contractno," +
-		"       s.contracttype," +
-		"       s.biztype," +
-		"       s.buyuserid," +
-		"       s.selluserid," +
-		"       s.qty," +
-		"       s.pricedqty," +
-		"       s.wrstandardid," +
-		"       s.reckondate tradedate," +
-		"       s.todaypricedqty," +
-		"       w.wrstandardname," +
-		"       w.wrstandardcode," +
-		"       w.unitid," +
-		"       w.convertfactor," +
-		"       mg.middlegoodsname," +
-		"       mg.middlegoodscode," +
-		"       mg.goodsunitid," +
-		"       mg.needhedgeratio," +
-		"       mg.needarbitrageratio," +
-		"       dg.dgfactoryitemid brandid," +
-		"       dg.dgfactoryitemvalue brandName," +
-		"       g.deliverygoodscode," +
-		"       g.deliverygoodsname" +
-		"  from erms2_wrsconvertdetail t" +
-		" inner join reckon_ermcp_spotcontract s" +
-		"    on t.deliverygoodsid = s.deliverygoodsid" +
-		"  left join erms_middlegoods mg" +
-		"    on t.middlegoodsid = mg.middlegoodsid" +
-		"  left join wrstandard w" +
-		"    on s.wrstandardid = w.wrstandardid" +
-		"  left join dgfactoryitem dg" +
-		"    on s.spotgoodsbrandid = dg.dgfactoryitemid" +
-		"  left join deliverygoods g" +
-		"    on s.deliverygoodsid = g.deliverygoodsid" +
-		" where t.wrstandardid = 0" +
-		"   and s.contractstatus in (2, 3)"
+	var sqlId utils.SQLVal = `
+select t.middlegoodsid,
+       t.deliverygoodsid,
+       t.convertratio,
+       s.userid,
+       to_char(s.spotcontractid) spotcontractid,
+       s.contractno,
+       s.contracttype,
+       s.biztype,
+       s.buyuserid,
+       s.selluserid,
+       s.qty,
+       s.pricedqty,
+       s.wrstandardid,
+       s.reckondate tradedate,
+       s.todaypricedqty,
+       w.wrstandardname,
+       w.wrstandardcode,
+       w.unitid,
+       w.convertfactor,
+       mg.middlegoodsname,
+       mg.middlegoodscode,
+       mg.goodsunitid,
+       mg.needhedgeratio,
+       mg.needarbitrageratio,
+       dg.dgfactoryitemid brandid,
+       dg.dgfactoryitemvalue brandName,
+       g.deliverygoodscode,
+       g.deliverygoodsname
+  from erms2_wrsconvertdetail t
+ inner join reckon_ermcp_spotcontract s
+    on t.wrstandardid = s.wrstandardid
+  left join erms_middlegoods mg
+    on t.middlegoodsid = mg.middlegoodsid
+  left join wrstandard w
+    on s.wrstandardid = w.wrstandardid
+  left join dgfactoryitem dg
+    on s.spotgoodsbrandid = dg.dgfactoryitemid
+  left join deliverygoods g
+    on s.deliverygoodsid = g.deliverygoodsid
+ where 1 = 1
+   and s.contractstatus in (2, 3)
+`
 	sqlId.AndEx("s.reckondate", r.TRADEDATE, len(r.TRADEDATE) > 0)
 	if len(r.BeginDate) > 0 && len(r.EndDate) > 0 {
 		sqlId.Join(fmt.Sprintf(" and s.reckondate >= '%v' and s.reckondate <= '%v'", r.BeginDate, r.EndDate))
@@ -814,39 +816,42 @@ func (r *Ermcp3ExposureHedgeplanDetail) calc() {
 }
 
 func (r *Ermcp3ExposureHedgeplanDetail) buildSql() string {
-	var sqlId utils.SQLVal = "select t.middlegoodsid," +
-		"       t.deliverygoodsid," +
-		"       t.convertratio," +
-		"       s.areauserid userid," +
-		"       to_char(s.hedgeplanid) hedgeplanid," +
-		"       s.hedgeplanno," +
-		"       s.contracttype," +
-		"       s.biztype," +
-		"       s.planqty qty," +
-		"       s.wrstandardid," +
-		"       s.audittradedate tradedate," +
-		"       s.hedgeplanstatus," +
-		"       w.wrstandardname," +
-		"       w.wrstandardcode," +
-		"       w.unitid," +
-		"       g.deliverygoodscode," +
-		"       g.deliverygoodsname," +
-		"       g.goodsunitid," +
-		"       mg.middlegoodsname," +
-		"       mg.middlegoodscode," +
-		"       mg.goodsunitid," +
-		"       mg.needhedgeratio," +
-		"       mg.needarbitrageratio" +
-		"  from erms2_wrsconvertdetail t" +
-		" inner join ermcp_hedgeplan s" +
-		"    on t.deliverygoodsid = s.deliverygoodsid" +
-		"  left join erms_middlegoods mg" +
-		"    on t.middlegoodsid = mg.middlegoodsid" +
-		"  left join wrstandard w" +
-		"    on s.wrstandardid = w.wrstandardid" +
-		"  left join deliverygoods g on s.deliverygoodsid=g.deliverygoodsid" +
-		" where t.wrstandardid = 0" +
-		"   and s.hedgeplanstatus in (2, 3)"
+	var sqlId utils.SQLVal = `
+select t.middlegoodsid,
+       t.deliverygoodsid,
+       t.convertratio,
+       s.areauserid userid,
+       to_char(s.hedgeplanid) hedgeplanid,
+       s.hedgeplanno,
+       s.contracttype,
+       s.biztype,
+       s.planqty qty,
+       s.wrstandardid,
+       s.audittradedate tradedate,
+       s.hedgeplanstatus,
+       w.wrstandardname,
+       w.wrstandardcode,
+       w.unitid,
+       g.deliverygoodscode,
+       g.deliverygoodsname,
+       g.goodsunitid,
+       mg.middlegoodsname,
+       mg.middlegoodscode,
+       mg.goodsunitid,
+       mg.needhedgeratio,
+       mg.needarbitrageratio
+  from erms2_wrsconvertdetail t
+ inner join ermcp_hedgeplan s
+    on t.wrstandardid = s.wrstandardid
+  left join erms_middlegoods mg
+    on t.middlegoodsid = mg.middlegoodsid
+  left join wrstandard w
+    on s.wrstandardid = w.wrstandardid
+  left join deliverygoods g
+    on s.deliverygoodsid = g.deliverygoodsid
+ where 1 = 1
+   and s.hedgeplanstatus in (2, 3)
+`
 	sqlId.AndEx("s.audittradedate", r.TRADEDATE, len(r.TRADEDATE) > 0)
 	if len(r.BeginDate) > 0 && len(r.EndDate) > 0 {
 		sqlId.Join(fmt.Sprintf(" and s.audittradedate >= '%v' and s.audittradedate <= '%v'", r.BeginDate, r.EndDate))