|
|
@@ -1338,9 +1338,9 @@ func (r *Ermcp8EnableHedgeditem) buildSql() string {
|
|
|
case 1, 2:
|
|
|
sqlId.And("t.HEDGEDTYPE", r.SPOTTYPE)
|
|
|
case 3:
|
|
|
- sqlId.JoinFormat(" AND t.HEDGEDTYPE in (%v,3)", r.SPOTTYPE)
|
|
|
+ sqlId.JoinFormat(" AND t.HEDGEDTYPE in (%v)", "1,3")
|
|
|
case 4:
|
|
|
- sqlId.JoinFormat(" AND t.HEDGEDTYPE in (%v,3)", r.SPOTTYPE)
|
|
|
+ sqlId.JoinFormat(" AND t.HEDGEDTYPE in (%v)", "2,3")
|
|
|
}
|
|
|
|
|
|
return sqlId.String()
|
|
|
@@ -1433,6 +1433,7 @@ type Ermcp8RunningHedgeditem struct {
|
|
|
func (r *Ermcp8RunningHedgeditem) ParseFromProto(p *pb.Ermcp2HedgedItemInfo) {
|
|
|
r.Hedgeditemid = strconv.Itoa(int(*p.Hedgeditemext.Item.HedgedItemID))
|
|
|
r.Hedgeditemnum = p.Hedgeditemext.Item.GetHedgedItemNum()
|
|
|
+ r.Hedgeditemname = p.Hedgeditemext.Item.GetHedgedItemName()
|
|
|
r.Hedgedtype = int32(p.Hedgeditemext.Item.GetHedgedType())
|
|
|
r.Planstartdate = p.Hedgeditemext.Item.GetPlanStartDate().GetDateStr()
|
|
|
r.Planenddate = p.Hedgeditemext.Item.GetPlanEndDate().GetDateStr()
|
