Merge pull request '插入workCalendar的同时插入workCalendarLst详情' (#116) from feature_base into develop

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

dao/base/WorkCalendar.dao.go

@@ -38,7 +38,7 @@ type WorkCalendarDAO interface {
 	 * @Date                     : 2021-03-24 09:53:49
 	 *
 	 ******************************************************************************/
-	InsertOne(*model.WorkCalendar) error
+	InsertOne(*model.WorkCalendar) (int, error)
 	/******************************************************************************
 	 *
 	 * @Function Name            : DeleteOne

dao/base/implments/WorkCalendar.dao.impl.go

@@ -55,14 +55,15 @@ func NewWorkCalendarDAOImplement(session *xorm.Session, plantNr int, userid stri
  * @Reference LAPP_GAAS_GFrame_BACKEND/dao/base/WorkCalendarDAO.InsertOne
  *
  ******************************************************************************/
-func (impl *WorkCalendarDAOImplement) InsertOne(entity *model.WorkCalendar) error {
+func (impl *WorkCalendarDAOImplement) InsertOne(entity *model.WorkCalendar) (int, error) {
 	entity.PlantNr = impl.plantNr
 	entity.LastUser = impl.userid
 	_, err := impl.session.Table(meta.WorkCalendar.TableName).Insert(entity)
 	if err != nil {
-		return grmi.NewDataBaseError(err)
+		return 0, grmi.NewDataBaseError(err)
 	}
-	return nil
+
+	return entity.WorkCalendarNr, nil
 }
 
 /******************************************************************************

models/base/WorkCalendar.model.go

@@ -20,13 +20,14 @@ import (
  *
  ******************************************************************************/
 type WorkCalendar struct {
-	PlantNr         int                     `xorm:"pk int 'PlantNr'" json:"WorkCalendar-PlantNr"`
-	WorkCalendarNr  int                     `xorm:"pk int 'WorkCalendarNr' autoincr" json:"WorkCalendar-WorkCalendarNr"`
-	Descr           string                  `xorm:"nvarchar(100) 'Descr' not null" json:"WorkCalendar-Descr"`
-	LastModify      grmi.DateTime           `xorm:"datetime 'LastModify' not null updated" json:"WorkCalendar-LastModify"`
-	LastUser        string                  `xorm:"nvarchar(20) 'LastUser' not null" json:"WorkCalendar-LastUser"`
-	CreateTime      grmi.DateTime           `xorm:"datetime 'CreateTime' not null created" json:"WorkCalendar-CreateTime"`
-	WorkCalendarLst []WorkCalendarLstAndDay `xorm:"-" json:"WorkCalendar-WorkCalendarLst"`
+	PlantNr           int                     `xorm:"pk int 'PlantNr'" json:"WorkCalendar-PlantNr"`
+	WorkCalendarNr    int                     `xorm:"pk int 'WorkCalendarNr' autoincr" json:"WorkCalendar-WorkCalendarNr"`
+	Descr             string                  `xorm:"nvarchar(100) 'Descr' not null" json:"WorkCalendar-Descr"`
+	LastModify        grmi.DateTime           `xorm:"datetime 'LastModify' not null updated" json:"WorkCalendar-LastModify"`
+	LastUser          string                  `xorm:"nvarchar(20) 'LastUser' not null" json:"WorkCalendar-LastUser"`
+	CreateTime        grmi.DateTime           `xorm:"datetime 'CreateTime' not null created" json:"WorkCalendar-CreateTime"`
+	WorkCalendarLst   []WorkCalendarLstAndDay `xorm:"-" json:"WorkCalendar-WorkCalendarLst"`
+	WorkCalendarLstLi []WorkCalendarLst       `xorm:"-" json:"WorkCalendar-WorkCalendarLstLi"`
 }
 
 /******************************************************************************

models/base/WorkCalendarLst.model.go

@@ -21,7 +21,7 @@ import (
  ******************************************************************************/
 type WorkCalendarLst struct {
 	PlantNr        int           `xorm:"pk int 'PlantNr'" json:"WorkCalendarLst-PlantNr"`
-	WorkCalendarNr int           `xorm:"pk int 'WorkCalendarNr'" json:"WorkCalendarLst-WorkCalendarNr"`
+	WorkCalendarNr int           `xorm:"pk int 'WorkCalendarNr' autoincr" json:"WorkCalendarLst-WorkCalendarNr"`
 	WorkDate       grmi.Date     `xorm:"pk date 'WorkDate'" json:"WorkCalendarLst-WorkDate"`
 	DayModelNr     int           `xorm:"int 'DayModelNr' not null" json:"WorkCalendarLst-DayModelNr"`
 	LastModify     grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"WorkCalendarLst-LastModify"`

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

@@ -90,18 +90,29 @@ func (impl *WorkCalendarServiceImplement) InsertOne(user *models.Usertab, entity
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
+	err := session.Begin()
+	if err != nil {
+		return err
+	}
 	dao := dal.NewWorkCalendarDAO(session, user.Pid, user.Userid)
-	record, err := dao.SelectOne(entity.WorkCalendarNr)
+	workCalendarNr, err := dao.InsertOne(entity)
 	if err != nil {
+		session.Rollback()
 		return err
 	}
-	if record != nil {
-		return grmi.NewBusinessError("已经存在相同主键的记录!")
+	workCalendarLstLi := entity.WorkCalendarLstLi
+	workCalendarLstDao := dal.NewWorkCalendarLstDAO(session, user.Pid, user.Userid)
+	for index, workCalendarLst := range workCalendarLstLi {
+		newWorkCalendarLst := workCalendarLst
+		newWorkCalendarLst.WorkCalendarNr = workCalendarNr
+		workCalendarLstLi[index] = newWorkCalendarLst
 	}
-	err = dao.InsertOne(entity)
+	err = workCalendarLstDao.Insert(&workCalendarLstLi)
 	if err != nil {
+		session.Rollback()
 		return err
 	}
+	session.Commit()
 	return nil
 }