合同年审工作流通过相关

src/dashoo.cn/backend/api/business/oilcontract/contractReview/contractReview.go

@@ -5,7 +5,7 @@ import (
 type OilContractReview struct {
 	Id                int       `json:"Id" xorm:"not null pk autoincr INT(11) 'Id'"`
 	ContractId        int       `json:"ContractId" xorm:"not null comment('合同表Id') INT(11) 'ContractId'"`
-	Status            string    `json:"Status" xorm:"not null default '0' comment('状态标识( 0 初始 - 1待二级初审 - 2待二级复审 - 3-专业科室接收 4 待专业科室审核 - 5 待集中评审 - 6 待交费 - 7 待入库 - 8 完成 - 9审核未通过)') VARCHAR(10) 'Status'"`
+	Status            string    `json:"Status" xorm:"not null default '0' comment('状态标识( 0 初始 - 1待二级初审 - 2待二级复审 - 3专业科室接收 - 4待专业科室审核- 7待专业处室审批 - 8 完成)') VARCHAR(10) 'Status'"`
 	WorkflowId        string    `json:"WorkflowId" xorm:"default '0' comment('工作流的ID') VARCHAR(50) 'WorkflowId'"`
 	BusinessKey       string    `json:"BusinessKey" xorm:"comment('流程序号') VARCHAR(255) 'BusinessKey'"`
 	ProcessKey        string    `json:"ProcessKey" xorm:"comment('工作流名称') VARCHAR(255) 'ProcessKey'"`

src/dashoo.cn/backend/api/controllers/oilcontract/contractAnnualListener.go

@@ -2,7 +2,7 @@ package oilcontract
 
 import (
 	"dashoo.cn/backend/api/business/auditsetting"
-	"dashoo.cn/backend/api/business/oilcontract/contractReview"
+	"dashoo.cn/backend/api/business/oilcontract/contractSumScore"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
 	"dashoo.cn/backend/api/business/workflow"
 	. "dashoo.cn/backend/api/controllers"
@@ -23,21 +23,22 @@ type OilContractAnnualListenerController struct {
 // @router /pre-first-trail [get]
 func (this *OilContractAnnualListenerController) PreFirstTrail() {
 	businessKey := this.GetString("businessKey")
-	reviewId := strings.Split(businessKey, "-")[0]
+	annualId := strings.Split(businessKey, "-")[0]
 
-	var contractReviewEntity contractReview.OilContractReview
-	svc := contractReview.GetOilContractReviewService(utils.DBE)
-	svc.GetEntityById(reviewId, &contractReviewEntity)
+	svc := contractSumScore.GetOilContractSumScoreService(utils.DBE)
+	var contractSumEntity contractSumScore.OilContractSumScore
+	svc.GetEntityById(annualId, &contractSumEntity)
+	
 	cols := []string{
 		"Id",
 		"Status",
 	}
 	//进入此步骤，记录在数据库中
-	contractReviewEntity.Status = suppliercert.FIRST_TRIAL_STATUS //二级单位初审
-	svc.UpdateEntityByIdCols(reviewId, contractReviewEntity, cols)
+	contractSumEntity.Status = suppliercert.FIRST_TRIAL_STATUS //二级单位初审
+	svc.UpdateEntityByIdCols(annualId, contractSumEntity, cols)
 
 	//返回查出的初审人员操作人员列表
-	approverIds := contractReviewEntity.FirstAudit
+	approverIds := contractSumEntity.FirstAudit
 	this.Data["json"] = approverIds
 	this.ServeJSON()
 }
@@ -48,21 +49,21 @@ func (this *OilContractAnnualListenerController) PreFirstTrail() {
 // @router /pre-second-trail [get]
 func (this *OilContractAnnualListenerController) PreSecondTrail() {
 	businessKey := this.GetString("businessKey")
-	dailyId := strings.Split(businessKey, "_")[0]
+	annualId := strings.Split(businessKey, "_")[0]
 
-	var contractReviewEntity contractReview.OilContractReview
-	svc := contractReview.GetOilContractReviewService(utils.DBE)
-	svc.GetEntityById(dailyId, &contractReviewEntity)
+	svc := contractSumScore.GetOilContractSumScoreService(utils.DBE)
+	var contractSumEntity contractSumScore.OilContractSumScore
+	svc.GetEntityById(annualId, &contractSumEntity)
 	cols := []string{
 		"Id",
 		"Status",
 	}
 	//进入此步骤，记录在数据库中
-	contractReviewEntity.Status = suppliercert.SECOND_TRIAL_STATUS //二级单位复审
-	svc.UpdateEntityByIdCols(dailyId, contractReviewEntity, cols)
+	contractSumEntity.Status = suppliercert.SECOND_TRIAL_STATUS //二级单位复审
+	svc.UpdateEntityByIdCols(annualId, contractSumEntity, cols)
 
 	//返回查出的复审人员操作人员列表
-	approverIds := contractReviewEntity.SecondAudit
+	approverIds := contractSumEntity.SecondAudit
 	this.Data["json"] = approverIds
 	this.ServeJSON()
 }
@@ -75,24 +76,24 @@ func (this *OilContractAnnualListenerController) PreThirdTrialStatus() {
 	var jsonBlob = this.Ctx.Input.RequestBody
 	var listenerApprove ListenerApproveParams
 	json.Unmarshal(jsonBlob, &listenerApprove)
-	dailyId := strings.Split(listenerApprove.BusinessKey, "-")[0]
+	annualId := strings.Split(listenerApprove.BusinessKey, "-")[0]
 
-	var contractReviewEntity contractReview.OilContractReview
-	svc := contractReview.GetOilContractReviewService(utils.DBE)
-	svc.GetEntityById(dailyId, &contractReviewEntity)
+	svc := contractSumScore.GetOilContractSumScoreService(utils.DBE)
+	var contractSumEntity contractSumScore.OilContractSumScore
+	svc.GetEntityById(annualId, &contractSumEntity)
 
 	//查出业务处室接收分办的人员
 	stepCode := workflow.PROF_RECE //专业处室接收
 	auditSettingService := auditsetting.GetOilAuditSettingService(utils.DBE)
-	approverIds := auditSettingService.GetApproverIdsByStepCodeAndUnitId(stepCode, strconv.Itoa(contractReviewEntity.ThirdAudit))
+	approverIds := auditSettingService.GetApproverIdsByStepCodeAndUnitId(stepCode, strconv.Itoa(contractSumEntity.ThirdAudit))
 	if approverIds != "" {
 		cols := []string{
 			"Id",
 			"Status",
 		}
 		//进入此步骤，记录在数据库中
-		contractReviewEntity.Status = suppliercert.THIRD_TRIAL_STATUS ////专业处接收
-		svc.UpdateEntityByIdCols(dailyId, contractReviewEntity, cols)
+		contractSumEntity.Status = suppliercert.THIRD_TRIAL_STATUS ////专业处接收
+		svc.UpdateEntityByIdCols(annualId, contractSumEntity, cols)
 	}
 	var approveInfo ListenerApproveInfo
 	approveInfo.Users = approverIds
@@ -106,18 +107,18 @@ func (this *OilContractAnnualListenerController) PreThirdTrialStatus() {
 // @router /pre-prof-audit [get]
 func (this *OilContractAnnualListenerController) PreProfAudit() {
 	businessKey := this.GetString("businessKey")
-	dailyId := strings.Split(businessKey, "-")[0]
+	annualId := strings.Split(businessKey, "-")[0]
 
-	var contractReviewEntity contractReview.OilContractReview
-	svc := contractReview.GetOilContractReviewService(utils.DBE)
-	svc.GetEntityById(dailyId, &contractReviewEntity)
+	svc := contractSumScore.GetOilContractSumScoreService(utils.DBE)
+	var contractSumEntity contractSumScore.OilContractSumScore
+	svc.GetEntityById(annualId, &contractSumEntity)
 	cols := []string{
 		"Id",
 		"Status",
 	}
 	//进入此步骤，记录在数据库中
-	contractReviewEntity.Status = suppliercert.PROF_AUDIT_STATUS //业务处室专业审批
-	svc.UpdateEntityByIdCols(dailyId, contractReviewEntity, cols)
+	contractSumEntity.Status = suppliercert.PROF_AUDIT_STATUS //业务处室专业审批
+	svc.UpdateEntityByIdCols(annualId, contractSumEntity, cols)
 
 	//查出业务处室专业审批的人员
 	//专业审批人已在分办时指定
@@ -136,18 +137,18 @@ func (this *OilContractAnnualListenerController) GetLawOfficeAuditors() {
 	var jsonBlob = this.Ctx.Input.RequestBody
 	var listenerApprove ListenerApproveParams
 	json.Unmarshal(jsonBlob, &listenerApprove)
-	dailylId := strings.Split(listenerApprove.BusinessKey, "-")[0]
+	annualId := strings.Split(listenerApprove.BusinessKey, "-")[0]
 
-	var contractReviewEntity contractReview.OilContractReview
-	svc := contractReview.GetOilContractReviewService(utils.DBE)
-	svc.GetEntityById(dailylId, &contractReviewEntity)
+	svc := contractSumScore.GetOilContractSumScoreService(utils.DBE)
+	var contractSumEntity contractSumScore.OilContractSumScore
+	svc.GetEntityById(annualId, &contractSumEntity)
 	cols := []string{
 		"Id",
 		"Status",
 	}
 	//进入此步骤，记录在数据库中
-	contractReviewEntity.Status = suppliercert.STOREING_STATUS //企业法规处
-	svc.UpdateEntityByIdCols(dailylId, contractReviewEntity, cols)
+	contractSumEntity.Status = suppliercert.STOREING_STATUS //企业法规处
+	svc.UpdateEntityByIdCols(annualId, contractSumEntity, cols)
 
 	//查出企业法规处审批的人员
 	stepCode := workflow.PROF_REGULATION //企业法规处
@@ -166,10 +167,10 @@ func (this *OilContractAnnualListenerController) GetLawOfficeAuditors() {
 // @router /workflow-end [get]
 func (this *OilContractAnnualListenerController) WorkflowEndAudit() {
 	businessKey := this.GetString("businessKey")
-	dailyId := strings.Split(businessKey, "-")[0]
-	var contractReviewEntity contractReview.OilContractReview
-	srv := contractReview.GetOilContractReviewService(utils.DBE)
-	srv.GetEntityById(dailyId, &contractReviewEntity)
+	annualId := strings.Split(businessKey, "-")[0]
+	svc := contractSumScore.GetOilContractSumScoreService(utils.DBE)
+	var contractSumEntity contractSumScore.OilContractSumScore
+	svc.GetEntityById(annualId, &contractSumEntity)
 
 	cols := []string{
 		"Id",
@@ -177,8 +178,8 @@ func (this *OilContractAnnualListenerController) WorkflowEndAudit() {
 		"ApplyTime",
 	}
 	//进入此步骤，记录在数据库中
-	contractReviewEntity.Status = suppliercert.STORE_STATUS                  //审核完成
-	srv.UpdateEntityByIdCols(dailyId, contractReviewEntity, cols)
+	contractSumEntity.Status = suppliercert.STORE_STATUS                  //审核完成
+	svc.UpdateEntityByIdCols(annualId, contractSumEntity, cols)
 
 	this.Data["json"] = 1
 	this.ServeJSON()
@@ -191,19 +192,19 @@ func (this *OilContractAnnualListenerController) WorkflowEndAudit() {
 func (this *OilContractAnnualListenerController) ApprovalRefuse() {
 	businessKey := this.GetString("businessKey")
 	stepCodeStatus := this.GetString("stepCode")
-	dailyId := strings.Split(businessKey, "-")[0]
-	var contractReviewEntity contractReview.OilContractReview
-	srv := contractReview.GetOilContractReviewService(utils.DBE)
-	srv.GetEntityById(dailyId, &contractReviewEntity)
+	annualId := strings.Split(businessKey, "-")[0]
+	svc := contractSumScore.GetOilContractSumScoreService(utils.DBE)
+	var contractSumEntity contractSumScore.OilContractSumScore
+	svc.GetEntityById(annualId, &contractSumEntity)
 
 	cols := []string{
 		"Id",
 		"Status",
 	}
 	//进入此步骤，记录在数据库中
-	contractReviewEntity.Status = stepCodeStatus
-	srv.UpdateEntityByIdCols(dailyId, contractReviewEntity, cols)
+	contractSumEntity.Status = stepCodeStatus
+	svc.UpdateEntityByIdCols(annualId, contractSumEntity, cols)
 
-	this.Data["json"] = contractReviewEntity.CreateUserId
+	this.Data["json"] = contractSumEntity.CreateUserId
 	this.ServeJSON()
 }

src/dashoo.cn/backend/api/controllers/oilcontract/contractSumScore.go

@@ -2,7 +2,7 @@ package oilcontract
 
 import (
 	"dashoo.cn/backend/api/business/oilcontract/contract"
-	"dashoo.cn/backend/api/business/oilcontract/contractReview"
+	//"dashoo.cn/backend/api/business/oilcontract/contractReview"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
 	"dashoo.cn/backend/api/business/workflow"
 	"encoding/json"
@@ -495,7 +495,7 @@ func (this *OilContractSumScoreController) UnitAuditEntity() {
 	if processInstanceId == "" {
 		//启动工作流
 		businessKey = Id + "-" + strconv.Itoa(contractSumEntity.AuditIndex)
-		processInstanceId = svcActiviti.StartProcess2(workflow.OIL_DAILY_CONTRACT_EVALUATION, businessKey, this.User.Id, "1", contractEntity.ContractClass, contractEntity.SupplierName)
+		processInstanceId = svcActiviti.StartProcess2(workflow.OIL_ANNUAL_CONTRACT_EVALUATION, businessKey, this.User.Id, "1", contractEntity.ContractClass, contractEntity.SupplierName)
 		if len(processInstanceId) <= 0 {
 			panic("工作流启动失败！")
 		}
@@ -513,7 +513,7 @@ func (this *OilContractSumScoreController) UnitAuditEntity() {
 		"CommitComId",
 		"AuditIndex",
 	}
-	contractSumEntity.Processkey = workflow.OIL_DAILY_CONTRACT_EVALUATION
+	contractSumEntity.Processkey = workflow.OIL_ANNUAL_CONTRACT_EVALUATION
 	contractSumEntity.Businesskey = businessKey
 	contractSumEntity.WorkflowId = processInstanceId
 	contractSumEntity.FirstAudit, _ = strconv.Atoi(firstAudit)
@@ -523,7 +523,7 @@ func (this *OilContractSumScoreController) UnitAuditEntity() {
 	conRev.UpdateEntityByIdCols(Id, contractSumEntity, cols)
 
 	var ActiComplete workflow.ActiCompleteVM
-	ActiComplete.ProcessKey = workflow.OIL_DAILY_CONTRACT_EVALUATION
+	ActiComplete.ProcessKey = workflow.OIL_ANNUAL_CONTRACT_EVALUATION
 	ActiComplete.BusinessKey = contractSumEntity.Businesskey
 	ActiComplete.UserId = this.User.Id // 当前审批操作人员
 	//ActiComplete.UserNames = secondAudit // 当前审批操作人员
@@ -536,7 +536,7 @@ func (this *OilContractSumScoreController) UnitAuditEntity() {
 	}
 }
 
-// @Title 分办之后的各级审批  --审批 包含：二级单位初审、复审, 业务处室专业审核
+// @Title 分办之后的各级审批  --审批 包含：二级单位初审, 复审, 业务处室专业审核, 企管法规处审核
 // @Description 分办之后的各级审批
 // @Success	200	{object} controllers.Request
 // @router /common-audit/:id [post]
@@ -561,15 +561,15 @@ func (this *OilContractSumScoreController) CommonAuditEntity() {
 		}
 	}()
 
-	//取出日常评审主表信息
-	conRev := contractReview.GetOilContractReviewService(utils.DBE)
-	var contractSumEntity contractReview.OilContractReview
+	//取出年度评审主表信息
+	conRev := contractSumScore.GetOilContractSumScoreService(utils.DBE)
+	var contractSumEntity contractSumScore.OilContractSumScore
 	conRev.GetEntityById(Id, &contractSumEntity)
 
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var ActiComplete workflow.ActiCompleteVM
-	ActiComplete.ProcessKey = workflow.OIL_DAILY_CONTRACT_EVALUATION
-	ActiComplete.BusinessKey = contractSumEntity.BusinessKey
+	ActiComplete.ProcessKey = workflow.OIL_ANNUAL_CONTRACT_EVALUATION
+	ActiComplete.BusinessKey = contractSumEntity.Businesskey
 	ActiComplete.UserId = this.User.Id //审批人员
 	ActiComplete.Result = result       //前台审批[同意、不同意]
 	ActiComplete.Remarks = AuditRemark
@@ -605,15 +605,15 @@ func (this *OilContractSumScoreController) BusinessOfficeSeparateAuditEntity() {
 		}
 	}()
 
-	//取出日常评审主表信息
-	conRev := contractReview.GetOilContractReviewService(utils.DBE)
-	var contractSumEntity contractReview.OilContractReview
+	//取出年度评审主表信息
+	conRev := contractSumScore.GetOilContractSumScoreService(utils.DBE)
+	var contractSumEntity contractSumScore.OilContractSumScore
 	conRev.GetEntityById(Id, &contractSumEntity)
 
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var ActiComplete workflow.ActiCompleteVM
-	ActiComplete.ProcessKey = workflow.OIL_DAILY_CONTRACT_EVALUATION
-	ActiComplete.BusinessKey = contractSumEntity.BusinessKey
+	ActiComplete.ProcessKey = workflow.OIL_ANNUAL_CONTRACT_EVALUATION
+	ActiComplete.BusinessKey = contractSumEntity.Businesskey
 	ActiComplete.UserId = this.User.Id //审批人员
 	ActiComplete.Result = "1"          //前台审批[同意、不同意]
 	ActiComplete.UserNames = ProfessionalAudit
@@ -628,7 +628,7 @@ func (this *OilContractSumScoreController) BusinessOfficeSeparateAuditEntity() {
 		"Status",
 		"ProfessionalAudit",
 	}
-	supplierCertId := strings.Split(contractSumEntity.BusinessKey, "-")[0]
+	supplierCertId := strings.Split(contractSumEntity.Businesskey, "-")[0]
 	contractSumEntity.Status = suppliercert.PROF_AUDIT_STATUS //专业处室接收
 	contractSumEntity.ProfessionalAudit, _ = strconv.Atoi(ProfessionalAudit)
 	conRev.UpdateEntityByIdCols(supplierCertId, contractSumEntity, cols)

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

@@ -4,6 +4,7 @@ import (
 	"dashoo.cn/backend/api/business/invoiceinfo"
 	"dashoo.cn/backend/api/business/oilcontract/contract"
 	"dashoo.cn/backend/api/business/oilcontract/contractReview"
+	"dashoo.cn/backend/api/business/oilcontract/contractSumScore"
 	"dashoo.cn/backend/api/business/oilsupplier/annualaudit"
 	"dashoo.cn/backend/api/business/oilsupplier/infochange"
 	"dashoo.cn/backend/api/business/oilsupplier/oilcatalog"
@@ -38,7 +39,7 @@ func (this *TodoListController) GetMyTaskEntityList() {
 	supplierTypeCode := this.GetString("SupplierTypeCode")
 	supplierName := this.GetString("SupplierName")
 	wfNames := ""
-	wfNames = workflow.OIL_ENUSER_SUPPLIER_APPLY  + "," + workflow.OIL_ENUSER_APPEND_APPLY + "," + workflow.OIL_INFO_CHANGE + "," + workflow.OIL_AUDIT_APPLY + "," + workflow.OIL_SUPPLIER_VERIFY+ "," + workflow.OIL_DAILY_CONTRACT_EVALUATION
+	wfNames = workflow.OIL_ENUSER_SUPPLIER_APPLY  + "," + workflow.OIL_ENUSER_APPEND_APPLY + "," + workflow.OIL_INFO_CHANGE + "," + workflow.OIL_AUDIT_APPLY + "," + workflow.OIL_SUPPLIER_VERIFY+ "," + workflow.OIL_DAILY_CONTRACT_EVALUATION+ "," + workflow.OIL_ANNUAL_CONTRACT_EVALUATION
 
 	var todoliststemp []todolist.TodoList
 
@@ -221,6 +222,27 @@ func (this *TodoListController) GetMyTaskEntityList() {
 				todo.Status = contractReviewEntity.Status
 				todoliststemp = append(todoliststemp, todo)
 			}
+		} else if wfName == workflow.OIL_ANNUAL_CONTRACT_EVALUATION {
+			// 合同年度评审
+			var todo todolist.TodoList
+			conRev := contractSumScore.GetOilContractSumScoreService(utils.DBE)
+			var contractSumEntity contractSumScore.OilContractSumScore
+			has = conRev.GetEntityById(id, &contractSumEntity)
+
+			contractSvc := contract.GetOilContractService(utils.DBE)
+			var contractEntity contract.OilContract
+			contractSvc.GetEntityById(contractSumEntity.ContractId, &contractEntity)
+			if has {
+				todo.Id = contractSumEntity.Id
+				todo.Type = todolist.ANNUAL
+				todo.TaskName = item.TaskName
+				todo.UserName = this.User.Realname
+				todo.CreateTime = item.CreateTime
+				todo.SupplierTypeCode = contractEntity.ContractClass
+				todo.SupplierName = contractEntity.SupplierName
+				todo.Status = contractSumEntity.Status
+				todoliststemp = append(todoliststemp, todo)
+			}
 		}
 	}
 
@@ -286,6 +308,8 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 		wfNames = workflow.OIL_Catalog
 	} else if stype == "10" {
 		wfNames = workflow.OIL_DAILY_CONTRACT_EVALUATION
+	} else if stype == "11" {
+		wfNames = workflow.OIL_ANNUAL_CONTRACT_EVALUATION
 	}
 
 	var todoliststemp []todolist.TodoList
@@ -457,6 +481,27 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 				todo.Status = contractReviewEntity.Status
 				todoliststemp = append(todoliststemp, todo)
 			}
+		} else if wfName == workflow.OIL_ANNUAL_CONTRACT_EVALUATION {
+			// 合同年度评审
+			var todo todolist.TodoList
+			conRev := contractSumScore.GetOilContractSumScoreService(utils.DBE)
+			var contractSumEntity contractSumScore.OilContractSumScore
+			has = conRev.GetEntityById(id, &contractSumEntity)
+
+			contractSvc := contract.GetOilContractService(utils.DBE)
+			var contractEntity contract.OilContract
+			contractSvc.GetEntityById(contractSumEntity.ContractId, &contractEntity)
+			if has {
+				todo.Id = contractSumEntity.Id
+				todo.Type = todolist.ANNUAL
+				todo.TaskName = item.TaskName
+				todo.UserName = this.User.Realname
+				todo.CreateTime = item.CreateTime
+				todo.SupplierTypeCode = contractEntity.ContractClass
+				todo.SupplierName = contractEntity.SupplierName
+				todo.Status = contractSumEntity.Status
+				todoliststemp = append(todoliststemp, todo)
+			}
 		}
 
 	}