前后:集中评审导出

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplier.go

@@ -81,6 +81,84 @@ type OilSupplier struct {
 	SupplierCertificate string    `xorm:"comment('中石油物资供应商证书') VARCHAR(200)"`
 }
 
+type OilSupplier1 struct {
+	Id                  int       `xorm:"not null pk autoincr INT(10)"`
+	SupplierName        string    `xorm:"comment('企业名称') VARCHAR(255)"`
+	OldSupplierName     string    `xorm:"comment('曾用名') VARCHAR(255)"`
+	OilCertificateNo    string    `xorm:"comment('中石油供应商证书号') VARCHAR(50)"`
+	Grade               string    `xorm:"comment('级别') VARCHAR(2)"`
+	MgrUnit             string    `xorm:"comment('管理单位') VARCHAR(50)"`
+	OperType            string    `xorm:"comment('经营方式') VARCHAR(50)"`
+	Country             string    `xorm:"comment('国家') VARCHAR(20)"`
+	MaunAgent           string    `xorm:"comment('所代理制造商名称') VARCHAR(100)"`
+	ConstructTeam       string    `xorm:"comment('施工队伍名称') VARCHAR(100)"`
+	CredentialFlag      string    `xorm:"default '1' comment('证件合一标志') VARCHAR(5)"`
+	CommercialNo        string    `xorm:"comment('工商注册号') VARCHAR(50)"`
+	OrganCode           string    `xorm:"comment('组织机构代码') VARCHAR(50)"`
+	CountryTaxNo        string    `xorm:"comment('税务登记证国税编号') VARCHAR(50)"`
+	LocalTaxNo          string    `xorm:"comment('税务登记证地税编号') VARCHAR(50)"`
+	Address             string    `xorm:"comment('单位地址') VARCHAR(500)"`
+	AllAddress          string    `xorm:"comment('注册地址') VARCHAR(500)"`
+	LinkAllAddress      string    `xorm:"comment('通信地址') VARCHAR(500)"`
+	Province            string    `xorm:"comment('省直辖市') VARCHAR(20)"`
+	City                string    `xorm:"comment('地市区县') VARCHAR(20)"`
+	Street              string    `xorm:"comment('街道') VARCHAR(20)"`
+	HouseNo             string    `xorm:"comment('门牌号') VARCHAR(10)"`
+	ZipCode             string    `xorm:"comment('邮编') VARCHAR(20)"`
+	LinkAddress         string    `xorm:"comment('通信地址-单位地址') VARCHAR(500)"`
+	LinkProvince        string    `xorm:"comment('通信地址-省直辖市') VARCHAR(20)"`
+	LinkCity            string    `xorm:"comment('通信地址-地市区县') VARCHAR(20)"`
+	LinkStreet          string    `xorm:"comment('通信地址-街道') VARCHAR(20)"`
+	LinkHouseNo         string    `xorm:"comment('通信地址-门牌号') VARCHAR(10)"`
+	LinkZipCode         string    `xorm:"comment('通信地址-邮编') VARCHAR(20)"`
+	HseTraining         string    `xorm:"comment('是否需要进行HSE审查培训') VARCHAR(2)"`
+	QualitySystemCert   string    `xorm:"comment('质量管理体系认证情况及认证机构') VARCHAR(200)"`
+	ProductQualityCert  string    `xorm:"comment('产品质量认证情况及认证机构') VARCHAR(200)"`
+	MaunLicense         string    `xorm:"comment('生产制造许可证获证情况及编号') VARCHAR(200)"`
+	QualifCert          string    `xorm:"comment('企业资质证书编号') VARCHAR(200)"`
+	QualifCertLevel     string    `xorm:"comment('企业资质证书级别') VARCHAR(10)"`
+	SafetyLicense       string    `xorm:"comment('安全生产许可证') VARCHAR(200)"`
+	TechServiceLic      string    `xorm:"comment('技术服务类准入许可证') VARCHAR(200)"`
+	TjinNotify          string    `xorm:"comment('外地企业进津备案通知书') VARCHAR(50)"`
+	SpecIndustryCert    string    `xorm:"comment('行业特殊要求的认证证书') VARCHAR(200)"`
+	BusinessScope       string    `xorm:"comment('营业范围') TEXT"`
+	LegalPerson         string    `xorm:"comment('法定代表人姓名') VARCHAR(20)"`
+	CategoryCode        string    `xorm:"comment('行业类别代码') VARCHAR(10)"`
+	CategoryName        string    `xorm:"comment('行业类别名称') VARCHAR(20)"`
+	RegCapital          float64   `xorm:"default 0 comment('注册资本') FLOAT"`
+	Currency            string    `xorm:"comment('币种') VARCHAR(10)"`
+	ContactName         string    `xorm:"comment('联系人姓名') VARCHAR(20)"`
+	CompanyType         string    `xorm:"comment('公司类型') VARCHAR(20)"`
+	SetupTime           time.Time `xorm:"comment('成立时间') Date"`
+	DepositBank         string    `xorm:"comment('开户银行') VARCHAR(50)"`
+	BankAccount         string    `xorm:"comment('银行账号') VARCHAR(50)"`
+	EMail               string    `xorm:"comment('电子邮箱') VARCHAR(50)"`
+	BankCreditRating    string    `xorm:"comment('银行信用等级') VARCHAR(10)"`
+	Mobile              string    `xorm:"comment('移动电话') VARCHAR(20)"`
+	Telphone            string    `xorm:"comment('固定电话') VARCHAR(20)"`
+	Fax                 string    `xorm:"comment('传真') VARCHAR(20)"`
+	CompanyTel          string    `xorm:"comment('公司电话') VARCHAR(20)"`
+	QQ                  string    `xorm:"comment('QQ号码') VARCHAR(20)"`
+	CompanyUrl          string    `xorm:"comment('公司网址') VARCHAR(20)"`
+	SpecSupplier        string    `xorm:"default '0' comment('是否特殊业务供应商(可不招标)') VARCHAR(2)"`
+	SpecTypeCode        string    `xorm:"comment('业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）') VARCHAR(2)"`
+	SpecTypeName        string    `xorm:"comment('业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）') VARCHAR(20)"`
+	WZAccessCardNo      string    `xorm:"comment('准入证编码--物质') VARCHAR(20)"`
+	JSAccessCardNo      string    `xorm:"comment('准入证编码--基建') VARCHAR(20)"`
+	JFAccessCardNo      string    `xorm:"comment('准入证编码--技术服务类') VARCHAR(20)"`
+	Remark              string    `xorm:"comment('备注') VARCHAR(500)"`
+	IsDelete            int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+	CreateOn            time.Time `xorm:"DATETIME"`
+	CreateUserId        int       `xorm:"INT(10)"`
+	CreateBy            string    `xorm:"VARCHAR(50)"`
+	ModifiedOn          time.Time `xorm:"DATETIME"`
+	ModifiedUserId      int       `xorm:"INT(10)"`
+	ModifiedBy          string    `xorm:"VARCHAR(50)"`
+	PACNumber           string    `xorm:"comment('中石油准入证编号') VARCHAR(50)"`
+	SupplierCertificate string    `xorm:"comment('中石油物资供应商证书') VARCHAR(200)"`
+	CodeName			string
+}
+
 type Del_OilSupplier struct {
 	Id                  int       `xorm:"not null pk autoincr INT(10)"`
 	SupplierName        string    `xorm:"comment('企业名称') VARCHAR(255)"`
@@ -213,6 +291,61 @@ type OilSupplierView struct {
 	Remark1        	  string    `xorm:"VARCHAR(255)"`
 }
 
+type OilSupplierView1 struct {
+	OilSupplier1       `xorm:"extends"`
+	CertId            string
+	AccessCardNo      string
+	SupplierTypeCode  string
+	SupplierTypeName  string
+	Step              int
+	WorkerTotal       int       `xorm:"default 0 comment('企业员工总数') INT(10)"`
+	ContractNum       int       `xorm:"default 0 comment('合同化用工数量') INT(10)"`
+	UniversityNum     int       `xorm:"default 0 comment('大学及以上学历人员数量') INT(10)"`
+	TechnicalNum      int       `xorm:"default 0 comment('技术、管理人员数量') INT(10)"`
+	AboveProfNum      int       `xorm:"default 0 comment('高级及以上职称人员数量') INT(10)"`
+	MiddleProfNum     int       `xorm:"default 0 comment('中级职称人员数量') INT(10)"`
+	NationalRegNum    int       `xorm:"default 0 comment('具有国家注册执业资格人员数量') INT(10)"`
+	NationalCertTotal int       `xorm:"default 0 comment('具有国家注册执业资格证书总数') INT(10)"`
+	DesignerTotal     int       `xorm:"default 0 comment('设计人员总数') INT(10)"`
+	SkillerTotal      int       `xorm:"default 0 comment('技术工人总数') INT(10)"`
+	Status            string    `xorm:"not null default '0' comment('状态标识(0未申请，1办理完毕)') VARCHAR(10)"`
+	WorkflowId        string    `xorm:"default '0' comment('工作流的ID') VARCHAR(255)"`
+	RecUnitReason     string    `xorm:"comment('推荐单位的推荐意见') VARCHAR(800)"`
+	RecUnitPerson     string    `xorm:"comment('推荐单位负责人') VARCHAR(20)"`
+	RecDate           time.Time `xorm:"comment('推荐日期') DATETIME"`
+	RecUnitId         string    `xorm:"comment('推荐单位编码') VARCHAR(10)"`
+	RecUnitName       string    `xorm:"comment('推荐单位名称') VARCHAR(50)"`
+	BackReason        string    `xorm:"comment('退回原因') VARCHAR(50)"`
+	InFlag            string    `xorm:"default '0' comment('准入标识') VARCHAR(10)"`
+	InStyle           string    `xorm:"default '1' comment('准入方式') VARCHAR(10)"`
+	EffectStartTime   time.Time `xorm:"comment('有效期起') DATETIME"`
+	EffectEndTime     time.Time `xorm:"comment('有效期止') DATETIME"`
+	AuditProcessNote  string    `xorm:"comment('办理过程备注') VARCHAR(100)"`
+	AuditDate         time.Time `xorm:"comment('审核日期') DATETIME"`
+	PayNotice         string    `xorm:"default '0' comment('交费通知') VARCHAR(2)"`
+	SupplierStatus    string    `xorm:"comment('供应商状态（null:正常，1中止，2终止）') VARCHAR(255)"`
+	MgrType           string    `xorm:"comment('供应商管理类型') VARCHAR(255)"`
+	Type              string    `xorm:"comment('供应商类型') VARCHAR(255)"`
+	AddinTime         string    `xorm:"comment('准入日期') VARCHAR(255)"`
+	EffectTime        string    `xorm:"comment('生效日期') VARCHAR(255)"`
+	ApplyTime         time.Time `xorm:"comment('年审日期') DATETIME"`
+	SupplierNo        string    `xorm:"comment('供应商准入证编号') VARCHAR(255)"`
+	MdmFlag           string    `xorm:"default '0' comment('MDM标志') VARCHAR(2)"`
+	InternalFlag      string    `xorm:"comment('国内采购') VARCHAR(255)"`
+	ImportFlag        string    `xorm:"comment('进口采购') VARCHAR(255)"`
+	OutsideFlog       string    `xorm:"comment('境外项目') VARCHAR(255)"`
+	ThirdAudit        string    `xorm:"comment('备注') VARCHAR(500)"`
+	IsDelete          int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+	IsRestrict        int       `xorm:"INT(11)"`
+	CommitComId       string    `xorm:"default '0' comment('提交二级单位Id') VARCHAR(50)"`
+	BusinessKey       string    `xorm:"VARCHAR(255)"`
+	AuditIndex        int       `xorm:"INT(10)"`
+	ProcessKey        string    `xorm:"VARCHAR(255)"`
+	BackRemark        string    `xorm:"VARCHAR(255)"`
+	Remark        	  string    `xorm:"VARCHAR(255)"`
+	Remark1        	  string    `xorm:"VARCHAR(255)"`
+}
+
 type OilSupplierSelect struct {
 	Id               int //Oilsupplier表id
 	CertId           int

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplierService.go

@@ -118,6 +118,56 @@ func (s *OilSupplierService) GetMyPagingEntitiesWithOrderBytbl2(supplierTableNam
 
 	return total
 }
+func (s *OilSupplierService) GetMyPagingEntitiesWithOrderBytbl3(supplierTableName, supplierCertTableName string, pageIndex, itemsPerPage int64, orderby string, asc bool, entitiesPtr interface{}, where string) (total int64) {
+	var resultsSlice []map[string][]byte
+
+	//获取总记录数
+	sqlCount := `select count(DISTINCT b.Id) from ` + supplierTableName + ` a `
+	sqlCount += ` left join ` + supplierCertTableName + " b on b.SupplierId = a.Id"
+	sqlCount += ` where ` + where
+
+	var sql string
+	sql = `select DISTINCT b.Id as CertId, a.*, b.AccessCardNo, b.SupplierTypeCode, b.SupplierTypeName, b.InFlag, b.ApplyTime,b.EffectEndTime, `
+	sql += ` b.WorkerTotal, `
+	sql += ` b.ContractNum, `
+	sql += ` b.UniversityNum, `
+	sql += ` b.TechnicalNum, `
+	sql += ` b.AboveProfNum, `
+	sql += ` b.MiddleProfNum, `
+	sql += ` b.NationalRegNum, `
+	sql += ` b.NationalCertTotal, `
+	sql += ` b.DesignerTotal, `
+	sql += ` b.SkillerTotal, `
+	sql += ` b.Status, `
+	sql += ` GROUP_CONCAT(CONCAT(c.Code, ':', c.Name)) as CodeName, `
+	sql += ` b.WorkflowId, b.CreateOn ,b.ProcessKey,b.BusinessKey,b.BackRemark,b.IsRestrict,b.Remark`
+	sql += ` from ` + supplierTableName + ` a `
+	sql += ` left join ` + supplierCertTableName + " b on b.SupplierId = a.Id"
+	sql += ` left join OilSupplierCertSub c on c.SupplierCertId = b.Id`
+	sql += ` where ` + where
+	sql += ` GROUP BY a.Id,b.Id`
+	if asc {
+		sql += ` order by ` + orderby + ` ASC `
+	} else {
+		sql += ` order by ` + orderby + ` DESC `
+	}
+	if pageIndex != 0 && itemsPerPage != 0 {
+		sql += ` limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage)
+	}
+	s.DBE.SQL(sql).Find(entitiesPtr)
+
+	resultsSlice, _ = s.DBE.Query(sqlCount)
+
+	if len(resultsSlice) > 0 {
+		results := resultsSlice[0]
+		for _, value := range results {
+			total, _ = strconv.ParseInt(string(value), 10, 64)
+			break
+		}
+	}
+
+	return total
+}
 
 func (s *OilSupplierService) CheckRepeatApplyInfo(supplierTableName, supplierCertTableName, typeCode, SupplierName, CommercialNo, OrganCode, BankAccount, CompanyUrl string, entitiesPtr interface{}) {
 

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

@@ -716,9 +716,10 @@ func (this *OilSupplierController) GetJZPSJoinCertEntityList() {
 	}
 
 	svc := supplier.GetOilSupplierService(utils.DBE)
-	var list []supplier.OilSupplierView
+	var list []supplier.OilSupplierView1
 
-	total := svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, orderby, asc, &list, where)
+	//total := svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, orderby, asc, &list, where)
+	total := svc.GetMyPagingEntitiesWithOrderBytbl3(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, orderby, asc, &list, where)
 
 	var datainfo DataInfo
 	datainfo.Items = list

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierps/index.vue

@@ -1160,6 +1160,12 @@
             label: '备注',
             width: 220,
             sort: true
+          },
+          {
+            prop: 'CodeName',
+            label: '准入范围',
+            width: 220,
+            sort: true
           }
 
         ]
@@ -1270,7 +1276,7 @@
             new Blob([wbout], {
               type: 'application/octet-stream'
             }),
-            'CentralizedReview.xlsx'
+            '集中评审.xlsx'
           )
         } catch (e) {
           if (typeof console !== 'undefined') console.log(e, wbout)