取消重新准入

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

@@ -49,6 +49,52 @@ type OilAnnualAudit struct {
 	OldId            int       `xorm:"INT(10)"`
 }
 
+type Del_OilAnnualAudit struct {
+	Id               int       `xorm:"not null pk autoincr INT(10)"`
+	RecUnitId        string    `xorm:"comment('推荐单位编码') VARCHAR(10)"`
+	CerId            int       `xorm:"comment('准入ID') INT(10)"`
+	Step             int       `xorm:"comment('页面上第几步') INT(10)"`
+	AuditIndex       int       `xorm:"default 0 comment('审批次数') INT(11)"`
+	BusinessKey      string    `xorm:"VARCHAR(255)"`
+	FenbanAudit      int       `xorm:"default 0 comment('分办') INT(10)"`
+	FirstAudit       int       `xorm:"default 0 comment('初审') INT(10)"`
+	SecondAudit      int       `xorm:"default 0 comment('复审') INT(10)"`
+	ThirdAudit       int       `xorm:"default 0 comment('专业科室审批') INT(10)"`
+	AccessCardNo     string    `xorm:"comment('准入证号') VARCHAR(50)"`
+	SupplierTypeName string    `xorm:"comment('准入类别') VARCHAR(50)"`
+	SupplierName     string    `xorm:"comment('企业名称') VARCHAR(50)"`
+	SupplierId       int       `xorm:"comment('企业Id') INT(10)"`
+	Num              string    `xorm:"comment('序号') VARCHAR(50)"`
+	ProjectName      string    `xorm:"comment('工程项目名称') VARCHAR(50)"`
+	Performance      string    `xorm:"comment('履约执行情况') VARCHAR(50)"`
+	WorkRange        string    `xorm:"comment('准入范围') VARCHAR(50)"`
+	Status           string    `xorm:"comment('状态标识') VARCHAR(50)"`
+	BackReason       string    `xorm:"comment('退回原因') VARCHAR(255)"`
+	ApplyTime        time.Time `xorm:"comment('年审日期') DATETIME"`
+	AuditDate        time.Time `xorm:"comment('审核日期') DATETIME"`
+	WorkflowId       string    `xorm:"comment('工作流ID') VARCHAR(50)"`
+	EnterUserId      int       `xorm:"comment('录入员ID') INT(10)"`
+	EnterUserName    string    `xorm:"comment('录入员') VARCHAR(50)"`
+	EnterUserTel     string    `xorm:"comment('录入员电话') VARCHAR(50)"`
+	SCR              string    `xorm:"comment('SCR') VARCHAR(50)"`
+	SCRQ             string    `xorm:"comment('SCRQ') VARCHAR(50)"`
+	SCYJ             string    `xorm:"comment('SCYJ') VARCHAR(50)"`
+	SCJG             string    `xorm:"comment('SCJG') VARCHAR(50)"`
+	SPR              string    `xorm:"comment('SPR') VARCHAR(50)"`
+	SPRQ             string    `xorm:"comment('SPRQ') VARCHAR(50)"`
+	SPYJ             string    `xorm:"comment('SPYJ') VARCHAR(50)"`
+	SPJG             string    `xorm:"comment('SPJG') VARCHAR(50)"`
+	Remark           string    `xorm:"comment('备注') VARCHAR(500)"`
+	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)"`
+	OldId            int       `xorm:"INT(10)"`
+	DeleteDate     time.Time `xorm:"DATETIME"`
+}
+
 type Suppliername struct {
 	Id           int
 	SupplierName string

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

@@ -91,6 +91,94 @@ type OilInfoChange struct {
 	SupplierCertificate string    `xorm:"comment('中石油物资供应商证书') VARCHAR(200)"`
 }
 
+type Del_OilInfoChange struct {
+	Id                  int       `xorm:"<- not null pk autoincr INT(10)"`
+	SupplierId          int       `xorm:"not null comment('供方基本信息表主键') INT(10)"`
+	AccessCardNo        string    `xorm:"comment('准入证号') VARCHAR(50)"`
+	OldAccessCardNo     int       `xorm:"not null default 0 comment('曾用准入证号') INT(10)"`
+	SupplierName        string    `xorm:"comment('企业名称') VARCHAR(255)"`
+	Status              string    `xorm:"comment('状态标识') VARCHAR(10)"`
+	AuditIndex          int       `xorm:"default 0 comment('审批次数') INT(11)"`
+	FenbanAudit         int       `xorm:"default 0 comment('分办') INT(11)"`
+	FirstAudit          int       `xorm:"default 0 comment('初审') INT(11)"`
+	SecondAudit         int       `xorm:"default 0 comment('复审') INT(11)"`
+	Step                int       `xorm:"comment('页面上第几步') INT(10)"`
+	BusinessKey         string    `xorm:"VARCHAR(255)"`
+	WorkFlowId          string    `xorm:"comment('工作流的ID') VARCHAR(50)"`
+	OldSupplierName     string    `xorm:"comment('曾用名') VARCHAR(255)"`
+	SupplierTypeCode    string    `xorm:"comment('准入类别代码（1 物资类，2 基建类，3 技术服务类）') VARCHAR(5)"`
+	SupplierTypeName    string    `xorm:"comment('准入类别名称（1 物资类，2 基建类，3 技术服务类）') VARCHAR(50)"`
+	OilCertificateNo    string    `xorm:"comment('中石油供应商证书号') VARCHAR(50)"`
+	OldOilCertificateNo string    `xorm:"comment('中石油供应商证书号') VARCHAR(50)"`
+	Grade               string    `xorm:"comment('级别') VARCHAR(2)"`
+	OldGrade            string    `xorm:"comment('级别') VARCHAR(2)"`
+	MgrUnit             string    `xorm:"comment('管理单位') VARCHAR(50)"`
+	OldMgrUnit          string    `xorm:"comment('管理单位') VARCHAR(50)"`
+	OperType            string    `xorm:"comment('经营方式') VARCHAR(50)"`
+	OldOperType         string    `xorm:"comment('经营方式') VARCHAR(50)"`
+	Country             string    `xorm:"comment('国家') VARCHAR(20)"`
+	MaunAgent           string    `xorm:"comment('所代理制造商名称') VARCHAR(100)"`
+	ConstructTeam       string    `xorm:"comment('施工队伍名称') VARCHAR(100)"`
+	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)"`
+	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)"`
+	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)"`
+	LegalPerson         string    `xorm:"comment('法定代表人姓名') VARCHAR(20)"`
+	CategoryCode        string    `xorm:"comment('行业类别代码') VARCHAR(10)"`
+	CategoryName        string    `xorm:"comment('行业类别名称') VARCHAR(20)"`
+	RegCapital          float32   `xorm:"default 0 comment('注册资本') FLOAT"`
+	Currency            string    `xorm:"comment('币种') VARCHAR(10)"`
+	ContactName         string    `xorm:"comment('联系人姓名') VARCHAR(20)"`
+	CompanyType         string    `xorm:"comment('公司类型') VARCHAR(20)"`
+	DepositBank         string    `xorm:"comment('开户银行') VARCHAR(50)"`
+	BankAccount         string    `xorm:"comment('银行账号') VARCHAR(50)"`
+	SetupTime           time.Time `xorm:"comment(' 成立时间') DATE"`
+	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(200)"`
+	SpecTypeName        string    `xorm:"comment('业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）') VARCHAR(500)"`
+	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)"`
+	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:"default '0' comment('是否需要进行HSE审查培训') VARCHAR(2)"`
+	PACNumber           string    `xorm:"comment('中石油准入证编号') VARCHAR(50)"`
+	SupplierCertificate string    `xorm:"comment('中石油物资供应商证书') VARCHAR(200)"`
+	DeleteDate          time.Time `xorm:"DATETIME"`
+}
+
 type OilInfoChangeItem struct {
 	Id             int       `xorm:"not null pk autoincr INT(10)"`
 	InfoId         int       `xorm:"comment('信息变更主表Id') INT(10)"`

src/dashoo.cn/backend/api/business/oilsupplier/suppliercertappend/oilsuppliercertappend.go

@@ -39,6 +39,43 @@ type OilSupplierCertAppend struct {
 	OldId          int       `xorm:"INT(10)"`
 }
 
+type Del_OilSupplierCertAppend struct {
+	Id             int       `xorm:"not null pk autoincr INT(10)"`
+	SupplierId     int       `xorm:"not null comment('供方基本信息表主键') INT(10)"`
+	SupplierName   string    `xorm:"comment('供方名称') VARCHAR(200)"`
+	SupplierCertId int       `xorm:"not null comment('供方准入证书信息表主键') INT(10)"`
+	AccessCardNo   string    `xorm:"comment('准入证号') VARCHAR(20)"`
+	ApplyDate      time.Time `xorm:"comment('申请日期') DATETIME"`
+	RecUnitFlag    string    `xorm:"comment('推荐单位的级联Id标记') VARCHAR(200)"`
+	RecUnitId      string    `xorm:"comment('推荐单位编码') VARCHAR(50)"`
+	RecUnitName    string    `xorm:"comment('推荐单位名称') VARCHAR(200)"`
+	AppendType     string    `xorm:"comment('增项类别(1 物资类，2 基建类，3 技术服务类)') VARCHAR(10)"`
+	InStyle        string    `xorm:"default '1' comment('准入方式') VARCHAR(10)"`
+	DenyReason     string    `xorm:"comment('退回原因') VARCHAR(50)"`
+	AuditDate      time.Time `xorm:"comment('审核日期') DATETIME"`
+	Status         string    `xorm:"comment('状态标识') VARCHAR(50)"`
+	WorkFlowId     string    `xorm:"default '0' comment('工作流的ID') VARCHAR(255)"`
+	AuditIndex     int       `xorm:"default 0 comment('审批次数') INT(11)"`
+	BusinessKey    string    `xorm:"VARCHAR(255)"`
+	ProcessKey     string    `xorm:"VARCHAR(255)"`
+	Remark         string    `xorm:"comment('备注') VARCHAR(500)"`
+	IsDelete       int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+	Step           int       `xorm:"comment('页面上第几步') INT(10)"`
+	FirstAudit     int       `xorm:"default 0 comment('初审') INT(10)"`
+	SecondAudit    int       `xorm:"default 0 comment('复审') INT(10)"`
+	ThirdAudit     int       `xorm:"default 0 comment('专业科室审批') INT(10)"`
+	FourthAudit    int       `xorm:"default 0 comment('集中审批') 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)"`
+	OldId          int       `xorm:"INT(10)"`
+	DeleteDate     time.Time `xorm:"DATETIME"`
+}
+
+
 type OilSupplierCertAppendTodo struct {
 	Id             int       `xorm:"not null pk autoincr INT(10)"`
 	SupplierName   string    `xorm:"VARCHAR(100)"`

src/dashoo.cn/backend/api/controllers/base.go

@@ -265,6 +265,9 @@ var (
 	DelOilSupplierFileName                   string = "Del_OilSupplierFile"
 	DelOilPaymentInfoName                    string = "Del_OilPaymentInfo"
 	DelOilSupplierCertSubName                string = "Del_OilSupplierCertSub"
+	DelOilSupplierCertAppendName             string = "Del_OilSupplierCertAppend"
+	DelOilAnnualAuditName                    string = "Del_OilAnnualAudit"
+	DelOilInfoChangeName                     string = "Del_OilInfoChange"
 )
 
 //分页信息及数据

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

@@ -4,9 +4,12 @@ import (
 	"dashoo.cn/backend/api/business/audithistory"
 	"dashoo.cn/backend/api/business/codecsequence"
 	msg2 "dashoo.cn/backend/api/business/msg"
+	"dashoo.cn/backend/api/business/oilsupplier/annualaudit"
+	"dashoo.cn/backend/api/business/oilsupplier/infochange"
 	"dashoo.cn/backend/api/business/oilsupplier/oilactivity"
 	"dashoo.cn/backend/api/business/oilsupplier/oilcostmanage"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
+	"dashoo.cn/backend/api/business/oilsupplier/suppliercertappend"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
 	"dashoo.cn/backend/api/business/oilsupplier/supplierfile"
 	"dashoo.cn/backend/api/business/organize"
@@ -1775,6 +1778,70 @@ func (this *OilSupplierCertController) ReInput() {
 				return
 			}
 
+			// 删除增项记录
+			var modelapp []suppliercertappend.Del_OilSupplierCertAppend
+			whereapp := "SupplierCertId=" + strconv.Itoa(model[0].Id)
+			var sqlapp string
+			sqlapp = "select * from " + OilSupplierCertAppendName + " where " + whereapp
+			utils.DBE.SQL(sqlapp).Find(&modelapp)
+
+			err = svc.DeleteEntityBytbl(OilSupplierCertAppendName, whereapp)
+			if err != nil {
+				session.Rollback()
+				errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
+				errinfo.Code = -1
+				this.Data["json"] = &errinfo
+				this.ServeJSON()
+				return
+			}
+
+			for idx, _ := range modelapp {
+				modelapp[idx].DeleteDate = time.Now()
+			}
+
+			_, err = svc.InsertEntityBytbl(DelOilSupplierCertAppendName, &modelapp)
+
+			if err != nil {
+				session.Rollback()
+				errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
+				errinfo.Code = -1
+				this.Data["json"] = &errinfo
+				this.ServeJSON()
+				return
+			}
+
+			// 删除年审记录
+			var modelann []annualaudit.Del_OilAnnualAudit
+			whereann := "CerId=" + strconv.Itoa(model[0].Id)
+			var sqlann string
+			sqlann = "select * from " + OilAnnualAuditName + " where " + whereann
+			utils.DBE.SQL(sqlann).Find(&modelann)
+
+			err = svc.DeleteEntityBytbl(OilAnnualAuditName, whereann)
+			if err != nil {
+				session.Rollback()
+				errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
+				errinfo.Code = -1
+				this.Data["json"] = &errinfo
+				this.ServeJSON()
+				return
+			}
+
+			for idx, _ := range modelann {
+				modelann[idx].DeleteDate = time.Now()
+			}
+
+			_, err = svc.InsertEntityBytbl(DelOilAnnualAuditName, &modelann)
+
+			if err != nil {
+				session.Rollback()
+				errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
+				errinfo.Code = -1
+				this.Data["json"] = &errinfo
+				this.ServeJSON()
+				return
+			}
+
 			// 删除准入范围
 			var certsup []suppliercertsub.Del_OilSupplierCertSub
 			wheresup := "SupplierCertId=" + strconv.Itoa(model[0].Id)
@@ -1874,6 +1941,38 @@ func (this *OilSupplierCertController) ReInput() {
 			return
 		}
 
+		// 删除信息变更
+		var delinfo []infochange.Del_OilInfoChange
+		whereinfo := "SupplierId=" + strconv.Itoa(model[0].SupplierId)
+		var sqlinfo string
+		sqlinfo = "select * from " + OilInfoChangeName + " where " + whereinfo
+		utils.DBE.SQL(sqlinfo).Find(&delinfo)
+
+		err = svc.DeleteEntityBytbl(OilInfoChangeName, whereinfo)
+		if err != nil {
+			session.Rollback()
+			errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+			return
+		}
+
+		for idx, _ := range delinfo {
+			delinfo[idx].DeleteDate = time.Now()
+		}
+
+		_, err = svc.InsertEntityBytbl(DelOilInfoChangeName, &delinfo)
+
+		if err != nil {
+			session.Rollback()
+			errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+			return
+		}
+
 	}
 
 	err = session.Commit()