From ac9e9c11c56bd869cc946bdb9d1a6c76971d9ee1 Mon Sep 17 00:00:00 2001 From: zhangxin Date: Thu, 2 Sep 2021 10:03:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=95=B0=E6=8D=AE=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E6=97=B6=E6=9B=B4=E6=96=B0=E5=85=B6=E4=BB=96=E8=A1=A8?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/implments/Operation.service.impl.go | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/services/base/implments/Operation.service.impl.go b/services/base/implments/Operation.service.impl.go index 174a036..1284927 100644 --- a/services/base/implments/Operation.service.impl.go +++ b/services/base/implments/Operation.service.impl.go @@ -9,6 +9,7 @@ import ( meta "LAPP_LF_MOM_BACKEND/meta/base" model "LAPP_LF_MOM_BACKEND/models/base" "LAPP_LF_MOM_BACKEND/web/models" + "fmt" ) /****************************************************************************** @@ -259,6 +260,7 @@ func (impl *OperationServiceImplement) UpdateOne(user *models.Usertab, entity *m twDao := dal.NewTightenWrenchInfoDAO(session, user.Pid, user.Userid) twrDao := dal.NewTightenWrenchRuleInfoDAO(session, user.Pid, user.Userid) scanDao := dal.NewScanRuleInfoDAO(session, user.Pid, user.Userid) + guideRuleDao := dal.NewGuideRuleInfoDAO(session, user.Pid, user.Userid) record, err := dao.SelectOne(entity.OperationId) if err != nil { _ = session.Rollback() @@ -308,32 +310,39 @@ func (impl *OperationServiceImplement) UpdateOne(user *models.Usertab, entity *m tw := model.TightenWrenchInfo{StepDesc: entity.StepDesc} twr := model.TightenWrenchRuleInfo{StepDesc: entity.StepDesc} scan := model.ScanRuleInfo{StepDesc: entity.StepDesc} - err = opcBasicDao.UpdateWhere([]grmi.Predicate{meta.OPCBasicComInfo_OperationId.NewPredicate(grmi.Equal, entity.OperationId)}, &basic, meta.OPCBasicComInfo_StepDesc.ColumnName) + gr := model.GuideRuleInfo{StepDesc: entity.StepDesc} + err = opcBasicDao.UpdateWhere([]grmi.Predicate{meta.OPCBasicComInfo_OperationId.NewPredicate(grmi.Equal, entity.OperationId)}, &basic, meta.OPCBasicComInfo_StepDesc.Name) if err != nil { _ = session.Rollback() return err } - err = opcComDao.UpdateWhere([]grmi.Predicate{meta.OPCComRule_OperationId.NewPredicate(grmi.Equal, entity.OperationId)}, &com, meta.OPCComRule_StepDesc.ColumnName) + err = opcComDao.UpdateWhere([]grmi.Predicate{meta.OPCComRule_OperationId.NewPredicate(grmi.Equal, entity.OperationId)}, &com, meta.OPCComRule_StepDesc.Name) if err != nil { _ = session.Rollback() return err } - err = opcDetailDao.UpdateWhere([]grmi.Predicate{meta.OPCComDetailRule_OperationId.NewPredicate(grmi.Equal, entity.OperationId)}, &detail, meta.OPCComRule_StepDesc.ColumnName) + err = opcDetailDao.UpdateWhere([]grmi.Predicate{meta.OPCComDetailRule_OperationId.NewPredicate(grmi.Equal, entity.OperationId)}, &detail, meta.OPCComRule_StepDesc.Name) if err != nil { _ = session.Rollback() return err } - err = twDao.UpdateWhere([]grmi.Predicate{meta.TightenWrenchInfo_OperationId.NewPredicate(grmi.Equal, entity.OperationId)}, &tw, meta.TightenWrenchInfo_StepDesc.ColumnName) + err = twDao.UpdateWhere([]grmi.Predicate{meta.TightenWrenchInfo_OperationId.NewPredicate(grmi.Equal, entity.OperationId)}, &tw, meta.TightenWrenchInfo_StepDesc.Name) if err != nil { _ = session.Rollback() return err } - err = twrDao.UpdateWhere([]grmi.Predicate{meta.TightenWrenchRuleInfo_OperationId.NewPredicate(grmi.Equal, entity.OperationId)}, &twr, meta.TightenWrenchRuleInfo_StepDesc.ColumnName) + err = twrDao.UpdateWhere([]grmi.Predicate{meta.TightenWrenchRuleInfo_OperationId.NewPredicate(grmi.Equal, entity.OperationId)}, &twr, meta.TightenWrenchRuleInfo_StepDesc.Name) if err != nil { _ = session.Rollback() return err } - err = scanDao.UpdateWhere([]grmi.Predicate{meta.ScanRuleInfo_OperationId.NewPredicate(grmi.Equal, entity.OperationId)}, &scan, meta.ScanRuleInfo_StepDesc.ColumnName) + err = scanDao.UpdateWhere([]grmi.Predicate{meta.ScanRuleInfo_OperationId.NewPredicate(grmi.Equal, entity.OperationId)}, &scan, meta.ScanRuleInfo_StepDesc.Name) + if err != nil { + _ = session.Rollback() + return err + } + fmt.Println("gr:", gr) + err = guideRuleDao.UpdateWhere([]grmi.Predicate{meta.GuideRuleInfo_OperationId.NewPredicate(grmi.Equal, entity.OperationId)}, &gr, meta.GuideRuleInfo_StepDesc.Name) if err != nil { _ = session.Rollback() return err @@ -428,13 +437,13 @@ func (impl *OperationServiceImplement) Select(user *models.Usertab, urlParameter } dao := dal.NewOperationDAO(session, user.Pid, user.Userid) if condition.Fill(urlParameters) { - result, err := dao.SelectAndPaging(condition.Paging, predicates, condition.OrderByFields) + result, err := dao.SelectAndPaging(condition.Paging, predicates, []grmi.Field{meta.Operation_WorkLineId, meta.Operation_ProjectId, meta.Operation_PO, meta.Operation_StepNo}) if err != nil { return nil, err } return result, nil } else { - result, err := dao.Select(predicates, condition.OrderByFields) + result, err := dao.Select(predicates, []grmi.Field{meta.Operation_WorkLineId, meta.Operation_ProjectId, meta.Operation_PO, meta.Operation_StepNo}) if err != nil { return nil, err }