注册审核

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

@@ -14,3 +14,7 @@ type OilActivity struct {
 	CreateBy     string    `xorm:"VARCHAR(50)"`
 }
 
+const (
+	// 业务--注册
+	REGISTER string = "REGISTER"
+)

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

@@ -50,7 +50,6 @@ func (this *OilCorporateInfoController) GetCompanyList() {
 		where = where + " and CheckUserId like '%" + this.User.Id + "%'"
 	}
 
-
 	svc := register.GetOilCorporateInfoService(utils.DBE)
 	var list []register.OilCorporateInfo
 	total, list := svc.GetCompanyListByWhere(page.CurrentPage, page.Size, "Id desc", "OilCorporateInfo", where)
@@ -102,8 +101,8 @@ func (this *OilCorporateInfoController) GetCompanyInfo() {
 
 	if len(model) < 1 { //若供方表没有公司信息
 		model, _ = svcRegister.DBE.QueryString(sql2)
-		if model!= nil{
-			model[0]["Remark"]=""
+		if model != nil {
+			model[0]["Remark"] = ""
 		}
 	}
 
@@ -119,21 +118,20 @@ func (this *OilCorporateInfoController) GetCompanyInfo() {
 // @router /getsuppliername [get]
 func (this *OilCorporateInfoController) GetSupplierName() {
 	suppliername := this.GetString("suppliername")
-	sqlStr := "SELECT SupplierName FROM OilCorporateInfo where SupplierName='"+suppliername+"' and CheckStatus!='-1'";
+	sqlStr := "SELECT SupplierName FROM OilCorporateInfo where SupplierName='" + suppliername + "' and CheckStatus!='-1'";
 	svc := register.GetOilCorporateInfoService(utils.DBE)
 	list, _ := svc.DBE.QueryString(sqlStr)
 	var errorInfo ErrorDataInfo
-	if list!=nil{
+	if list != nil {
 		errorInfo.Item = true
 		this.Data["json"] = &errorInfo
 		this.ServeJSON()
-	}else{
+	} else {
 		errorInfo.Item = false
 		this.Data["json"] = &errorInfo
 		this.ServeJSON()
 	}
 
-
 }
 
 // @Title 获取已注册的统一社会信用代码
@@ -142,15 +140,15 @@ func (this *OilCorporateInfoController) GetSupplierName() {
 // @router /getcommercialno [get]
 func (this *OilCorporateInfoController) GetCommercialNo() {
 	commercialno := this.GetString("commercialno")
-	sqlStr := "SELECT CommercialNo FROM OilCorporateInfo where CommercialNo='"+commercialno+"' and CheckStatus!='-1'";
+	sqlStr := "SELECT CommercialNo FROM OilCorporateInfo where CommercialNo='" + commercialno + "' and CheckStatus!='-1'";
 	svc := register.GetOilCorporateInfoService(utils.DBE)
 	list, _ := svc.DBE.QueryString(sqlStr)
 	var errorInfo ErrorDataInfo
-	if list!=nil{
+	if list != nil {
 		errorInfo.Item = true
 		this.Data["json"] = &errorInfo
 		this.ServeJSON()
-	}else{
+	} else {
 		errorInfo.Item = false
 		this.Data["json"] = &errorInfo
 		this.ServeJSON()
@@ -212,12 +210,10 @@ func (this *OilCorporateInfoController) AddEntity() {
 		return
 	}
 
-
-
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	businessKey := strconv.Itoa(model.Id)
 	result := "1"
-	processInstanceId := svcActiviti.StartProcess2(workflow.OIL_ENUSER_APPEND_APPLY, businessKey, strconv.Itoa(model.Id), result, "", model.SupplierName)
+	processInstanceId := svcActiviti.StartProcess2(workflow.OIL_REGISTER_APPLY, businessKey, strconv.Itoa(model.Id), result, "", model.SupplierName)
 
 	if processInstanceId == "" {
 		session.Rollback()
@@ -243,14 +239,13 @@ func (this *OilCorporateInfoController) AddEntity() {
 		svc.GetEntities(&userlist, where)
 	}
 
-
 	for _, tmpUser := range userlist {
-		userIds += strconv.Itoa(tmpUser.Id) + ","//strconv.FormatInt(tmpUser.Id, 10) + ","
+		userIds += strconv.Itoa(tmpUser.Id) + "," //strconv.FormatInt(tmpUser.Id, 10) + ","
 	}
 	userIds = strings.Trim(userIds, ",")
 
 	var ActiComplete workflow.ActiCompleteVM
-	ActiComplete.ProcessKey = workflow.OIL_ENUSER_APPEND_APPLY
+	ActiComplete.ProcessKey = workflow.OIL_REGISTER_APPLY
 	ActiComplete.BusinessKey = businessKey
 	ActiComplete.UserNames = userIds
 	ActiComplete.UserId = strconv.Itoa(model.Id)
@@ -271,13 +266,13 @@ func (this *OilCorporateInfoController) AddEntity() {
 
 	var activity oilactivity.OilActivity
 	activity.EntityId = model.Id
-	activity.ActType = "REGISTER" // 注册
+	activity.ActType = oilactivity.REGISTER // 注册
 	activity.WorkflowId = processInstanceId
 	activity.BusinessKey = businessKey
 	activity.ProcessKey = workflow.OIL_REGISTER_APPLY
 	activity.CreateOn = time.Now()
 
-	_,err = svc.InsertEntityBytbl(OilActivityName,&activity)
+	_, err = svc.InsertEntityBytbl(OilActivityName, &activity)
 	if err != nil {
 		session.Rollback()
 		errinfo.Message = "注册失败！"
@@ -342,112 +337,145 @@ func (this *OilCorporateInfoController) ComAudit() {
 	var errinfo ErrorDataInfo
 	var jsonBlob = this.Ctx.Input.RequestBody
 	json.Unmarshal(jsonBlob, &model)
+
+	var activity oilactivity.OilActivity
+	where := "EntityId=" + strconv.Itoa(model.Id) + " and ActType='" + oilactivity.REGISTER + "'"
+	svc.GetEntity(&activity, where)
+
+	var ActiComplete workflow.ActiCompleteVM
+	ActiComplete.ProcessKey = activity.ProcessKey
+	ActiComplete.BusinessKey = activity.BusinessKey
+	ActiComplete.UserId = this.User.Id
+	ActiComplete.Remarks = ""
+	ActiComplete.CallbackUrl = ""
+	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	if SuccessStatus == "1" {
-		var roleid string
-		roleid = paramSvc.GetBaseparameterMessage("", "paramset", "QiYeRegRoleId")
-		//注册用户Base_User
-		var userentity userRole.Base_User
-		userentity.Username = model.UserName
-		userentity.Realname = model.UserRealName
-		userentity.Telephone = model.UserTelephone
-		userentity.Roleid, _ = strconv.Atoi(roleid) //企业用户
-		userentity.IsCompanyUser = 1
-		userentity.Createon = time.Now()
-
-		//处理密码
-		pwd, key, errrk := utils.TripleDesEncrypt(model.UserPass)
-		if errrk != nil {
-			errinfo.Message = "密码格式不对！" + utils.AlertProcess(errrk.Error())
-			errinfo.Code = -2
-			this.Data["json"] = &errinfo
-			this.ServeJSON()
-			return
-		}
+		ActiComplete.Result = "1"
+		receiveVal := svcActiviti.TaskComplete(ActiComplete)
+
+		if receiveVal == "true" {
+			var roleid string
+			roleid = paramSvc.GetBaseparameterMessage("", "paramset", "QiYeRegRoleId")
+			//注册用户Base_User
+			var userentity userRole.Base_User
+			userentity.Username = model.UserName
+			userentity.Realname = model.UserRealName
+			userentity.Telephone = model.UserTelephone
+			userentity.Roleid, _ = strconv.Atoi(roleid) //企业用户
+			userentity.IsCompanyUser = 1
+			userentity.Createon = time.Now()
+
+			//处理密码
+			pwd, key, errrk := utils.TripleDesEncrypt(model.UserPass)
+			if errrk != nil {
+				errinfo.Message = "密码格式不对！" + utils.AlertProcess(errrk.Error())
+				errinfo.Code = -2
+				this.Data["json"] = &errinfo
+				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_"+roleid, utils.DOMAIN)
-			// 更新企业信息
-			model.Remark = Remark
-			model.UserId = userentity.Id
-			model.CheckStatus = 1 //通过审核
-			model.CreateBy = userentity.Realname
-			model.CreateUserId = userentity.Id
-			model.ModifiedOn = time.Now()
-			model.ModifiedBy = this.User.Realname
-			model.ModifiedUserId,_ = strconv.Atoi(this.User.Id)
-			svcRegister := register.GetOilCorporateInfoService(utils.DBE)
-			//删除原有数据（由于采用 svcRegister.UpdateEntityById() 一直报错，所以采用先删除再添加的方式达到更新数据的目的！）
-			where := " Id = " + strconv.Itoa(model.Id)
-			err2 := svcRegister.DeleteEntityBytbl(OilCorporateInfoName, where)
-			if err2 == nil {
-				//插入更新数据
-				_, err3 := svcRegister.InsertEntityBytbl(OilCorporateInfoName, &model)
-				if err3 == nil {
-					//编辑短信内容
-					toMobile:=model.UserTelephone
-					msg:="恭喜您！市场管理信息系统账号注册成功，系统登录用户名为: "+model.UserName
-					msgService:=msg2.GetMsgService(utils.DBE)
-					err:=msgService.HandleMsg(toMobile,msg,"1-1",model.UserName,model.UserRealName,strconv.Itoa(model.UserId))
-					if err==nil {
-						errinfo.Message = "审核通过！"
-						errinfo.Code = 0
-						errinfo.Item = model.Id
+			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_"+roleid, utils.DOMAIN)
+				// 更新企业信息
+				model.Remark = Remark
+				model.UserId = userentity.Id
+				model.CheckStatus = 11 //通过审核
+				model.CreateBy = userentity.Realname
+				model.CreateUserId = userentity.Id
+				model.ModifiedOn = time.Now()
+				model.ModifiedBy = this.User.Realname
+				model.ModifiedUserId, _ = strconv.Atoi(this.User.Id)
+				svcRegister := register.GetOilCorporateInfoService(utils.DBE)
+				//删除原有数据（由于采用 svcRegister.UpdateEntityById() 一直报错，所以采用先删除再添加的方式达到更新数据的目的！）
+				where := " Id = " + strconv.Itoa(model.Id)
+				err2 := svcRegister.DeleteEntityBytbl(OilCorporateInfoName, where)
+				if err2 == nil {
+					//插入更新数据
+					_, err3 := svcRegister.InsertEntityBytbl(OilCorporateInfoName, &model)
+					if err3 == nil {
+						//编辑短信内容
+						toMobile := model.UserTelephone
+						msg := "恭喜您！市场管理信息系统账号注册成功，系统登录用户名为: " + model.UserName
+						msgService := msg2.GetMsgService(utils.DBE)
+						err := msgService.HandleMsg(toMobile, msg, "1-1", model.UserName, model.UserRealName, strconv.Itoa(model.UserId))
+						if err == nil {
+							errinfo.Message = "审核通过！"
+							errinfo.Code = 0
+							errinfo.Item = model.Id
+							this.Data["json"] = &errinfo
+							this.ServeJSON()
+						}
+					} else {
+						errinfo.Message = "操作失败！--1"
+						errinfo.Code = -1
 						this.Data["json"] = &errinfo
 						this.ServeJSON()
 					}
 				} else {
-					errinfo.Message = "操作失败！--1"
+					errinfo.Message = "操作失败！--2"
 					errinfo.Code = -1
 					this.Data["json"] = &errinfo
 					this.ServeJSON()
 				}
 			} else {
-				errinfo.Message = "操作失败！--2"
+				errinfo.Message = "操作失败！--3"
 				errinfo.Code = -1
 				this.Data["json"] = &errinfo
 				this.ServeJSON()
+				return
 			}
 		} else {
-			errinfo.Message = "操作失败！--3"
+			errinfo.Message = "操作失败！--4"
 			errinfo.Code = -1
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 			return
 		}
 
-	}else {
-		upmodel.Remark = Remark
-		upmodel.CheckStatus = -1 //未通过审核
-		cols := []string{"Remark", "CheckStatus"}
-		err = svc.UpdateEntityBytbl(OilCorporateInfoName, model.Id, &upmodel, cols)
-
-		//编辑短信内容
-		//查找审批人联系方式
-		var sPerson userRole.Base_User
-		svc.GetEntity(&sPerson,"Id ="+ this.User.Id)
-		toMobile:=model.UserTelephone
-		msg:="市场管理信息系统账号注册失败，因“"+Remark+"”，请按照要求重新注册，联系人："+sPerson.Realname+"，联系电话："+sPerson.Mobile+""
-
-		//调用短信接口发送短信
-		msgService:=msg2.GetMsgService(utils.DBE)
-		res:=msgService.HandleMsg(toMobile,msg,"1-2",model.UserName,model.UserRealName,strconv.Itoa(model.UserId))
-
-		if err == nil && res==nil{
-			errinfo.Message = "审核未通过！"
-			errinfo.Code = 0
-			this.Data["json"] = &errinfo
-			this.ServeJSON()
+	} else {
+		ActiComplete.Result = "0"
+		receiveVal := svcActiviti.TaskComplete(ActiComplete)
+
+		if receiveVal == "true" {
+			upmodel.Remark = Remark
+			upmodel.CheckStatus = -1 //未通过审核
+			cols := []string{"Remark", "CheckStatus"}
+			err = svc.UpdateEntityBytbl(OilCorporateInfoName, model.Id, &upmodel, cols)
+
+			//编辑短信内容
+			//查找审批人联系方式
+			var sPerson userRole.Base_User
+			svc.GetEntity(&sPerson, "Id ="+this.User.Id)
+			toMobile := model.UserTelephone
+			msg := "市场管理信息系统账号注册失败，因“" + Remark + "”，请按照要求重新注册，联系人：" + sPerson.Realname + "，联系电话：" + sPerson.Mobile + ""
+
+			//调用短信接口发送短信
+			msgService := msg2.GetMsgService(utils.DBE)
+			res := msgService.HandleMsg(toMobile, msg, "1-2", model.UserName, model.UserRealName, strconv.Itoa(model.UserId))
+
+			if err == nil && res == 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()
+			}
 		} else {
 			errinfo.Message = "操作失败！" + utils.AlertProcess(err.Error())
 			errinfo.Code = -1
@@ -641,58 +669,58 @@ func (this *OilCorporateInfoController) GetAuditerByDept() {
 	this.ServeJSON()
 }
 
-
 // @Title 获取验证码
 // @Description 获取验证码
 // @router /getCode [get]
 func (this *OilCorporateInfoController) GetCode() {
 	svcRegister := register.GetOilCorporateInfoService(utils.DBE)
 	var errinfo ErrorDataInfo
-		//得到用户名参数
-	userName:=this.GetString("userName")
-	mobile:=this.GetString("mobile")
+	//得到用户名参数
+	userName := this.GetString("userName")
+	mobile := this.GetString("mobile")
 	//查出用户名的id
 	var sPerson userRole.Base_User
-	svcRegister.GetEntity(&sPerson,"UserName='"+userName+"'")
-	if  sPerson.Username==""{
+	svcRegister.GetEntity(&sPerson, "UserName='"+userName+"'")
+	if sPerson.Username == "" {
 		errinfo.Message = "无此用户名"
 		errinfo.Code = -1
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
-	}else{
-	//生成一个随机数
-	randomNumber:=fmt.Sprintf("%06v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(1000000))
-	//将数据存入
-	err2 := svcRegister.DeleteEntityBytbl("Base_VCode", "UserName='"+userName+"'")
-	if err2==nil{
-		var model oilrtx.Base_VCode
-		model.UserName=userName
-		model.UserId=strconv.Itoa(sPerson.Id)
-		model.Code=randomNumber
-		_, err:= svcRegister.InsertEntityBytbl("Base_VCode", &model)
-		if err==nil{
-			//发短信
-			//编辑短信内容
-			msg:="验证码为: "+ randomNumber+",5分钟内有效"
-			//调用短信接口发送短信
-			msgService:=msg2.GetMsgService(utils.DBE)
-			error:=msgService.HandleMsg(mobile,msg,"2-1",userName,sPerson.Realname,strconv.Itoa(sPerson.Id))
-			if error==nil{
-				errinfo.Message = "请等待接收验证码,5分钟内有效"
-				errinfo.Code = 0
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
+	} else {
+		//生成一个随机数
+		randomNumber := fmt.Sprintf("%06v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(1000000))
+		//将数据存入
+		err2 := svcRegister.DeleteEntityBytbl("Base_VCode", "UserName='"+userName+"'")
+		if err2 == nil {
+			var model oilrtx.Base_VCode
+			model.UserName = userName
+			model.UserId = strconv.Itoa(sPerson.Id)
+			model.Code = randomNumber
+			_, err := svcRegister.InsertEntityBytbl("Base_VCode", &model)
+			if err == nil {
+				//发短信
+				//编辑短信内容
+				msg := "验证码为: " + randomNumber + ",5分钟内有效"
+				//调用短信接口发送短信
+				msgService := msg2.GetMsgService(utils.DBE)
+				error := msgService.HandleMsg(mobile, msg, "2-1", userName, sPerson.Realname, strconv.Itoa(sPerson.Id))
+				if error == nil {
+					errinfo.Message = "请等待接收验证码,5分钟内有效"
+					errinfo.Code = 0
+					this.Data["json"] = &errinfo
+					this.ServeJSON()
+				}
 			}
 		}
 	}
-	}
 }
 
-type UpdatePw struct{
+type UpdatePw struct {
 	UserName string
 	YzCode   string
 	PassWord string
 }
+
 // @Title 更新密码
 // @Description 更新密码
 // @router /updatepassword [post]
@@ -703,34 +731,33 @@ func (this *OilCorporateInfoController) UpdatePassword() {
 	var jsonBlob = this.Ctx.Input.RequestBody
 	json.Unmarshal(jsonBlob, &model)
 
-	userName:=model.UserName
-	yzCode:=model.YzCode
-	passWord:=model.PassWord
+	userName := model.UserName
+	yzCode := model.YzCode
+	passWord := model.PassWord
 
 	var res oilrtx.Base_VCode
-	svcRegister.GetEntity(&res,"UserName='"+userName+"' and Code='"+yzCode+"'")
+	svcRegister.GetEntity(&res, "UserName='"+userName+"' and Code='"+yzCode+"'")
 
-	if res.UserName!=""{
+	if res.UserName != "" {
 		pwd, key, error := utils.TripleDesEncrypt(passWord)
 		var updateTo userRole.Base_User
-		updateTo.Userpassword=pwd
-		updateTo.Publickey=key
-		if error==nil{
+		updateTo.Userpassword = pwd
+		updateTo.Publickey = key
+		if error == nil {
 			cols := []string{"UserPassword", "PublicKey"}
-			err11 := svcRegister.UpdateEntityBytbl("Base_User",res.UserId , &updateTo, cols)
-			if err11==nil{
+			err11 := svcRegister.UpdateEntityBytbl("Base_User", res.UserId, &updateTo, cols)
+			if err11 == nil {
 				errinfo.Message = "密码重置成功"
 				errinfo.Code = 0
 				this.Data["json"] = &errinfo
 				this.ServeJSON()
 			}
 		}
-	}else{
+	} else {
 		errinfo.Message = "验证码不正确，请重新获取"
 		errinfo.Code = -1
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	}
 
-
-}
+}

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

@@ -484,8 +484,6 @@
         } else if (val.Type === '4') {
           this.$router.push('/oilsupplier/infochangech/' + val.Id + '/auditoperation?InfoStatus='+ val.Status+'&SupId='+val.SupplierId)
         } else if (val.Type === '5') {
-          this.$router.push('oilsupplier/qualchange/' + val.SupplierId + '/auditoperation?certid=' + val.CertId + '&QualId=' + val.Id + '&QualStatus=' + val.Status)
-        } else if (val.Type === '6') {
           this.initDataregister(val.Id)
         }
       },
@@ -661,13 +659,13 @@
           case '-4':
             return '专业处室审批未通过'
           case '5':
-            if (type == '4' || type == '5') {
+            if (type == '4') {
               return '待企业法规处审批'
             } else {
               return '待集中评审'
             }
           case '-5':
-            if (type == '4' || type == '5') {
+            if (type == '4') {
               return '企业法规处审批未通过'
             } else {
               return '集中评审未通过'
@@ -682,6 +680,8 @@
             return '未通过'
           case '10':
             return '分办'
+          case '11':
+            return '审核完成'
           default:
             return val
         }