|
|
@@ -42,7 +42,7 @@ type ErmcpSpotContractModel struct {
|
|
|
ENDDATE string `json:"enddate" xorm:"'ENDDATE'"` //点价结束日期 [2:点价 3:暂定价]
|
|
|
MARGIN float64 `json:"margin" xorm:"'MARGIN'"` //当前保证金
|
|
|
EnumdicName string `json:"enumdicname" xorm:"'ENUMDICNAME'"` //单位名称
|
|
|
- CONTRACCTSTATUS int32 `json:"contracctstatus" xorm:"'CONTRACCTSTATUS'"` //合同状态 - 0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
|
|
|
+ CONTRACCTSTATUS int32 `json:"contracctstatus" xorm:"'CONTRACTSTATUS'"` //合同状态 - 0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
|
|
|
}
|
|
|
|
|
|
func (r *ErmcpSpotContractModel) buildSql(nQueryType int32) string {
|
|
|
@@ -67,7 +67,7 @@ func (r *ErmcpSpotContractModel) buildSql(nQueryType int32) string {
|
|
|
" t.STARTDATE," +
|
|
|
" t.ENDDATE," +
|
|
|
" t.MARGIN," +
|
|
|
- " t.CONTRACCTSTATUS," +
|
|
|
+ " t.contractstatus," +
|
|
|
" u1.accountname BuyUserName," +
|
|
|
" u2.accountname SellUserName," +
|
|
|
" g.deliverygoodscode," +
|
|
|
@@ -84,7 +84,7 @@ func (r *ErmcpSpotContractModel) buildSql(nQueryType int32) string {
|
|
|
" left join goods g2" +
|
|
|
" on t.goodsid = g2.goodsid" +
|
|
|
" left join enumdicitem e on g.goodsunitid = e.enumitemname and e.enumdiccode = 'goodsunit'" +
|
|
|
- " where t.contracctstatus in (%v) and t.userid=%v"
|
|
|
+ " where t.contractstatus in (%v) and t.userid=%v"
|
|
|
|
|
|
// 查询类型 1-未提交 2-待审核 3-履约中 4-已完成
|
|
|
// 合同状态 - 0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
|
zou.yingbin