注册

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

@@ -258,6 +258,7 @@ var (
 	OilCorporateInfoName                     string = "OilCorporateInfo"            //企业用户注册临时表
 	OilSupplierPauseReasonName				 string = "OilSupplierPauseReason"
 	OilPaymentInfoName                       string = "OilPaymentInfo"              //缴费信息
+	OilActivityName                          string = "OilActivity" //
 )
 
 //分页信息及数据

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

@@ -217,8 +217,19 @@ func (this *OilCorporateInfoController) AddEntity() {
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	businessKey := strconv.Itoa(model.Id)
 	result := "1"
-	processInstanceId := svcActiviti.StartProcess2(workflow.OIL_REGISTER_APPLY, businessKey, strconv.Itoa(model.Id), result, "", model.SupplierName)
+	processInstanceId := svcActiviti.StartProcess2(workflow.OIL_ENUSER_APPEND_APPLY, businessKey, strconv.Itoa(model.Id), result, "", model.SupplierName)
 
+	if processInstanceId == "" {
+		session.Rollback()
+		errinfo.Message = "注册失败！"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	userIds := ""
+	var userlist []userRole.Base_User
 	var setting auditsetting.Base_OilAuditSetting
 	usvc := userRole.GetUserService(utils.DBE)
 	where := "AuditStepCode='" + workflow.COMPONY_AUDIT + "'"
@@ -228,7 +239,7 @@ func (this *OilCorporateInfoController) AddEntity() {
 	uids := strings.Replace(tempstr, "uid_", "", -1)
 	uids = strings.Trim(uids, ",")
 	if uids != "" {
-		where := "Id in (" + uids + ")" + " and UnitId=" + unitId
+		where := "Id in (" + uids + ")" + " and UnitId=" + strconv.Itoa(model.CheckUnitId)
 		svc.GetEntities(&userlist, where)
 	}
 
@@ -238,7 +249,18 @@ func (this *OilCorporateInfoController) AddEntity() {
 	}
 	userIds = strings.Trim(userIds, ",")
 
-	if processInstanceId == "" {
+	var ActiComplete workflow.ActiCompleteVM
+	ActiComplete.ProcessKey = workflow.OIL_ENUSER_APPEND_APPLY
+	ActiComplete.BusinessKey = businessKey
+	ActiComplete.UserNames = userIds
+	ActiComplete.UserId = strconv.Itoa(model.Id)
+	ActiComplete.Result = "1"
+	ActiComplete.Remarks = ""
+	ActiComplete.CallbackUrl = ""
+
+	receiveVal := svcActiviti.TaskComplete(ActiComplete)
+
+	if receiveVal != "true" {
 		session.Rollback()
 		errinfo.Message = "注册失败！"
 		errinfo.Code = -1
@@ -255,9 +277,14 @@ func (this *OilCorporateInfoController) AddEntity() {
 	activity.ProcessKey = workflow.OIL_REGISTER_APPLY
 	activity.CreateOn = time.Now()
 
-	_,err = svc.InsertEntity(&activity)
+	_,err = svc.InsertEntityBytbl(OilActivityName,&activity)
 	if err != nil {
 		session.Rollback()
+		errinfo.Message = "注册失败！"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
 	}
 	err = session.Commit()
 	if err == nil {

src/dashoo.cn/backend/api/controllers/system/auditsetting.go

@@ -567,4 +567,5 @@ func (this *OilAuditSettingController) GetUserByRole() {
 	this.Data["json"] = &userlist
 	this.ServeJSON()
 
-}
+}
+