工作流

src/dashoo.cn/backend/api/business/auditsetting/oilauditsettingService.go

@@ -2,10 +2,10 @@ package auditsetting
 
 import (
 	. "dashoo.cn/backend/api/mydb"
+	"dashoo.cn/business2/userRole"
 	"dashoo.cn/utils"
 	"github.com/go-xorm/xorm"
 	"strings"
-	"dashoo.cn/business2/userRole"
 )
 
 type OilAuditSettingService struct {

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

@@ -0,0 +1,16 @@
+package oilactivity
+
+import "time"
+
+type OilActivity struct {
+	Id           int       `xorm:"not null pk autoincr INT(11)"`
+	EntityId     int       `xorm:"INT(11)"`
+	ActType      string    `xorm:"default '' comment('工作流类型') VARCHAR(50)"`
+	WorkflowId   string    `xorm:"default '0' comment('工作流的ID') VARCHAR(50)"`
+	BusinessKey  string    `xorm:"VARCHAR(255)"`
+	ProcessKey   string    `xorm:"VARCHAR(255)"`
+	CreateOn     time.Time `xorm:"DATETIME"`
+	CreateUserId int       `xorm:"INT(11)"`
+	CreateBy     string    `xorm:"VARCHAR(50)"`
+}
+

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

@@ -0,0 +1,17 @@
+package oilactivity
+
+import (
+	"github.com/go-xorm/xorm"
+	. "dashoo.cn/backend/api/mydb"
+)
+
+type OilActivityService struct {
+	MyServiceBase
+}
+
+func GetOilActivityService(xormEngine *xorm.Engine) *OilActivityService {
+	s := new(OilActivityService)
+	s.DBE = xormEngine
+	return s
+}
+

src/dashoo.cn/backend/api/business/workflow/workflow.go

@@ -118,6 +118,11 @@ const (
 	//年审流程图
 	OIL_AUDIT_APPLY string = "oil_audit_apply"
 
+	// 企业注册
+	OIL_REGISTER_APPLY string ="oil_register_apply"
+    // 企业入库
+	OIL_SUPPLIER_INSTORE string = "oil_supplier_instore"
+
 	// 分办
 	SUB_OFFICE_WZ string = "SUB_OFFICE_WZ"
 	SUB_OFFICE_JF string = "SUB_OFFICE_JF"
@@ -136,6 +141,8 @@ const (
 	PROF_CONCENT string = "PROF_CONCENT"
 	// 企业法规处审核
 	PROF_REGULATION string = "PROF_REGULATION"
+	// 企业用户注册
+	COMPONY_AUDIT string = "COMPONY_AUDIT"
 
 )
 

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

@@ -0,0 +1,9 @@
+package oilsupplier
+
+import (
+	. "dashoo.cn/backend/api/controllers"
+	)
+
+type OilActivityController struct {
+	BaseController
+}

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

@@ -3,6 +3,7 @@ package register
 import (
 	msg2 "dashoo.cn/backend/api/business/msg"
 	"dashoo.cn/backend/api/business/oilrtx"
+	"dashoo.cn/backend/api/business/oilsupplier/oilactivity"
 	"dashoo.cn/business2/permission"
 	"encoding/json"
 	"fmt"
@@ -193,10 +194,73 @@ func (this *OilCorporateInfoController) AddEntity() {
 	model.CheckUserName = strings.Trim(model.CheckUserName, ",")
 	model.CreateOn = time.Now()
 
-	svc := register.GetOilCorporateInfoService(utils.DBE)
-	_, err2 := svc.InsertEntityBytbl("OilCorporateInfo", &model)
+	//svc := register.GetOilCorporateInfoService(utils.DBE)
+	session := utils.DBE.NewSession()
+	defer func() {
+		session.Close()
+	}()
+	err := session.Begin()
+	svc := supplier.GetOilSupplierSession(session)
+	_, err = svc.InsertEntityBytbl("OilCorporateInfo", &model)
+
+	if err != nil {
+		session.Rollback()
+		errinfo.Message = "注册失败！"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
 
-	if err2 == nil {
+
+	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)
+
+	var setting auditsetting.Base_OilAuditSetting
+	usvc := userRole.GetUserService(utils.DBE)
+	where := "AuditStepCode='" + workflow.COMPONY_AUDIT + "'"
+	svc.GetEntity(&setting, where)
+	ids := usvc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
+	tempstr := strings.Join(ids, ",")
+	uids := strings.Replace(tempstr, "uid_", "", -1)
+	uids = strings.Trim(uids, ",")
+	if uids != "" {
+		where := "Id in (" + uids + ")" + " and UnitId=" + unitId
+		svc.GetEntities(&userlist, where)
+	}
+
+
+	for _, tmpUser := range userlist {
+		userIds += strconv.Itoa(tmpUser.Id) + ","//strconv.FormatInt(tmpUser.Id, 10) + ","
+	}
+	userIds = strings.Trim(userIds, ",")
+
+	if processInstanceId == "" {
+		session.Rollback()
+		errinfo.Message = "注册失败！"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	var activity oilactivity.OilActivity
+	activity.EntityId = model.Id
+	activity.ActType = "REGISTER" // 注册
+	activity.WorkflowId = processInstanceId
+	activity.BusinessKey = businessKey
+	activity.ProcessKey = workflow.OIL_REGISTER_APPLY
+	activity.CreateOn = time.Now()
+
+	_,err = svc.InsertEntity(&activity)
+	if err != nil {
+		session.Rollback()
+	}
+	err = session.Commit()
+	if err == nil {
 		errinfo.Message = "注册成功！"
 		errinfo.Code = 0
 		errinfo.Item = model.Id