修改二级单位审核及新增需求

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

@@ -6,7 +6,7 @@ import (
 
 type OilCorporateInfo struct {
 	Id               int       `xorm:"not null pk autoincr INT(10)"`
-	UserId           int       `xorm:"comment('供方用户表主键') not null 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)"`
@@ -49,7 +49,12 @@ type OilCorporateInfo struct {
 	CompanyUrl       string    `xorm:"comment('公司网址') VARCHAR(20)"`
 	Remark           string    `xorm:"comment('备注') VARCHAR(500)"`
 	CheckStatus      int       `xorm:"default 0 comment('二级单位审核状态，0：未通过，1：通过') INT(1)"`
+	CheckUserId      int       `xorm:"comment('审核人Id') INT(10)"`
 	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)"`
@@ -65,9 +70,10 @@ type OilCorporateInfo struct {
 	ModifiedBy       string    `xorm:"VARCHAR(50)"`
 }
 
-type SomeUserInfo struct {
-	UserName  string //账号/Email
-	Realname  string //用户名
-	UserPass  string //密码
-	Telephone string //手机号
+//更新注册公司信息
+type UpdateOilCorporateInfo struct {
+	UserId       int
+	CheckStatus  int
+	CreateBy     string
+	CreateUserId int
 }

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

@@ -1,7 +1,11 @@
 package register
 
 import (
+	"strconv"
+
 	. "dashoo.cn/backend/api/mydb"
+	"dashoo.cn/utils"
+	. "dashoo.cn/utils/db"
 	"github.com/go-xorm/xorm"
 )
 
@@ -14,3 +18,32 @@ func GetOilCorporateInfoService(xormEngine *xorm.Engine) *OilCorporateInfoServic
 	s.DBE = xormEngine
 	return s
 }
+
+//获取公司信息list
+func (s *OilCorporateInfoService) GetCompanyListByWhere(pageIndex, itemsPerPage int64, order, table string, where string) (int64, []OilCorporateInfo) {
+	var err error
+	var total int64
+	if where == "" {
+		where = " 1=1 "
+	}
+	//获取总记录数
+	sqlCount := `select count(*) from ` + table + ` where ` + where
+	var sql string
+	sql = `select * from ` + table + ` where ` + where + ` order by ` + order + ` limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage)
+
+	List := make([]OilCorporateInfo, 0)
+
+	utils.DBE.Sql(sql).Find(&List)
+
+	resultsSlice, err := s.DBE.Query(sqlCount)
+	LogError(err)
+	if len(resultsSlice) > 0 {
+		results := resultsSlice[0]
+		for _, value := range results {
+			total, err = strconv.ParseInt(string(value), 10, 64)
+			LogError(err)
+			break
+		}
+	}
+	return total, List
+}

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

@@ -2,6 +2,7 @@ package register
 
 import (
 	"encoding/json"
+	"fmt"
 	"strconv"
 	"time"
 
@@ -22,6 +23,36 @@ type OilCorporateInfoController struct {
 	BaseController
 }
 
+// @Title 获取公司列表
+// @Description 获取公司列表
+// @Success 200 {object} list
+// @router /getcompanylist [get]
+func (this *OilCorporateInfoController) GetCompanyList() {
+	page := this.GetPageInfoForm()
+
+	SupplierName := this.GetString("Name")
+
+	where := " 1=1 "
+
+	if SupplierName != "" {
+		where = where + " and SupplierName like '%" + SupplierName + "%' "
+	}
+
+	where = where + " and CheckUserId = " + this.User.Id
+
+	svc := register.GetOilCorporateInfoService(utils.DBE)
+	var list []register.OilCorporateInfo
+	total, list := svc.GetCompanyListByWhere(page.CurrentPage, page.Size, "Id desc", "OilCorporateInfo", where)
+
+	var datainfo DataInfo
+	datainfo.Items = list
+	datainfo.CurrentItemCount = total
+	datainfo.PageIndex = page.CurrentPage
+	datainfo.ItemsPerPage = page.Size
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
 // @Title 获取公司信息
 // @Description 根据公司名以及本公司的注册用户两个条件从供方信息表和公司注册表依次获取公司信息
 // @Success	200	{object} controllers.Request
@@ -69,33 +100,94 @@ func (this *OilCorporateInfoController) GetSupplierName() {
 }
 
 // @Title 注册
-// @Description 新增公司以及用户信息
+// @Description 新增公司信息
 // @Success	200	{object} controllers.Request
 // @router /addentity [post]
 func (this *OilCorporateInfoController) AddEntity() {
 
 	var model register.OilCorporateInfo
-	var userInfo register.SomeUserInfo
 	var errinfo ErrorDataInfo
 
 	var jsonBlob = this.Ctx.Input.RequestBody
 	json.Unmarshal(jsonBlob, &model)
-	json.Unmarshal(jsonBlob, &userInfo)
+
+	model.CreateOn = time.Now()
+	model.CheckUserId = 284
+
+	svc := register.GetOilCorporateInfoService(utils.DBE)
+	_, err2 := svc.InsertEntityBytbl("OilCorporateInfo", &model)
+
+	if err2 == nil {
+		errinfo.Message = "注册成功！"
+		errinfo.Code = 0
+		errinfo.Item = model.Id
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "注册失败！"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+
+}
+
+// @Title 删除
+// @Description 删除
+// @Param	id	"需要删除的Id"
+// @Success 200 {object} ErrorInfo
+// @Failure 403 :id 为空
+// @router /deleteinfo/:id [delete]
+func (this *OilCorporateInfoController) DeleteInfo() {
+	id := this.Ctx.Input.Param(":id")
+	where := " Id = " + id
+
+	svc := register.GetOilCorporateInfoService(utils.DBE)
+	err := svc.DeleteEntityBytbl("OilCorporateInfo", where)
+	var errinfo ErrorInfo
+	if err == nil {
+		errinfo.Message = "审核未通过！"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "操作失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
+// @Title 添加新用户
+// @Description 添加新用户信息
+// @Success	200	{object} controllers.Request
+// @router /adduser [post]
+func (this *OilCorporateInfoController) AddUser() {
+
+	var model register.OilCorporateInfo
+	var errinfo ErrorDataInfo
+
+	var jsonBlob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonBlob, &model)
+
+	fmt.Println("***model:", model)
 
 	//注册用户Base_User
 	var userentity userRole.Base_User
-	userentity.Username = userInfo.UserName
-	userentity.Realname = userInfo.Realname
-	userentity.Telephone = userInfo.Telephone
+	userentity.Username = model.UserName
+	userentity.Realname = model.UserRealName
+	userentity.Telephone = model.UserTelephone
 	userentity.Roleid = 10000120 //企业用户
 	userentity.Companyid = "0"
 	userentity.IsCompanyUser = 1
 	userentity.Departmentid = "100000171"
 	userentity.Departmentname = "供方企业"
+	userentity.Createon = time.Now()
+	//	userentity.CreateBy = this.User.Realname
 	userentity.Createuserid = 284
 
 	//处理密码
-	pwd, key, errrk := utils.TripleDesEncrypt(userInfo.UserPass)
+	pwd, key, errrk := utils.TripleDesEncrypt(model.UserPass)
 	if errrk != nil {
 		errinfo.Message = "密码格式不对！" + utils.AlertProcess(errrk.Error())
 		errinfo.Code = -2
@@ -103,47 +195,74 @@ func (this *OilCorporateInfoController) AddEntity() {
 		this.ServeJSON()
 		return
 	}
+
 	userentity.Userpassword = pwd
 	userentity.Publickey = key
 	userentity.Auditstatus = 1
 	userentity.AccCode = "s5OVE"
 
 	userSvc := userRole.GetUserService(utils.DBE)
+
 	// 添加新用户
 	err := userSvc.AddUser(&userentity)
 
 	if err == nil {
 		// 添加企业用户角色
 		utils.RBAC.AddRoleForUserInDomain("uid_"+strconv.Itoa(userentity.Id), "rid_10000120", utils.DOMAIN)
-
-		// 添加公司信息
+		// 更新企业信息
 		model.UserId = userentity.Id
-		model.CreateOn = time.Now()
+		model.CheckStatus = 1 //通过审核
 		model.CreateBy = userentity.Realname
 		model.CreateUserId = userentity.Id
-
-		svc := register.GetOilCorporateInfoService(utils.DBE)
-		_, err2 := svc.InsertEntityBytbl("OilCorporateInfo", &model)
-
+		svcRegister := register.GetOilCorporateInfoService(utils.DBE)
+		//删除
+		where := " Id = " + strconv.Itoa(model.Id)
+		err2 := svcRegister.DeleteEntityBytbl("OilCorporateInfo", where)
 		if err2 == nil {
-			errinfo.Message = "注册成功！"
-			errinfo.Code = 0
-			errinfo.Item = model.Id
-			this.Data["json"] = &errinfo
-			this.ServeJSON()
+			//插入数据
+			_, err3 := svcRegister.InsertEntityBytbl("OilCorporateInfo", &model)
+			if err3 == nil {
+				errinfo.Message = "审核通过！"
+				errinfo.Code = 0
+				errinfo.Item = model.Id
+				this.Data["json"] = &errinfo
+				this.ServeJSON()
+			} else {
+				errinfo.Message = "操作失败！"
+				errinfo.Code = -1
+				this.Data["json"] = &errinfo
+				this.ServeJSON()
+			}
 		} else {
-			errinfo.Message = "注册失败！" + utils.AlertProcess(err.Error())
-
-			//根据Id删除已注册的账号信息
-			_ = userSvc.Delete(userentity.Id)
-
+			errinfo.Message = "操作失败！"
 			errinfo.Code = -1
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 		}
 
+		//		var model2 register.UpdateOilCorporateInfo
+		//		model2.UserId = userentity.Id
+		//		model2.CheckStatus = 1 //通过审核
+		//		model2.CreateBy = userentity.Realname
+		//		model2.CreateUserId = userentity.Id
+		//		svcRegister := register.GetOilCorporateInfoService(utils.DBE)
+		//		Id := strconv.Itoa(model.Id)
+		//		var cols []string = []string{"UserId", "CheckStatus", "CreateBy", "CreateUserId"}
+		//		err2 := svcRegister.UpdateEntityBytbl("OilCorporateInfo", Id, &model2, cols)
+		//		if err2 == nil {
+		//			errinfo.Message = "审核通过！"
+		//			errinfo.Code = 0
+		//			errinfo.Item = model.Id
+		//			this.Data["json"] = &errinfo
+		//			this.ServeJSON()
+		//		} else {
+		//			errinfo.Message = "操作失败！"
+		//			errinfo.Code = -1
+		//			this.Data["json"] = &errinfo
+		//			this.ServeJSON()
+		//		}
 	} else {
-		errinfo.Message = "注册失败，账号已存在！"
+		errinfo.Message = "操作失败！"
 		errinfo.Code = -1
 		this.Data["json"] = &errinfo
 		this.ServeJSON()

src/dashoo.cn/frontend_web/src/pages/signup.vue

@@ -327,6 +327,15 @@
           }
         }
 
+        //组织机构代码验证
+        let re4 = /^[0-9A-Z]\d{17}$/
+        if (!re4.test(_this.formData.OrganCode)) {
+          this.$alert('请填写正确的组织机构代码！', '提示', {
+            confirmButtonText: '确定',
+          })
+          return
+        }
+
         //身份证号验证
         let re1 = /(^\d{18}$)|(^\d{17}(\d|X|x)$)/
         if (!re1.test(_this.formData.LegalPersonId)) {