From 18fcced585839271528118278b35870e0c647314 Mon Sep 17 00:00:00 2001 From: louwenzhi Date: Mon, 21 Jun 2021 11:00:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/models/chargetab.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/web/models/chargetab.go b/web/models/chargetab.go index 643c5e7..62411c2 100644 --- a/web/models/chargetab.go +++ b/web/models/chargetab.go @@ -1106,7 +1106,7 @@ func (t *Chargetab) Update() error { glog.InfoExt("更新合同", "结束日期", t2) lengthdate := utils.TimeSub(t2, t1) glog.InfoExt("更新合同", "缴费时长", lengthdate) - m.Lengthdate = utils.ValueToString(lengthdate,"") + "天" + m.Lengthdate = utils.ValueToString(lengthdate, "") + "天" _, err = session.Table("contracttab").ID(core.PK{t.Cid, pro.Contractid}).Update(m) if err != nil { session.Rollback() @@ -1139,7 +1139,7 @@ func (t *Chargetab) Update() error { t2, err := utils.TimeParseyyyyMMdd(strings.Trim(t.Chargeenddate, "")) lengthdate := utils.TimeSub(t2, t1) glog.InfoExt("更新合同", "缴费时长", lengthdate) - m.Lengthdate = utils.ValueToString(lengthdate,"") + "天" + m.Lengthdate = utils.ValueToString(lengthdate, "") + "天" _, err = session.Table("contracttab").ID(core.PK{t.Cid, pro.Contractid}).Update(m) if err != nil { session.Rollback() @@ -1172,7 +1172,7 @@ func (t *Chargetab) Update() error { t2, err := utils.TimeParseyyyyMMdd(strings.Trim(t.Chargeenddate, "")) lengthdate := utils.TimeSub(t2, t1) glog.InfoExt("更新合同", "缴费时长", lengthdate) - m.Lengthdate = utils.ValueToString(lengthdate,"") + "天" + m.Lengthdate = utils.ValueToString(lengthdate, "") + "天" _, err = session.Table("contracttab").ID(core.PK{t.Cid, pro.Contractid}).Update(m) if err != nil { session.Rollback() @@ -1220,7 +1220,7 @@ func (t *Chargetab) Del() error { //1.删除（判断数据是否是最后一条） one := new(Chargetab) - ok, err := session.Table("").Table("chargetab").Where("cid =? and propertyid =? and chargeenddate > ?", t.Cid, info.Propertyid, info.Chargeenddate).Get(one) + ok, err := session.Table("chargetab").Where("cid =? and propertyid =? and chargeenddate > ? and chargetype = ?", t.Cid, info.Propertyid, info.Chargeenddate, 1).Get(one) if err != nil { session.Rollback() return err @@ -1247,7 +1247,7 @@ func (t *Chargetab) Del() error { //2.记录回溯 //查询上条记录信息 cinfo := new(Chargetab) - result, err := session.Table("chargetab").Where("cid =? and propertyid =? and chargeenddate < ?", t.Cid, info.Propertyid, info.Chargeenddate).Desc("chargeenddate").Get(cinfo) + result, err := session.Table("chargetab").Where("cid =? and propertyid =? and chargeenddate < ? and chargetype = ?", t.Cid, info.Propertyid, info.Chargeenddate, 1).Desc("chargeenddate").Get(cinfo) if err != nil { session.Rollback() return err @@ -1273,7 +1273,7 @@ func (t *Chargetab) Del() error { t2 = t2.AddDate(0, 0, 1) lengthdate := utils.TimeSub(t2, t1) glog.InfoExt("更新合同", "缴费时长", lengthdate) - m.Lengthdate = utils.ValueToString(lengthdate,"") + "天" + m.Lengthdate = utils.ValueToString(lengthdate, "") + "天" _, err = session.Table("contracttab").ID(core.PK{t.Cid, pro.Contractid}).Update(m) if err != nil { session.Rollback() @@ -1329,7 +1329,7 @@ func (t *Chargetab) Del() error { case 2: //1.删除（判断数据是否是最后一条） one := new(Chargetab) - ok, err := session.Table("").Table("chargetab").Where("chargetype = 2 and cid =? and accesscardid =? and chargeenddate > ?", t.Cid, info.Accesscardid, info.Chargeenddate).Get(one) + ok, err := session.Table("chargetab").Where("chargetype = 2 and cid =? and accesscardid =? and chargeenddate > ?", t.Cid, info.Accesscardid, info.Chargeenddate).Get(one) if err != nil { session.Rollback() return err @@ -1381,7 +1381,7 @@ func (t *Chargetab) Del() error { t2, err := utils.TimeParseyyyyMMdd(strings.Trim(cinfo.Chargeenddate, "")) lengthdate := utils.TimeSub(t2, t1) glog.InfoExt("更新合同", "缴费时长", lengthdate) - m.Lengthdate = utils.ValueToString(lengthdate,"") + "天" + m.Lengthdate = utils.ValueToString(lengthdate, "") + "天" _, err = session.Table("contracttab").ID(core.PK{t.Cid, pro.Contractid}).Update(m) if err != nil { session.Rollback() @@ -1438,7 +1438,7 @@ func (t *Chargetab) Del() error { //1.删除（判断数据是否是最后一条） one := new(Chargetab) - ok, err := session.Table("").Table("chargetab").Where("cid =? and carportid =? and chargeenddate > ?", t.Cid, info.Carportid, info.Chargeenddate).Get(one) + ok, err := session.Table("chargetab").Where("cid =? and carportid =? and chargeenddate > ? and chargetype = ?", t.Cid, info.Carportid, info.Chargeenddate,3).Get(one) if err != nil { session.Rollback() return err @@ -1465,7 +1465,7 @@ func (t *Chargetab) Del() error { //2.记录回溯 //查询上条记录信息 cinfo := new(Chargetab) - result, err := session.Table("chargetab").Where("cid =? and carportid =? and chargeenddate < ?", t.Cid, info.Carportid, info.Chargeenddate).Desc("chargeenddate").Get(cinfo) + result, err := session.Table("chargetab").Where("cid =? and carportid =? and chargeenddate < ? and chargetype = ?", t.Cid, info.Carportid, info.Chargeenddate,3).Desc("chargeenddate").Get(cinfo) if err != nil { session.Rollback() return err @@ -1490,7 +1490,7 @@ func (t *Chargetab) Del() error { t2, err := utils.TimeParseyyyyMMdd(strings.Trim(cinfo.Chargeenddate, "")) lengthdate := utils.TimeSub(t2, t1) glog.InfoExt("更新合同", "缴费时长", lengthdate) - m.Lengthdate = utils.ValueToString(lengthdate,"") + "天" + m.Lengthdate = utils.ValueToString(lengthdate, "") + "天" _, err = session.Table("contracttab").ID(core.PK{t.Cid, pro.Contractid}).Update(m) if err != nil { session.Rollback() @@ -1556,7 +1556,7 @@ func (t *Chargetab) Del() error { t2, err := utils.TimeParseyyyyMMdd(strings.Trim(cinfo.Chargeenddate, "")) lengthdate := utils.TimeSub(t2, t1) glog.InfoExt("更新合同", "缴费时长", lengthdate) - m.Lengthdate = utils.ValueToString(lengthdate,"") + "天" + m.Lengthdate = utils.ValueToString(lengthdate, "") + "天" _, err = session.Table("contracttab").ID(core.PK{t.Cid, pro.Contractid}).Update(m) if err != nil { session.Rollback() -- 2.30.1.windows.1