yuedefeng hace 6 años
padre
commit
495520b577

+ 36 - 297
src/dashoo.cn/backend/api/business/oilsupplier/supplierfile/supplierfileService.go

@@ -1,6 +1,9 @@
 package supplierfile
 
 import (
+	"dashoo.cn/backend/api/business/oilsupplier/tableheader"
+	"reflect"
+
 	//"fmt"
 	"strconv"
 
@@ -32,111 +35,18 @@ func (s *SupplierfileService) GetGoodsNeedFileList(classid string) (needList []F
 	var entity goodsaptitude.OilGoodsAptitude
 	sql := "select * from OilGoodsAptitude where ClassId = '" + classid + "'"
 	s.DBE.Sql(sql).Get(&entity)
-	if entity.F01 == "1" {
-		needList = append(needList, FileList{FileName: "营业执照"})
-	}
-	if entity.F02 == "1" {
-		needList = append(needList, FileList{FileName: "组织代码"})
-	}
-	if entity.F03 == "1" {
-		needList = append(needList, FileList{FileName: "税务登记"})
-	}
-	if entity.F04 == "1" {
-		needList = append(needList, FileList{FileName: "开户许可"})
-	}
-	if entity.F05 == "1" {
-		needList = append(needList, FileList{FileName: "质量管理体系认证证书"})
-	}
-	if entity.F06 == "1" {
-		needList = append(needList, FileList{FileName: "环境管理体系认证证书"})
-	}
-	if entity.F07 == "1" {
-		needList = append(needList, FileList{FileName: "职业健康安全管理体系认证证书"})
-	}
-	if entity.F08 == "1" {
-		needList = append(needList, FileList{FileName: "代理授权证书(代理商)"})
-	}
-	if entity.F09 == "1" {
-		needList = append(needList, FileList{FileName: "安全生产许可证"})
-	}
-	if entity.F10 == "1" {
-		needList = append(needList, FileList{FileName: "特种劳动防护用品生产经营许可证"})
-	}
-	if entity.F11 == "1" {
-		needList = append(needList, FileList{FileName: "辐射安全许可证"})
-	}
-	if entity.F12 == "1" {
-		needList = append(needList, FileList{FileName: "危险化学品经营许可证"})
-	}
-	if entity.F13 == "1" {
-		needList = append(needList, FileList{FileName: "成品油批发经营批准证书"})
-	}
-	if entity.F14 == "1" {
-		needList = append(needList, FileList{FileName: "食品流通许可证"})
-	}
-	if entity.F15 == "1" {
-		needList = append(needList, FileList{FileName: "医疗器械经营企业许可证"})
-	}
-	if entity.F16 == "1" {
-		needList = append(needList, FileList{FileName: "安全生产许可证"})
-	}
-	if entity.F17 == "1" {
-		needList = append(needList, FileList{FileName: "特种设备制造许可证"})
-	}
-	if entity.F18 == "1" {
-		needList = append(needList, FileList{FileName: "全国工业产品生产许可证"})
-	}
-	if entity.F19 == "1" {
-		needList = append(needList, FileList{FileName: "危险化学品使用许可证"})
-	}
-	if entity.F20 == "1" {
-		needList = append(needList, FileList{FileName: "危险化学品登记证"})
-	}
-	if entity.F21 == "1" {
-		needList = append(needList, FileList{FileName: "危险化学品经营许可证"})
-	}
-	if entity.F22 == "1" {
-		needList = append(needList, FileList{FileName: "化学品危险性鉴别与分类报告"})
-	}
-	if entity.F23 == "1" {
-		needList = append(needList, FileList{FileName: "中国国家强制性产品认证证书"})
-	}
-	if entity.F24 == "1" {
-		needList = append(needList, FileList{FileName: "产品型式认可证书"})
-	}
-	if entity.F25 == "1" {
-		needList = append(needList, FileList{FileName: "食品生产许可证"})
-	}
-	if entity.F26 == "1" {
-		needList = append(needList, FileList{FileName: "制造计量器具许可证"})
-	}
-	if entity.F27 == "1" {
-		needList = append(needList, FileList{FileName: "特种设备安装改造维修许可证"})
-	}
-	if entity.F28 == "1" {
-		needList = append(needList, FileList{FileName: "中油集团公司产品质量认可证书"})
-	}
-	if entity.F29 == "1" {
-		needList = append(needList, FileList{FileName: "辐射安全许可证"})
-	}
-	if entity.F30 == "1" {
-		needList = append(needList, FileList{FileName: "中国船级社型式认可证书"})
-	}
-	if entity.F31 == "1" {
-		needList = append(needList, FileList{FileName: "涉及饮用水卫生安全产品卫生许可批件"})
-	}
-	if entity.F32 == "1" {
-		needList = append(needList, FileList{FileName: "成品油批发经营批准证书"})
-	}
-	if entity.F33 == "1" {
-		needList = append(needList, FileList{FileName: "医疗器械经营许可证"})
-	}
-	if entity.F34 == "1" {
-		needList = append(needList, FileList{FileName: "节能产品认证证书"})
-	}
-	if entity.F35 == "1" {
-		needList = append(needList, FileList{FileName: "预应力件生产许可证"})
+
+	tbHeaderSvc := tableheader.GetTableHeaderService(s.DBE)
+	var headerList []tableheader.BaseTableheader
+	tbHeaderSvc.ListGoodTableHeader(&headerList)
+	for _, header := range headerList {
+		curCertConfig := reflect.ValueOf(entity)
+		setValue := curCertConfig.FieldByName(header.Code).String()
+		if setValue != "" && setValue != "0" {
+			needList = append(needList, FileList{FileName: header.Name})
+		}
 	}
+
 	return needList
 }
 
@@ -144,81 +54,18 @@ func (s *SupplierfileService) GetBasicNeedFileList(classid int) (needList []File
 	var entity basisbuild.OilBasisBuild
 	sql := "select * from OilBasisBuild where Id = '" + strconv.Itoa(classid) + "'"
 	s.DBE.Sql(sql).Get(&entity)
-	if entity.F01 == "1" {
-		needList = append(needList, FileList{FileName: "营业执照"})
-	}
-	if entity.F02 == "1" {
-		needList = append(needList, FileList{FileName: "组织机构代码证"})
-	}
-	if entity.F03 == "1" {
-		needList = append(needList, FileList{FileName: "税务登记证"})
-	}
-	if entity.F04 == "1" {
-		needList = append(needList, FileList{FileName: "银行开户许可证"})
-	}
-	if entity.F05 == "1" {
-		needList = append(needList, FileList{FileName: "质量管理体系认证证书"})
-	}
-	if entity.F06 == "1" {
-		needList = append(needList, FileList{FileName: "环境管理体系认证证书"})
-	}
-	if entity.F07 == "1" {
-		needList = append(needList, FileList{FileName: "职业健康安全管理体系认证证书"})
-	}
-	if entity.F08 == "1" {
-		needList = append(needList, FileList{FileName: "软件企业认定证书"})
-	}
-	if entity.F09 == "1" {
-		needList = append(needList, FileList{FileName: "安全生产许可证"})
-	}
-	if entity.F10 == "1" {
-		needList = append(needList, FileList{FileName: "陆上石油天然气安全生产许可证"})
-	}
-	if entity.F11 == "1" {
-		needList = append(needList, FileList{FileName: "海洋石油作业安全生产许可证"})
-	}
-	if entity.F12 == "1" {
-		needList = append(needList, FileList{FileName: "辐射安全许可证"})
-	}
-	if entity.F13 == "1" {
-		needList = append(needList, FileList{FileName: "石油工程技术服务企业资质证书"})
-	}
-	if entity.F14 == "1" {
-		needList = append(needList, FileList{FileName: "物业服务企业资质证书"})
-	}
-	if entity.F15 == "1" {
-		needList = append(needList, FileList{FileName: "工业清洗企业资质证书"})
-	}
-	if entity.F16 == "1" {
-		needList = append(needList, FileList{FileName: "建设项目环境影响评价资格证书"})
-	}
-	if entity.F17 == "1" {
-		needList = append(needList, FileList{FileName: "消防设施维护保养资质证书"})
-	}
-	if entity.F18 == "1" {
-		needList = append(needList, FileList{FileName: "安全评价机构资质证书"})
-	}
-	if entity.F19 == "1" {
-		needList = append(needList, FileList{FileName: "工程咨询招标代理机构资质证书"})
-	}
-	if entity.F20 == "1" {
-		needList = append(needList, FileList{FileName: "工程监督资质证书"})
-	}
-	if entity.F21 == "1" {
-		needList = append(needList, FileList{FileName: "土地开发资格证"})
-	}
-	if entity.F22 == "1" {
-		needList = append(needList, FileList{FileName: "房屋预售资格证"})
-	}
-	if entity.F23 == "1" {
-		needList = append(needList, FileList{FileName: "保安服务许可证"})
-	}
-	if entity.F24 == "1" {
-		needList = append(needList, FileList{FileName: "道路运输经营许可证"})
-	}
-	if entity.F25 == "1" {
-		needList = append(needList, FileList{FileName: "机动车维修经营许可证"})
+
+	tbHeaderSvc := tableheader.GetTableHeaderService(s.DBE)
+	var headerList []tableheader.BaseTableheader
+	tbHeaderSvc.ListBbTableHeader(&headerList)
+	for _, header := range headerList {
+		curCertConfig := reflect.ValueOf(entity)
+		setValue := curCertConfig.FieldByName(header.Code).String()
+		if setValue != "" && setValue != "0" {
+			needList = append(needList, FileList{FileName: header.Name})
+		}
 	}
+
 	return needList
 }
 
@@ -226,125 +73,17 @@ func (s *SupplierfileService) GetTechNeedFileList(classid int) (needList []FileL
 	var entity technologyservice.OilTechnologyService
 	sql := "select * from OilTechnologyService where ClassId = '" + strconv.Itoa(classid) + "'"
 	s.DBE.Sql(sql).Get(&entity)
-	if entity.F01 == "1" {
-		needList = append(needList, FileList{FileName: "营业执照"})
-	}
-	if entity.F02 == "1" {
-		needList = append(needList, FileList{FileName: "组织机构代码证"})
-	}
-	if entity.F03 == "1" {
-		needList = append(needList, FileList{FileName: "税务登记证"})
-	}
-	if entity.F04 == "1" {
-		needList = append(needList, FileList{FileName: "银行开户许可证"})
-	}
-	if entity.F05 == "1" {
-		needList = append(needList, FileList{FileName: "质量管理体系认证证书"})
-	}
-	if entity.F06 == "1" {
-		needList = append(needList, FileList{FileName: "环境管理体系认证证书"})
-	}
-	if entity.F07 == "1" {
-		needList = append(needList, FileList{FileName: "职业健康安全管理体系认证证书"})
-	}
-	if entity.F08 == "1" {
-		needList = append(needList, FileList{FileName: "软件企业认定证书"})
-	}
-	if entity.F09 == "1" {
-		needList = append(needList, FileList{FileName: "安全生产许可证"})
-	}
-	if entity.F10 == "1" {
-		needList = append(needList, FileList{FileName: "陆上石油天然气安全生产许可证"})
-	}
-	if entity.F11 == "1" {
-		needList = append(needList, FileList{FileName: "海洋石油作业安全生产许可证"})
-	}
-	if entity.F12 == "1" {
-		needList = append(needList, FileList{FileName: "辐射安全许可证"})
-	}
-	if entity.F13 == "1" {
-		needList = append(needList, FileList{FileName: "石油工程技术服务企业资质证书"})
-	}
-	if entity.F14 == "1" {
-		needList = append(needList, FileList{FileName: "物业服务企业资质证书"})
-	}
-	if entity.F15 == "1" {
-		needList = append(needList, FileList{FileName: "工业清洗企业资质证书"})
-	}
-	if entity.F16 == "1" {
-		needList = append(needList, FileList{FileName: "建设项目环境影响评价资格证书"})
-	}
-	if entity.F17 == "1" {
-		needList = append(needList, FileList{FileName: "消防设施维护保养资质证书"})
-	}
-	if entity.F18 == "1" {
-		needList = append(needList, FileList{FileName: "安全评价机构资质证书"})
-	}
-	if entity.F19 == "1" {
-		needList = append(needList, FileList{FileName: "工程咨询招标代理机构资质证书"})
-	}
-	if entity.F20 == "1" {
-		needList = append(needList, FileList{FileName: "工程监督资质证书"})
-	}
-	if entity.F21 == "1" {
-		needList = append(needList, FileList{FileName: "土地开发资格证"})
-	}
-	if entity.F22 == "1" {
-		needList = append(needList, FileList{FileName: "房屋预售资格证"})
-	}
-	if entity.F23 == "1" {
-		needList = append(needList, FileList{FileName: "保安服务许可证"})
-	}
-	if entity.F24 == "1" {
-		needList = append(needList, FileList{FileName: "道路运输经营许可证"})
-	}
-	if entity.F25 == "1" {
-		needList = append(needList, FileList{FileName: "机动车维修经营许可证"})
-	}
-	if entity.F26 == "1" {
-		needList = append(needList, FileList{FileName: "道路危险货物运输许可证"})
-	}
-	if entity.F27 == "1" {
-		needList = append(needList, FileList{FileName: "特种设备安装改造维修许可证"})
-	}
-	if entity.F28 == "1" {
-		needList = append(needList, FileList{FileName: "建筑安全许可证"})
-	}
-	if entity.F29 == "1" {
-		needList = append(needList, FileList{FileName: "防火许可证"})
-	}
-	if entity.F30 == "1" {
-		needList = append(needList, FileList{FileName: "印刷经营许可证"})
-	}
-	if entity.F31 == "1" {
-		needList = append(needList, FileList{FileName: "餐饮服务许可证"})
-	}
-	if entity.F32 == "1" {
-		needList = append(needList, FileList{FileName: "劳务派遣经营许可证"})
-	}
-	if entity.F33 == "1" {
-		needList = append(needList, FileList{FileName: "人力资源服务许可证"})
-	}
-	if entity.F34 == "1" {
-		needList = append(needList, FileList{FileName: "国家实验室认可证书"})
-	}
-	if entity.F35 == "1" {
-		needList = append(needList, FileList{FileName: "海洋石油专业设备检验检测机构证书"})
-	}
-	if entity.F36 == "1" {
-		needList = append(needList, FileList{FileName: "安全生产检验检测证书"})
-	}
-	if entity.F37 == "1" {
-		needList = append(needList, FileList{FileName: "液化气钢瓶检验证书"})
-	}
-	if entity.F38 == "1" {
-		needList = append(needList, FileList{FileName: "国家电网承试承装承修许可证"})
-	}
-	if entity.F39 == "1" {
-		needList = append(needList, FileList{FileName: "建筑企业资质证书"})
-	}
-	if entity.F40 == "1" {
-		needList = append(needList, FileList{FileName: "中油集团监造许可"})
+
+	tbHeaderSvc := tableheader.GetTableHeaderService(s.DBE)
+	var headerList []tableheader.BaseTableheader
+	tbHeaderSvc.ListTsTableHeader(&headerList)
+	for _, header := range headerList {
+		curCertConfig := reflect.ValueOf(entity)
+		setValue := curCertConfig.FieldByName(header.Code).String()
+		if setValue != "" && setValue != "0" {
+			needList = append(needList, FileList{FileName: header.Name})
+		}
 	}
+
 	return needList
 }

+ 12 - 0
src/dashoo.cn/backend/api/business/oilsupplier/tableheader/tableheaderservice.go

@@ -18,6 +18,18 @@ func GetTableHeaderService(xormEngine *xorm.Engine) *TableHeaderService {
 	return s
 }
 
+func (s *TableHeaderService) ListGoodTableHeader(list *[]BaseTableheader) {
+	s.DBE.Table("Base_TableHeader").Asc("SortCode, Id").Where( "1=1 and CategoryCode='01'").Find(list)
+}
+
+func (s *TableHeaderService) ListTsTableHeader(list *[]BaseTableheader) {
+	s.DBE.Table("Base_TableHeader").Asc("SortCode, Id").Where( "1=1 and CategoryCode='03'").Find(list)
+}
+
+func (s *TableHeaderService) ListBbTableHeader(list *[]BaseTableheader) {
+	s.DBE.Table("Base_TableHeader").Asc("SortCode, Id").Where( "1=1 and CategoryCode='02'").Find(list)
+}
+
 func (s *TableHeaderService) GetMyPagingEntitiesWithOrderBytbl(tableName string, pageIndex, itemsPerPage int64, order string, asc bool, entitiesPtr interface{}, where ...string) (total int64) {
 	var err error
 	var resultsSlice []map[string][]byte

+ 6 - 2
src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertsub.go

@@ -2,6 +2,7 @@ package oilsupplier
 
 import (
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
+	"dashoo.cn/business/parameter"
 	"encoding/json"
 	//"fmt"
 	"strconv"
@@ -335,11 +336,13 @@ func (this *OilSupplierCertSubController) AddGoodsBus() {
 			datamain.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			svc.InsertEntityBytbl(OilSupplierCertSubName, &datamain)
 
+			paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
 			filesvc := supplierfile.GetSupplierfileService(utils.DBE)
 			needList := filesvc.GetGoodsNeedFileList(dataother.CheckList[n].Id)
 			if supplierCertModel.InStyle == "4" {
 				var needFile supplierfile.FileList
-				needFile.FileName = "战略合作协议扫描件"
+				//战略合作协议扫描件
+				needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
 				needList = append(needList, needFile)
 			}
 
@@ -350,7 +353,8 @@ func (this *OilSupplierCertSubController) AddGoodsBus() {
 			for i := 0; i < len(list); i++ {
 				hasField += list[i].NeedFileType + ","
 			}
-			mustField := "营业执照,组织代码,税务登记,开户许可,银行开户许可证,承诺书,诚信合规承诺书,企业信息系统截图,战略合作协议扫描件,"
+			//"营业执照,组织代码,组织机构代码证,税务登记证,税务登记,开户许可,银行开户许可证,承诺书,诚信合规承诺书,企业信息系统截图,战略合作协议扫描件,"
+			mustField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MustFieldName")
 			for i := 0; i < len(needList); i++ {
 				var entity supplierfile.OilSupplierFile
 				entity.SupplierId = dataother.SupplierId