Merge pull request '导入' (#109) from fix_import5 into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/109

services/ap/implments/CustDemandVerHead.service.impl.go

@@ -263,8 +263,8 @@ func (impl *CustDemandVerHeadServiceImplement) DeleteOne(user *global.User, cust
 	if record == nil {
 		return grmi.NewBusinessError("不存在指定记录!")
 	}
-	if record.GlobalPublish == baseModel.STATUS_INT_YES{
-		return  errors.New("该版本已经全局发布!")
+	if record.GlobalPublish == baseModel.STATUS_INT_YES {
+		return errors.New("该版本已经全局发布!")
 	}
 	err = dao.DeleteOne(customerId, versionId)
 	if err != nil {
@@ -450,8 +450,8 @@ func (impl *CustDemandVerHeadServiceImplement) UpdateOne(user *global.User, enti
 	if record.Status == baseModel.STATUS_YES {
 		return grmi.NewBusinessError("发布的版本不允许修改!")
 	}
-	if record.GlobalPublish == baseModel.STATUS_INT_YES{
-		return  errors.New("该版本已经全局发布!")
+	if record.GlobalPublish == baseModel.STATUS_INT_YES {
+		return errors.New("该版本已经全局发布!")
 	}
 	err = dao.UpdateOne(entity)
 	if err != nil {
@@ -849,16 +849,16 @@ func (impl *CustDemandVerHeadServiceImplement) IssueVersion(user *global.User, e
 	dao := dal.NewCustDemandVerHeadDAO(session, user.PlantNr, user.UserId)
 	detailDao := dal.NewCustDemandVerDetailDAO(session, user.PlantNr, user.UserId)
 	//查询版本信息
-	IssueInfo,err := dao.SelectOne(entity.CustomerId, entity.VersionId)
+	IssueInfo, err := dao.SelectOne(entity.CustomerId, entity.VersionId)
 	if err != nil {
 		session.Rollback()
 		return err
 	}
-	if IssueInfo == nil{
-		return  errors.New("发布版本不存在!")
+	if IssueInfo == nil {
+		return errors.New("发布版本不存在!")
 	}
-	if IssueInfo.GlobalPublish == baseModel.STATUS_INT_YES{
-		return  errors.New("该版本已经全局发布!")
+	if IssueInfo.GlobalPublish == baseModel.STATUS_INT_YES {
+		return errors.New("该版本已经全局发布!")
 	}
 	err = dao.IssueVersion(entity)
 	if err != nil {
@@ -902,8 +902,6 @@ func (impl *CustDemandVerHeadServiceImplement) IssueVersion(user *global.User, e
 	return nil
 }
 
-
-
 /******************************************************************************
  *
  * @Reference leit.com/LAPP_CHEERSSON_BACKEND/services/ap/CustDemandVerHeadService.RemoveIssueVersion
@@ -925,13 +923,13 @@ func (impl *CustDemandVerHeadServiceImplement) RemoveIssueVersion(user *global.U
 	dao := dal.NewCustDemandVerHeadDAO(session, user.PlantNr, user.UserId)
 	detailDao := dal.NewCustDemandVerDetailDAO(session, user.PlantNr, user.UserId)
 	//查询版本信息
-	IssueInfo,err := dao.SelectOne(entity.CustomerId, entity.VersionId)
+	IssueInfo, err := dao.SelectOne(entity.CustomerId, entity.VersionId)
 	if err != nil {
 		session.Rollback()
 		return err
 	}
-	if IssueInfo.GlobalPublish == baseModel.STATUS_INT_YES{
-		return  errors.New("该版本已经全局发布!")
+	if IssueInfo.GlobalPublish == baseModel.STATUS_INT_YES {
+		return errors.New("该版本已经全局发布!")
 	}
 	//取消发布版本
 	entity.Status = baseModel.STATUS_NO
@@ -983,19 +981,19 @@ func (impl *CustDemandVerHeadServiceImplement) IssueGlobalVersion(user *global.U
 	dao := dal.NewCustDemandVerHeadDAO(session, user.PlantNr, user.UserId)
 	detailDao := dal.NewCustDemandVerDetailDAO(session, user.PlantNr, user.UserId)
 	//查询版本信息
-	IssueInfo,err := dao.SelectOne(entity.CustomerId, entity.VersionId)
+	IssueInfo, err := dao.SelectOne(entity.CustomerId, entity.VersionId)
 	if err != nil {
 		session.Rollback()
 		return err
 	}
-	if IssueInfo == nil{
-		return  errors.New("发布版本不存在!")
+	if IssueInfo == nil {
+		return errors.New("发布版本不存在!")
 	}
-	if IssueInfo.Status != baseModel.STATUS_YES{
-		return  errors.New("该版本没有发布!")
+	if IssueInfo.Status != baseModel.STATUS_YES {
+		return errors.New("该版本没有发布!")
 	}
-	if IssueInfo.GlobalPublish == baseModel.STATUS_INT_YES{
-		return  errors.New("该版本已经全局发布!")
+	if IssueInfo.GlobalPublish == baseModel.STATUS_INT_YES {
+		return errors.New("该版本已经全局发布!")
 	}
 	entity.GlobalPublish = baseModel.STATUS_INT_YES
 	err = dao.IssueGlobalVersion(entity)
@@ -1138,6 +1136,10 @@ func (impl *CustDemandVerHeadServiceImplement) ImportFile(user *global.User, cus
 	dayLen := mInfo.WeekDemandDay - firstWeek
 	nowDate := time.Now().AddDate(0, 0, dayLen)
 
+	if mInfo.RelativeStartDeviationMode == "Y" {
+		nowDate = nowDate.AddDate(0, 0, ((7 * mInfo.RelativeStartDeviation) + dayLen))
+	}
+
 	//定义一个数组，记录日期,并且与k关联起来
 	tem := make(map[int]string)
 	for k, row := range rows {
@@ -1336,6 +1338,10 @@ func (impl *CustDemandVerHeadServiceImplement) BulkImportFile(user *global.User,
 		dayLen := mInfo.WeekDemandDay - firstWeek
 		nowDate := time.Now().AddDate(0, 0, dayLen)
 
+		if mInfo.RelativeStartDeviationMode == "Y" {
+			nowDate = nowDate.AddDate(0, 0, ((7 * mInfo.RelativeStartDeviation) + dayLen))
+		}
+
 		temLen := 0
 		var temDemandDate time.Time
 		for kkk, vvv := range row {
@@ -1410,12 +1416,19 @@ func (impl *CustDemandVerHeadServiceImplement) BulkImportFile(user *global.User,
 		}
 		_, ok := headMap[customerId]
 		if !ok {
+			versionInfo := strings.Split(versionId, ".")
+			if len(versionInfo) < 2 {
+				session.Rollback()
+				return errors.New("版本信息格式错误")
+			}
+			createYear := versionInfo[0]
+			createWeek := versionInfo[1]
 			oneInfo := model.CustDemandVerHead{}
 			oneInfo.PlantNr = user.PlantNr
 			oneInfo.CustomerId = customerId
 			oneInfo.VersionId = versionId
 			oneInfo.CreateMode = custInfo.DemandModelId
-			oneInfo.Descr = "版本" + versionId
+			oneInfo.Descr = fmt.Sprintf("%d年%d周预测需求", createYear, createWeek)
 			oneInfo.CreateUser = "Auto"
 			err = dao.InsertOne(&oneInfo)
 			if err != nil {