增项添加修改

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertappendsub.go

@@ -187,90 +187,64 @@ func (this *OilSupplierCertAppendSubController) AddAppendSub() {
 	if !has{
 		//添加到准入分类表中
 		_, err = svc.InsertEntityBytbl(OilSupplierCertSubName, &model)
-	}else{
-		model.Id = submodel.Id
-	}
-
-	var supplierCertModel suppliercert.OilSupplierCert
-	svcCert := suppliercert.GetOilSupplierCertService(utils.DBE)
-	svcCert.GetEntityById(model.SupplierCertId, &supplierCertModel)
-
-	var supplierModel supplier.OilSupplier
-	svcSupplier := supplier.GetOilSupplierService(utils.DBE)
-	svcSupplier.GetEntityById(model.SupplierId, &supplierModel)
-
-	paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
-	filesvc := supplierfile.GetSupplierfileService(utils.DBE)
-	var needList []supplierfile.FileList
+		var supplierCertModel suppliercert.OilSupplierCert
+		svcCert := suppliercert.GetOilSupplierCertService(utils.DBE)
+		svcCert.GetEntityById(model.SupplierCertId, &supplierCertModel)
 
-	if model.SupplierTypeCode == "01" {
-		//		needList = filesvc.GetGoodsNeedFileList(model.SubClassId)
-	} else if model.SupplierTypeCode == "02" {
-		needList = filesvc.GetBasicNeedFileList(strconv.Itoa(model.SubClassId))
-	} else {
-		//		needList = filesvc.GetTechNeedFileList(model.SubClassId)
-	}
+		var supplierModel supplier.OilSupplier
+		svcSupplier := supplier.GetOilSupplierService(utils.DBE)
+		svcSupplier.GetEntityById(model.SupplierId, &supplierModel)
 
-	if supplierCertModel.InStyle == "4" {
-		var needFile supplierfile.FileList
-		needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
-		needList = append(needList, needFile)
-	}
+		paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+		filesvc := supplierfile.GetSupplierfileService(utils.DBE)
+		var needList []supplierfile.FileList
+
+		if model.SupplierTypeCode == "01" {
+			//		needList = filesvc.GetGoodsNeedFileList(model.SubClassId)
+		} else if model.SupplierTypeCode == "02" {
+			needList = filesvc.GetBasicNeedFileList(strconv.Itoa(model.SubClassId))
+		} else {
+			//		needList = filesvc.GetTechNeedFileList(model.SubClassId)
+		}
 
-	if err == nil {
-		var list []supplierfile.OilSupplierFile
-		where := "SupplierTypeCode in (02,000) and SupplierId = '" + strconv.Itoa(model.SupplierId) + "'"
-		svc.GetEntitysByWhere(OilSupplierFileName, where, &list)
+		if supplierCertModel.InStyle == "4" {
+			var needFile supplierfile.FileList
+			needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
+			needList = append(needList, needFile)
+		}
 
-		//三证合一或五证合一不需要的字段
-		mergerCertSkipField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MergerCertSkipFieldName")
+		if err == nil {
+			var list []supplierfile.OilSupplierFile
+			where := "SupplierTypeCode in (02,000) and SupplierId = '" + strconv.Itoa(model.SupplierId) + "'"
+			svc.GetEntitysByWhere(OilSupplierFileName, where, &list)
 
-		//"营业执照,组织代码,组织机构代码证,税务登记证,税务登记,开户许可,银行开户许可证,承诺书,诚信合规承诺书,企业信息系统截图,战略合作协议扫描件,"
-		mustField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MustFieldName")
+			//三证合一或五证合一不需要的字段
+			mergerCertSkipField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MergerCertSkipFieldName")
 
-		for i := 0; i < len(needList); i++ {
-			var entity supplierfile.OilSupplierFile
-			entity.SupplierId = model.SupplierId
-			//加入对应表OilSupplierCert2File
-			var cert2File suppliercertsub.OilSupplierCert2File //创建结构体
-			cert2File.SupplierId = model.SupplierId
-			cert2File.SupplierCertId = model.SupplierCertId
-			cert2File.SupplierTypeCode = model.SupplierTypeCode
-			cert2File.SubClassId= model.SubClassId
-			cert2File.Code = model.Code
-			cert2File.Name = model.Name
-			cert2File.NeedFileType = needList[i].FileName
-			svc.InsertEntityBytbl(OilSupplierCert2FileName, &cert2File)
-			if (supplierModel.CredentialFlag == "1" || supplierModel.CredentialFlag == "2") && strings.Contains(mergerCertSkipField, needList[i].FileName+",") { //三证合一或五证合一了
-				continue
-			}
+			//"营业执照,组织代码,组织机构代码证,税务登记证,税务登记,开户许可,银行开户许可证,承诺书,诚信合规承诺书,企业信息系统截图,战略合作协议扫描件,"
+			// mustField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MustFieldName")
 
-			if strings.Contains(mustField, needList[i].FileName+",") {
-				entity.SupplierTypeCode = "000"
-			} else {
-				entity.SupplierTypeCode = model.SupplierTypeCode
-			}
-			entity.NeedFileType = needList[i].FileName
-			entity.FileType = 1
-			//entity.EffectDate = time.Now()
-			entity.CreateBy = this.User.Realname
-			entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-			entity.SupType = 2
-			entity.SupplierCertSubId = model.SupplierCertAppendId
-			isRepeat := false
-			for j := 0; j < len(list); j++ {
-				if list[j].NeedFileType == needList[i].FileName{
-					isRepeat = true
-					break
+			for i := 0; i < len(needList); i++ {
+				if (supplierModel.CredentialFlag == "1" || supplierModel.CredentialFlag == "2") && strings.Contains(mergerCertSkipField, needList[i].FileName+",") { //三证合一或五证合一了
+					continue
 				}
+				var entity supplierfile.OilSupplierFile
+				entity.SupplierId = model.SupplierId
+				//加入对应表OilSupplierCert2File
+				var cert2File suppliercertsub.OilSupplierCert2File //创建结构体
+				cert2File.SupplierId = model.SupplierId
+				cert2File.SupplierCertId = model.SupplierCertId
+				cert2File.SupplierCertSubId = model.Id
+				cert2File.SupplierTypeCode = model.SupplierTypeCode
+				cert2File.SubClassId = model.SubClassId
+				cert2File.Code = model.Code
+				cert2File.Name = model.Name
+				cert2File.NeedFileType = needList[i].FileName
+				svc.InsertEntityBytbl(OilSupplierCert2FileName, &cert2File)
 			}
-			if isRepeat == true {
-				continue
-			}
-			svc.InsertEntityBytbl(OilSupplierFileName, &entity)
 		}
-
 	}
+
 	var errinfo ErrorDataInfo
 	if err == nil {
 		errinfo.Message = "操作成功！"
@@ -313,6 +287,7 @@ func (this *OilSupplierCertAppendSubController) AddTechBus() {
 		has := svc.GetEntityByWhere(OilSupplierCertSubName, where_sub, &model)
 
 		if !has {
+			// TODO: 不存在的准入范围直接就新增了，因为前台已经调用了checkLost检查过是否缺少资质，有时间可以在些方法补充验证
 			datamain.SubClassId = dataother.CheckList[n].Id
 			datamain.Code = dataother.CheckList[n].Code
 			datamain.Name = dataother.CheckList[n].Name
@@ -341,7 +316,7 @@ func (this *OilSupplierCertAppendSubController) AddTechBus() {
 			mergerCertSkipField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MergerCertSkipFieldName")
 
 			//"营业执照,组织代码,组织机构代码证,税务登记证,税务登记,开户许可,银行开户许可证,承诺书,诚信合规承诺书,企业信息系统截图,战略合作协议扫描件,"
-			mustField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MustFieldName")
+			// mustField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MustFieldName")
 			for i := 0; i < len(needList); i++ {
 				var entity supplierfile.OilSupplierFile
 				entity.SupplierId = dataother.SupplierId
@@ -353,37 +328,13 @@ func (this *OilSupplierCertAppendSubController) AddTechBus() {
 				var cert2File suppliercertsub.OilSupplierCert2File //创建结构体
 				cert2File.SupplierId = dataother.SupplierId
 				cert2File.SupplierCertId = dataother.SupplierCertId
+				cert2File.SupplierCertSubId = datamain.Id
 				cert2File.SupplierTypeCode = dataother.SupplierTypeCode
 				cert2File.SubClassId= dataother.CheckList[n].Id
 				cert2File.Code = dataother.CheckList[n].Code
 				cert2File.Name = dataother.CheckList[n].Name
 				cert2File.NeedFileType = needList[i].FileName
 				svc.InsertEntityBytbl(OilSupplierCert2FileName, &cert2File)
-				if strings.Contains(mustField, needList[i].FileName+",") {
-					entity.SupplierTypeCode = "000"
-				} else {
-					entity.SupplierTypeCode = dataother.SupplierTypeCode
-				}
-				entity.SupplierCertSubId = datamain.SupplierCertAppendId
-				entity.NeedFileType = needList[i].FileName
-				entity.FileType = 1
-				//entity.EffectDate = time.Now()
-				entity.CreateBy = this.User.Realname
-				entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-				entity.SupType = 2
-
-				isRepeat := false
-				for j := 0; j < len(list); j++ {
-					if list[j].NeedFileType == needList[i].FileName{
-						isRepeat = true
-						break
-					}
-				}
-				if isRepeat == true {
-					continue
-				}
-
-				svc.InsertEntityBytbl(OilSupplierFileName, &entity)
 			}
 
 		}
@@ -425,7 +376,7 @@ func (this *OilSupplierCertAppendSubController) AddGoodsBus() {
 		has := svc.GetEntityByWhere(OilSupplierCertSubName, where_sub, &model)
 
 		if !has {
-
+			// TODO: 不存在的准入范围直接就新增了，因为前台已经调用了checkLost检查过是否缺少资质，有时间可以在些方法补充验证
 			datamain.SubClassId, _ = utils.StrTo(dataother.CheckList[n].Id).Int()
 			datamain.Code = dataother.CheckList[n].Code
 			datamain.Name = dataother.CheckList[n].Name
@@ -454,7 +405,7 @@ func (this *OilSupplierCertAppendSubController) AddGoodsBus() {
 			//三证合一或五证合一不需要的字段
 			mergerCertSkipField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MergerCertSkipFieldName")
 			//"营业执照,组织代码,组织机构代码证,税务登记证,税务登记,开户许可,银行开户许可证,承诺书,诚信合规承诺书,企业信息系统截图,战略合作协议扫描件,"
-			mustField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MustFieldName")
+			// mustField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MustFieldName")
 
 			for i := 0; i < len(needList); i++ {
 				var entity supplierfile.OilSupplierFile
@@ -467,6 +418,7 @@ func (this *OilSupplierCertAppendSubController) AddGoodsBus() {
 				var cert2File suppliercertsub.OilSupplierCert2File //创建结构体
 				cert2File.SupplierId = dataother.SupplierId
 				cert2File.SupplierCertId = dataother.SupplierCertId
+				cert2File.SupplierCertSubId = datamain.Id
 				cert2File.SupplierTypeCode = dataother.SupplierTypeCode
 				cert2File.SubClassId, _ = utils.StrTo(dataother.CheckList[n].Id).Int()
 				cert2File.IsManuf = "2"
@@ -474,32 +426,6 @@ func (this *OilSupplierCertAppendSubController) AddGoodsBus() {
 				cert2File.Name = dataother.CheckList[n].Name
 				cert2File.NeedFileType = needList[i].FileName
 				svc.InsertEntityBytbl(OilSupplierCert2FileName, &cert2File)
-
-				if strings.Contains(mustField, needList[i].FileName+",") {
-					entity.SupplierTypeCode = "000"
-					entity.IsManuf = "0"
-				} else {
-					entity.SupplierTypeCode = dataother.SupplierTypeCode
-					entity.IsManuf = "2"
-				}
-				entity.NeedFileType = needList[i].FileName
-				entity.FileType = 1
-				//entity.EffectDate = time.Now()
-				entity.CreateBy = this.User.Realname
-				entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-				entity.SupType = 2
-				entity.SupplierCertSubId = datamain.SupplierCertAppendId
-				isRepeat := false
-				for j := 0; j < len(list); j++ {
-					if list[j].NeedFileType == needList[i].FileName{
-						isRepeat = true
-						break
-					}
-				}
-				if isRepeat == true {
-					continue
-				}
-				svc.InsertEntityBytbl(OilSupplierFileName, &entity)
 			}
 
 		}