后:重新入库

src/dashoo.cn/backend/api/business/register/oilcorporateinfo.go

@@ -75,6 +75,148 @@ type OilCorporateInfo struct {
 	ModifiedBy       string    `xorm:"VARCHAR(50)"`
 }
 
+type Del_OilCorporateInfo struct {
+	Id               int       `xorm:"not null pk autoincr INT(10)"`
+	UserId           int       `xorm:"comment('供方用户表主键') INT(10)"`
+	SupplierName     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)"`
+	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(200)"`
+	DetailAddress    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)"`
+	BusinessScope    string    `xorm:"comment('营业范围') TEXT"`
+	LegalPerson      string    `xorm:"comment('法定代表人姓名') VARCHAR(20)"`
+	LegalPersonId    string    `xorm:"comment('法定代表人身份证号') VARCHAR(18)"`
+	LegalPersonURL   string    `xorm:"comment('法定代表人身份证扫描件地址') VARCHAR(500)"`
+	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)"`
+	ContactId        string    `xorm:"comment('联系人身份证号') VARCHAR(18)"`
+	ContactURL       string    `xorm:"comment('联系人身份证扫描件地址') VARCHAR(500)"`
+	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)"`
+	Remark           string    `xorm:"comment('备注') VARCHAR(500)"`
+	CheckStatus      int       `xorm:"default 0 comment('二级单位审核状态，0：未通过，1：通过') INT(1)"`
+	CheckUserId      string    `xorm:"comment('审核人Id') VARCHAR(50)"`
+	CheckUserName    string    `xorm:"comment('审核人姓名') VARCHAR(50)"`
+	CheckUnitId      int       `xorm:"comment('审批二级单位Id') INT(10)"`
+	CheckUnitName    string    `xorm:"comment('审核单位') VARCHAR(50)"`
+	IsDelete         int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+	UserName         string    `xorm:"comment('登录账号/用户名') VARCHAR(50)"`
+	UserRealName     string    `xorm:"comment('用户真实姓名') VARCHAR(50)"`
+	UserTelephone    string    `xorm:"comment('用户手机号') VARCHAR(20)"`
+	UserPass         string    `xorm:"comment('用户密码') VARCHAR(512)"`
+	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)"`
+	CardNoType1      int	   `xorm:"comment('法人有效证件类型,0身份证,1护照') INT(2)"`
+	CardNoType2      int	   `xorm:"comment('联系人有效证件类型,0身份证,1护照') INT(2)"`
+	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)"`
+	DeleteDate       time.Time `xorm:"DATETIME"`
+}
+
+type Del_Base_User struct {
+	Id                    int       `xorm:"not null pk autoincr INT(10)"`
+	AccCode               string    `xorm:"VARCHAR(50)"`
+	Code                  string    `xorm:"VARCHAR(50)"`
+	Username              string    `xorm:"VARCHAR(50)"`
+	UserNo                string    `xorm:"VARCHAR(50)"`
+	Realname              string    `xorm:"VARCHAR(50)"`
+	Roleid                int       `xorm:"INT(10)"`
+	Securitylevel         int       `xorm:"INT(10)"`
+	Userfrom              string    `xorm:"VARCHAR(50)"`
+	Companyid             string    `xorm:"VARCHAR(50)"`
+	Companyname           string    `xorm:"VARCHAR(50)"`
+	Departmentid          string    `xorm:"VARCHAR(50)"`
+	Departmentname        string    `xorm:"VARCHAR(50)"`
+	Workgroupid           string    `xorm:"VARCHAR(50)"`
+	Workgroupname         string    `xorm:"VARCHAR(50)"`
+	Workcategory          string    `xorm:"VARCHAR(50)"`
+	Duty                  string    `xorm:"VARCHAR(50)"`
+	Title                 string    `xorm:"VARCHAR(50)"`
+	Gender                string    `xorm:"VARCHAR(50)"`
+	Birthday              string    `xorm:"VARCHAR(50)"`
+	Mobile                string    `xorm:"VARCHAR(50)"`
+	Telephone             string    `xorm:"VARCHAR(50)"`
+	Email                 string    `xorm:"VARCHAR(100)"`
+	Oicq                  string    `xorm:"VARCHAR(50)"`
+	Homeaddress           string    `xorm:"VARCHAR(200)"`
+	Userpassword          string    `xorm:"VARCHAR(512)"`
+	Changepassworddate    time.Time `xorm:"DATETIME"`
+	Communicationpassword string    `xorm:"VARCHAR(512)"`
+	Publickey             string    `xorm:"VARCHAR(512)"`
+	Signedpassword        string    `xorm:"VARCHAR(512)"`
+	Lang                  string    `xorm:"VARCHAR(50)"`
+	Theme                 string    `xorm:"VARCHAR(50)"`
+	Allowstarttime        time.Time `xorm:"DATETIME"`
+	Allowendtime          time.Time `xorm:"DATETIME"`
+	Lockstartdate         time.Time `xorm:"DATETIME"`
+	Lockenddate           time.Time `xorm:"DATETIME"`
+	Firstvisit            time.Time `xorm:"DATETIME"`
+	Previousvisit         time.Time `xorm:"DATETIME"`
+	Lastvisit             time.Time `xorm:"DATETIME"`
+	Logoncount            int       `xorm:"not null default 0 INT(10)"`
+	Isstaff               int       `xorm:"not null default 1 INT(10)"`
+	Useronline            int       `xorm:"not null default 1 INT(10)"`
+	Isvisible             int       `xorm:"not null default 1 INT(10)"`
+	Openid                string    `xorm:"VARCHAR(50)"`
+	Ipaddress             string    `xorm:"VARCHAR(50)"`
+	Macaddress            string    `xorm:"VARCHAR(50)"`
+	Question              string    `xorm:"VARCHAR(50)"`
+	Answerquestion        string    `xorm:"VARCHAR(200)"`
+	Useraddressid         int       `xorm:"INT(10)"`
+	Enabled               int       `xorm:"not null default 1 INT(10)"`
+	Auditstatus           int       `xorm:"INT(10)"`
+	Deletionstatecode     int       `xorm:"not null default 0 INT(10)"`
+	Sortcode              int       `xorm:"INT(10)"`
+	Description           string    `xorm:"VARCHAR(200)"`
+	Createon              time.Time `xorm:"DATETIME created" form:"-" json:"-"`
+	Createuserid          int       `xorm:"INT(10)" form:"-" json:"-"`
+	Createby              string    `xorm:"VARCHAR(50)" form:"-" json:"-"`
+	Modifiedon            time.Time `xorm:"DATETIME updated" form:"-" json:"-"`
+	Modifieduserid        int       `xorm:"INT(10)" form:"-" json:"-"`
+	Modifiedby            string    `xorm:"VARCHAR(50)" form:"-" json:"-"`
+	IsCompanyUser         int       `xorm:"int(11) null default null"`
+	QRCode                string    `xorm:"VARCHAR(50)"`
+	Photo                 string    `xorm:"VARCHAR(255)"`
+	Superior              string    `xorm:"VARCHAR(50)"`
+	UnitId                int       `xorm:"INT(11)"`
+	Unit                  string    `xorm:"VARCHAR(50)"`
+	DeleteDate       	  time.Time `xorm:"DATETIME"`
+}
+
 //更新注册公司信息
 type UpdateOilCorporateInfo struct {
 	UserId       int

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

@@ -266,6 +266,8 @@ var (
 	OilCatalogName                 string = "OilCatalog"     //目录表
 	DelOilSupplierCertName         string = "Del_OilSupplierCert"
 	DelOilSupplierName             string = "Del_OilSupplier"
+	DelOilCorporateInfoName        string = "Del_OilCorporateInfo"
+	DelBaseNameName        		   string = "Del_Base_User"
 	DelOilSupplierFileName         string = "Del_OilSupplierFile"
 	DelOilPaymentInfoName          string = "Del_OilPaymentInfo"
 	DelOilSupplierCertSubName      string = "Del_OilSupplierCertSub"

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

@@ -16,6 +16,7 @@ import (
 	"dashoo.cn/backend/api/business/oilsupplier/supplierlog"
 	"dashoo.cn/backend/api/business/organize"
 	"dashoo.cn/backend/api/business/paymentinfo"
+	"dashoo.cn/backend/api/business/register"
 	baseparameter "dashoo.cn/business2/parameter"
 	"encoding/json"
 	"fmt"
@@ -984,6 +985,11 @@ func (this *OilSupplierCertController) RecallApply() {
 		panic("权限错误，仅申请人可撤回当前申请！")
 	}
 
+	date := supplierCertEntity.CreateOn.Format("2006-01-02 15:04:05")
+	if date < "2021-03-05 00:00:00" {
+		panic("当前申请不可撤回！")
+	}
+
 	svcPaymentInfo := paymentinfo.GetPaymentService(utils.DBE)
 	var paymentInfo paymentinfo.OilPaymentInfo
 	wherePay := " SrcId=" + certId + " and SupplierId=" + strconv.Itoa(supplierCertEntity.SupplierId) + " and SupplierCertId=" + certId
@@ -1672,7 +1678,7 @@ func (this *OilSupplierCertController) ChangeSupplierStatus() {
 }
 
 // @Title 更新Inflag状态
-// @Description 删除所有关联表并存到del表
+// @Description 确认重新准入按钮,删除所有关联表并存到del表
 // @Success	200	{object} controllers.Request
 // @router /reinput/:id [post]
 func (this *OilSupplierCertController) ReInput() {
@@ -1687,6 +1693,8 @@ func (this *OilSupplierCertController) ReInput() {
 		return
 	}
 
+	needWorkflowId := [] string{}
+
 	session := utils.DBE.NewSession()
 	svc := suppliercert.GetOilSupplierCertSession(session)
 	defer func() {
@@ -1722,7 +1730,7 @@ func (this *OilSupplierCertController) ReInput() {
 
 			item.DeleteDate = time.Now()
 			_, err = svc.InsertEntityBytbl(DelOilSupplierCertName, &item)
-
+			needWorkflowId = append(needWorkflowId, item.WorkflowId)
 			if err != nil {
 				session.Rollback()
 				errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
@@ -1733,36 +1741,36 @@ func (this *OilSupplierCertController) ReInput() {
 			}
 
 			// 交费信息
-			var delpay []paymentinfo.Del_OilPaymentInfo
-			wherepay := "SupplierCertId=" + strconv.Itoa(model[0].Id)
-			var sqlpay string
-			sqlpay = "select * from " + OilPaymentInfoName + " where " + wherepay
-			utils.DBE.SQL(sqlpay).Find(&delpay)
-
-			err = svc.DeleteEntityBytbl(OilPaymentInfoName, wherepay)
-			if err != nil {
-				session.Rollback()
-				errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
-				errinfo.Code = -1
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-				return
-			}
-
-			for idx, _ := range delpay {
-				delpay[idx].DeleteDate = time.Now()
-			}
-
-			_, err = svc.InsertEntityBytbl(DelOilPaymentInfoName, &delpay)
-
-			if err != nil {
-				session.Rollback()
-				errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
-				errinfo.Code = -1
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-				return
-			}
+			//var delpay []paymentinfo.Del_OilPaymentInfo
+			//wherepay := "SupplierCertId=" + strconv.Itoa(model[0].Id)
+			//var sqlpay string
+			//sqlpay = "select * from " + OilPaymentInfoName + " where " + wherepay
+			//utils.DBE.SQL(sqlpay).Find(&delpay)
+			//
+			//err = svc.DeleteEntityBytbl(OilPaymentInfoName, wherepay)
+			//if err != nil {
+			//	session.Rollback()
+			//	errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
+			//	errinfo.Code = -1
+			//	this.Data["json"] = &errinfo
+			//	this.ServeJSON()
+			//	return
+			//}
+			//
+			//for idx, _ := range delpay {
+			//	delpay[idx].DeleteDate = time.Now()
+			//}
+			//
+			//_, err = svc.InsertEntityBytbl(DelOilPaymentInfoName, &delpay)
+			//
+			//if err != nil {
+			//	session.Rollback()
+			//	errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
+			//	errinfo.Code = -1
+			//	this.Data["json"] = &errinfo
+			//	this.ServeJSON()
+			//	return
+			//}
 
 			// 删除增项记录
 			var modelapp []suppliercertappend.Del_OilSupplierCertAppend
@@ -1781,8 +1789,9 @@ func (this *OilSupplierCertController) ReInput() {
 				return
 			}
 
-			for idx, _ := range modelapp {
+			for idx, app := range modelapp {
 				modelapp[idx].DeleteDate = time.Now()
+				needWorkflowId = append(needWorkflowId, app.WorkFlowId)
 			}
 
 			_, err = svc.InsertEntityBytbl(DelOilSupplierCertAppendName, &modelapp)
@@ -1813,8 +1822,10 @@ func (this *OilSupplierCertController) ReInput() {
 				return
 			}
 
-			for idx, _ := range modelann {
+			for idx, app := range modelann {
 				modelann[idx].DeleteDate = time.Now()
+				needWorkflowId = append(needWorkflowId, app.WorkflowId)
+
 			}
 
 			_, err = svc.InsertEntityBytbl(DelOilAnnualAuditName, &modelann)
@@ -1894,6 +1905,64 @@ func (this *OilSupplierCertController) ReInput() {
 			return
 		}
 
+		// 删除注册信息
+		var corporateInfo register.Del_OilCorporateInfo
+		where = "CommercialNo = '" + modelsupp.CommercialNo + "'"
+		sql = "select * from " + OilCorporateInfoName + " where " + where
+		utils.DBE.SQL(sql).Get(&corporateInfo)
+
+		if corporateInfo.Id > 0 {
+			err = svc.DeleteEntityBytbl(OilCorporateInfoName, where)
+			if err != nil {
+				session.Rollback()
+				errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
+				errinfo.Code = -1
+				this.Data["json"] = &errinfo
+				this.ServeJSON()
+				return
+			}
+			corporateInfo.DeleteDate = time.Now()
+			_, err = svc.InsertEntityBytbl(DelOilCorporateInfoName, &corporateInfo)
+
+			if err != nil {
+				session.Rollback()
+				errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
+				errinfo.Code = -1
+				this.Data["json"] = &errinfo
+				this.ServeJSON()
+				return
+			}
+		}
+
+		// 删除用户信息
+		var user register.Del_Base_User
+		where = "Id = " + strconv.Itoa(corporateInfo.UserId)
+		sql = "select * from " + BaseUserName + " where " + where
+		utils.DBE.SQL(sql).Get(&user)
+
+		if corporateInfo.Id > 0 {
+			err = svc.DeleteEntityBytbl(BaseUserName, where)
+			if err != nil {
+				session.Rollback()
+				errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
+				errinfo.Code = -1
+				this.Data["json"] = &errinfo
+				this.ServeJSON()
+				return
+			}
+			user.DeleteDate = time.Now()
+			_, err = svc.InsertEntityBytbl(DelBaseNameName, &user)
+
+			if err != nil {
+				session.Rollback()
+				errinfo.Message = "提交失败！" + utils.AlertProcess(err.Error())
+				errinfo.Code = -1
+				this.Data["json"] = &errinfo
+				this.ServeJSON()
+				return
+			}
+		}
+
 		// 删除企业资质
 		var delfile []supplierfile.Del_OilSupplierFile
 		wheref := "SupplierId=" + strconv.Itoa(model[0].SupplierId)
@@ -1943,8 +2012,9 @@ func (this *OilSupplierCertController) ReInput() {
 			return
 		}
 
-		for idx, _ := range delinfo {
+		for idx, app := range delinfo {
 			delinfo[idx].DeleteDate = time.Now()
+			needWorkflowId = append(needWorkflowId, app.WorkFlowId)
 		}
 
 		_, err = svc.InsertEntityBytbl(DelOilInfoChangeName, &delinfo)
@@ -1962,12 +2032,11 @@ func (this *OilSupplierCertController) ReInput() {
 
 	err = session.Commit()
 	if err == nil {
-		//TODO: 删除工作流， 年审、增项、信息变更等有流程的都要删除
 		activitiService := workflow.GetActivitiService(utils.DBE)
 		var deleteProcessVM workflow.DeleteProcessVM
-		for _, supplierCertItem := range model {
-			if supplierCertItem.WorkflowId != "" && supplierCertItem.WorkflowId != "0" && supplierCertItem.InFlag == "3" {
-				deleteProcessVM.ProcessInstanceId = supplierCertItem.WorkflowId
+		for _, workflowId := range needWorkflowId {
+			if workflowId != "" && workflowId != "0"{
+				deleteProcessVM.ProcessInstanceId = workflowId
 				deleteProcessVM.DeleteReason = "企业重新入库"
 				activitiService.DeleteComplete(deleteProcessVM)
 			}