zhou.xiaoning 3 лет назад
Родитель
Сommit
eae56aa817
2 измененных файлов с 2 добавлено и 1 удалено
  1. 1 1
      controllers/ermcp3/qryErmcp3Report.go
  2. 1 0
      models/ermcp3Report.go

+ 1 - 1
controllers/ermcp3/qryErmcp3Report.go

@@ -578,7 +578,7 @@ func QryAreaSumPL(c *gin.Context) {
 	})
 	req.CovertRequest()
 	m := models.Ermcp3ArealSumPL{AREAUSERID: req.USERID, QueryType: req.QUERYTYPE, RECKONDATE: req.TRADEDATE,
-		CYCLETYPE: req.CYCLETYPE, CYCLETIME: req.CYCLETIME, BeginDate: req.BEGINDATE, EndDate: req.ENDDATE, CURRENCYID: req2.CURRENCYID}
+		CYCLETYPE: req.CYCLETYPE, CYCLETIME: req.CYCLETIME, BeginDate: req.BEGINDATE, EndDate: req.ENDDATE, CURRENCYID: req2.CURRENCYID, MIDDLEGOODSID: req.MIDDLEGOODSID}
 	a.DoGetDataI(&m)
 }
 

+ 1 - 0
models/ermcp3Report.go

@@ -1989,6 +1989,7 @@ SELECT t.RECKONDATE,
 		sqlId.Join(fmt.Sprintf(" and t.RECKONDATE >= '%v' and t.RECKONDATE <= '%v' ", r.BeginDate, r.EndDate))
 	}
 	sqlId.And("t.CURRENCYID", r.CURRENCYID)
+	sqlId.AndEx("t.middlegoodsid", r.MIDDLEGOODSID, r.MIDDLEGOODSID > 0)
 
 	return sqlId.String()
 }