|
|
@@ -1,6 +1,7 @@
|
|
|
package oilsupplier
|
|
|
|
|
|
import (
|
|
|
+ "dashoo.cn/backend/api/business/oilsupplier/supplier"
|
|
|
"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
|
|
|
"dashoo.cn/business/parameter"
|
|
|
"encoding/json"
|
|
|
@@ -318,6 +319,10 @@ func (this *OilSupplierCertSubController) AddGoodsBus() {
|
|
|
svcCert := suppliercert.GetOilSupplierCertService(utils.DBE)
|
|
|
svcCert.GetEntityById(datamain.SupplierCertId, &supplierCertModel)
|
|
|
|
|
|
+ var supplierModel supplier.OilSupplier
|
|
|
+ svcSupplier := supplier.GetOilSupplierService(utils.DBE)
|
|
|
+ svcSupplier.GetEntityById(datamain.SupplierCertId, &supplierModel)
|
|
|
+
|
|
|
for n := 0; n < len(dataother.CheckList); n++ {
|
|
|
where_sub := "SupplierTypeCode = 01 and SupplierId = '" + strconv.Itoa(dataother.SupplierId) + "'"
|
|
|
where_sub += " and SupplierCertId = '" + strconv.Itoa(dataother.SupplierCertId) + "'"
|
|
|
@@ -353,12 +358,18 @@ func (this *OilSupplierCertSubController) AddGoodsBus() {
|
|
|
for i := 0; i < len(list); i++ {
|
|
|
hasField += list[i].NeedFileType + ","
|
|
|
}
|
|
|
+ //三证合一或五证合一不需要的字段
|
|
|
+ mergerCertSkipField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MergerCertSkipFieldName")
|
|
|
//"营业执照,组织代码,组织机构代码证,税务登记证,税务登记,开户许可,银行开户许可证,承诺书,诚信合规承诺书,企业信息系统截图,战略合作协议扫描件,"
|
|
|
mustField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MustFieldName")
|
|
|
for i := 0; i < len(needList); i++ {
|
|
|
var entity supplierfile.OilSupplierFile
|
|
|
entity.SupplierId = dataother.SupplierId
|
|
|
|
|
|
+ /*if supplierModel.CredentialFlag != "1" && strings.Contains(mergerCertSkipField, needList[i].FileName+",") { //三证合一或五证合一了
|
|
|
+ continue
|
|
|
+ }*/
|
|
|
+
|
|
|
if strings.Contains(mustField, needList[i].FileName+",") {
|
|
|
entity.SupplierTypeCode = "000"
|
|
|
} else {
|
yuedefeng