Merge pull request '对weekModel、dayModel、workshift三个model中的自增字段做自增处理，同时对自增主键没有业务主键的插入不做主键排重处理' (#109) from fix_base into develop

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

models/base/DayModel.model.go

@@ -21,7 +21,7 @@ import (
  ******************************************************************************/
 type DayModel struct {
 	PlantNr         int           `xorm:"pk int 'PlantNr'" json:"DayModel-PlantNr"`
-	DayModelNr      int           `xorm:"pk int 'DayModelNr'" json:"DayModel-DayModelNr"`
+	DayModelNr      int           `xorm:"pk int 'DayModelNr' autoincr" json:"DayModel-DayModelNr"`
 	Descr           string        `xorm:"nvarchar(100) 'Descr'" json:"DayModel-Descr"`
 	Abrev           string        `xorm:"nvarchar(10) 'Abrev' not null" json:"DayModel-Abrev"`
 	HexColor        string        `xorm:"nvarchar(10) 'HexColor'" json:"DayModel-HexColor"`

models/base/WeekModel.model.go

@@ -21,7 +21,7 @@ import (
  ******************************************************************************/
 type WeekModel struct {
 	PlantNr      int            `xorm:"pk int 'PlantNr'" json:"WeekModel-PlantNr"`
-	WeekModelNr  int            `xorm:"pk int 'WeekModelNr'" json:"WeekModel-WeekModelNr"`
+	WeekModelNr  int            `xorm:"pk int 'WeekModelNr' autoincr" json:"WeekModel-WeekModelNr"`
 	DateFrom     int            `xorm:"int 'DateFrom' not null" json:"WeekModel-DateFrom"`
 	Descr        string         `xorm:"nvarchar(100) 'Descr' not null" json:"WeekModel-Descr"`
 	Abrev        string         `xorm:"nvarchar(10) 'Abrev' not null" json:"WeekModel-Abrev"`

models/base/WorkShift.model.go

@@ -21,7 +21,7 @@ import (
  ******************************************************************************/
 type WorkShift struct {
 	PlantNr        int           `xorm:"pk int 'PlantNr'" json:"WorkShift-PlantNr"`
-	WorkShiftNr    int           `xorm:"pk int 'WorkShiftNr'" json:"WorkShift-WorkShiftNr"`
+	WorkShiftNr    int           `xorm:"pk int 'WorkShiftNr' autoincr" json:"WorkShift-WorkShiftNr"`
 	Descr          string        `xorm:"nvarchar(100) 'Descr'" json:"WorkShift-Descr"`
 	Abrev          string        `xorm:"nvarchar(10) 'Abrev' not null" json:"WorkShift-Abrev"`
 	HexColor       string        `xorm:"nvarchar(10) 'HexColor'" json:"WorkShift-HexColor"`

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

@@ -140,13 +140,13 @@ func (impl *DayModelServiceImplement) InsertOne(user *models.Usertab, entity *mo
 	session := engine.NewSession()
 	defer session.Close()
 	dao := dal.NewDayModelDAO(session, user.Pid, user.Userid)
-	record, err := dao.SelectOne(entity.DayModelNr)
-	if err != nil {
-		return err
-	}
-	if record != nil {
-		return grmi.NewBusinessError("已经存在相同主键的记录!")
-	}
+	//record, err := dao.SelectOne(entity.DayModelNr)
+	//if err != nil {
+	//	return err
+	//}
+	//if record != nil {
+	//	return grmi.NewBusinessError("已经存在相同主键的记录!")
+	//}
 	dependOnDao := dal.NewWorkShiftDAO(session, user.Pid, user.Userid)
 	if entity.S1WorkShiftNr != 0 {
 		workShift, err := dependOnDao.SelectOne(entity.S1WorkShiftNr)
@@ -247,7 +247,7 @@ func (impl *DayModelServiceImplement) InsertOne(user *models.Usertab, entity *mo
 			entity.S3Len = duration
 		}
 	}
-	err = dao.InsertOne(entity)
+	err := dao.InsertOne(entity)
 	if err != nil {
 		return err
 	}

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

@@ -95,14 +95,14 @@ func (impl *WeekModelServiceImplement) InsertOne(user *models.Usertab, entity *m
 	session := engine.NewSession()
 	defer session.Close()
 	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)
+	//record, err := dao.SelectOne(entity.WeekModelNr)
+	//if err != nil {
+	//	return err
+	//}
+	//if record != nil {
+	//	return grmi.NewBusinessError("已经存在相同主键的记录!")
+	//}
+	err := dao.InsertOne(entity)
 	if err != nil {
 		return err
 	}

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

@@ -108,13 +108,13 @@ func (impl *WorkShiftServiceImplement) InsertOne(user *models.Usertab, entity *m
 	session := engine.NewSession()
 	defer session.Close()
 	dao := dal.NewWorkShiftDAO(session, user.Pid, user.Userid)
-	record, err := dao.SelectOne(entity.WorkShiftNr)
-	if err != nil {
-		return err
-	}
-	if record != nil {
-		return grmi.NewBusinessError("已经存在相同主键的记录!")
-	}
+	//record, err := dao.SelectOne(entity.WorkShiftNr)
+	//if err != nil {
+	//	return err
+	//}
+	//if record != nil {
+	//	return grmi.NewBusinessError("已经存在相同主键的记录!")
+	//}
 	if entity.SEnd <= entity.SBeg {
 		return grmi.NewBusinessError("参数错误，SEnd <= SBeg")
 	}
@@ -135,7 +135,7 @@ func (impl *WorkShiftServiceImplement) InsertOne(user *models.Usertab, entity *m
 		duration -= entity.SB5End - entity.SB5Beg
 	}
 	entity.SLen = duration
-	err = dao.InsertOne(entity)
+	err := dao.InsertOne(entity)
 	if err != nil {
 		return err
 	}