Merge pull request '插入weekModel同时插入weekModelLst详情' (#115) from feature_base into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/115
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>

dao/base/WeekModel.dao.go

@@ -38,7 +38,7 @@ type WeekModelDAO interface {
 	 * @Date                     : 2021-04-14 08:56:34
 	 *
 	 ******************************************************************************/
-	InsertOne(*model.WeekModel) error
+	InsertOne(*model.WeekModel) (int, error)
 	/******************************************************************************
 	 *
 	 * @Function Name            : DeleteOne

dao/base/implments/WeekModel.dao.impl.go

@@ -55,14 +55,14 @@ func NewWeekModelDAOImplement(session *xorm.Session, plantNr int, userid string)
  * @Reference LAPP_GAAS_GFrame_BACKEND/dao/base/WeekModelDAO.InsertOne
  *
  ******************************************************************************/
-func (impl *WeekModelDAOImplement) InsertOne(entity *model.WeekModel) error {
+func (impl *WeekModelDAOImplement) InsertOne(entity *model.WeekModel) (int, error) {
 	entity.PlantNr = impl.plantNr
 	entity.LastUser = impl.userid
 	_, err := impl.session.Table(meta.WeekModel.TableName).Insert(entity)
 	if err != nil {
-		return grmi.NewDataBaseError(err)
+		return 0, grmi.NewDataBaseError(err)
 	}
-	return nil
+	return entity.WeekModelNr, nil
 }
 
 /******************************************************************************

models/base/WeekModel.model.go

@@ -31,6 +31,7 @@ type WeekModel struct {
 	LastUser     string               `xorm:"nvarchar(20) 'LastUser' not null" json:"WeekModel-LastUser"`
 	CreateTime   grmi.DateTime        `xorm:"datetime 'CreateTime' not null created" json:"WeekModel-CreateTime"`
 	WeekModelLst []WeekModelLstAndDay `xorm:"-" json:"WeekModel-WeekModelLst"`
+	WeekModelLstLi []WeekModelLst       `xorm:"-" json:"WeekModel-WeekModelLstLi"`
 }
 
 /******************************************************************************

services/base/implments/WeekModel.service.impl.go

@@ -95,18 +95,31 @@ func (impl *WeekModelServiceImplement) InsertOne(user *models.Usertab, entity *m
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
+	err := session.Begin()
+	if err != nil {
+		return err
+	}
 	dao := dal.NewWeekModelDAO(session, user.Pid, user.Userid)
-	//record, err := dao.SelectOne(entity.WeekModelNr)
-	//if err != nil {
-	//	return err
-	//}
-	//if record != nil {
-	//	return grmi.NewBusinessError("已经存在相同主键的记录!")
-	//}
-	err := dao.InsertOne(entity)
+
+	weekModelNr, err := dao.InsertOne(entity)
 	if err != nil {
+		session.Rollback()
 		return err
 	}
+	weekModelLstLi := entity.WeekModelLstLi
+	for index, weekModelLst := range weekModelLstLi {
+		newWeekModelLst := weekModelLst
+		newWeekModelLst.WeekModelNr = weekModelNr
+		weekModelLstLi[index] = newWeekModelLst
+	}
+	weekModelLstDao := dal.NewWeekModelLstDAO(session, user.Pid, user.Userid)
+	err = weekModelLstDao.Insert(&weekModelLstLi)
+	if err != nil {
+		session.Rollback()
+		return err
+	}
+
+	session.Commit()
 	return nil
 }
 
@@ -164,7 +177,7 @@ func (impl *WeekModelServiceImplement) SelectOne(user *models.Usertab, weekModel
 	dao := dal.NewWeekModelDAO(session, user.Pid, user.Userid)
 
 	result, err := dao.SelectOne(weekModelNr)
-	if err != nil {
+	if err != nil  {
 		return nil, err
 	}
 	//condition := DefaultConditionOfWeekModelLst