Merge pull request '删除数据' (#317) from fix_portaldel into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/317
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>

services/log/implments/ArtDemandLstCache.service.impl.go

@@ -7,6 +7,7 @@ import (
 	"LAPP_GAAS_GFrame_BACKEND/db"
 	"LAPP_GAAS_GFrame_BACKEND/grmi"
 	meta "LAPP_GAAS_GFrame_BACKEND/meta/log"
+	bmodel "LAPP_GAAS_GFrame_BACKEND/models/base"
 	model "LAPP_GAAS_GFrame_BACKEND/models/log"
 	"LAPP_GAAS_GFrame_BACKEND/utils"
 	"LAPP_GAAS_GFrame_BACKEND/web/models"
@@ -661,12 +662,17 @@ func (impl *ArtDemandLstCacheServiceImplement) SyncHronousDataCache(plantNr int,
 	}
 	dao := dal.NewArtDemandHeadCacheDAO(session, plantNr, "syncPost")
 	logdao := dal.NewArtDemandLstCacheDAO(session, plantNr, "syncPost")
+	err = dao.DeleteWhere([]grmi.Predicate{meta.ArtDemandHeadCache_PlantNr.NewPredicate(grmi.Equal, bmodel.PlantNr)})
+	if err != nil {
+		session.Rollback()
+		return err
+	}
+	err = logdao.DeleteWhere([]grmi.Predicate{meta.ArtDemandLstCache_PlantNr.NewPredicate(grmi.Equal, bmodel.PlantNr)})
+	if err != nil {
+		session.Rollback()
+		return err
+	}
 	for _, v := range heads {
-		err := dao.DeleteOne(v.ArtId, v.DemandId)
-		if err != nil {
-			session.Rollback()
-			return err
-		}
 		err = dao.InsertOne(&v)
 		if err != nil {
 			session.Rollback()
@@ -674,11 +680,6 @@ func (impl *ArtDemandLstCacheServiceImplement) SyncHronousDataCache(plantNr int,
 		}
 	}
 	for _, vv := range lst {
-		err := logdao.DeleteOne(vv.DemandId, vv.Pos)
-		if err != nil {
-			session.Rollback()
-			return err
-		}
 		err = logdao.InsertOne(&vv)
 		if err != nil {
 			session.Rollback()