|
@@ -90,11 +90,7 @@ func (this *OilContractReviewController) GetEntityList() {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if Status != "" {
|
|
if Status != "" {
|
|
|
- if Status == "8" || Status == "0" {
|
|
|
|
|
- where = where + " and r.Status=" + Status
|
|
|
|
|
- } else {
|
|
|
|
|
- where = where + " and r.Status > 0 and r.Status !=8"
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ where = where + " and r.Status=" + Status
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if CreateOn != "" {
|
|
if CreateOn != "" {
|
|
@@ -874,31 +870,36 @@ func (this *OilContractReviewController) BusinessOfficeSeparateAuditEntity() {
|
|
|
}
|
|
}
|
|
|
}()
|
|
}()
|
|
|
|
|
|
|
|
- //取出日常评审主表信息
|
|
|
|
|
- conRev := contractReview.GetOilContractReviewService(utils.DBE)
|
|
|
|
|
- var contractReviewEntity contractReview.OilContractReview
|
|
|
|
|
- conRev.GetEntityById(Id, &contractReviewEntity)
|
|
|
|
|
|
|
+ if Id != "" {
|
|
|
|
|
+ Ids := strings.Split(Id, ",")
|
|
|
|
|
+ for i := 0; i < len(Ids); i++ {
|
|
|
|
|
+ //取出日常评审主表信息
|
|
|
|
|
+ conRev := contractReview.GetOilContractReviewService(utils.DBE)
|
|
|
|
|
+ var contractReviewEntity contractReview.OilContractReview
|
|
|
|
|
+ conRev.GetEntityById(Ids[i], &contractReviewEntity)
|
|
|
|
|
|
|
|
- svcActiviti := workflow.GetActivitiService(utils.DBE)
|
|
|
|
|
- var ActiComplete workflow.ActiCompleteVM
|
|
|
|
|
- ActiComplete.ProcessKey = workflow.OIL_DAILY_CONTRACT_EVALUATION
|
|
|
|
|
- ActiComplete.BusinessKey = contractReviewEntity.BusinessKey
|
|
|
|
|
- ActiComplete.UserId = this.User.Id //审批人员
|
|
|
|
|
- ActiComplete.Result = "1" //前台审批[同意、不同意]
|
|
|
|
|
- ActiComplete.UserNames = ProfessionalAudit
|
|
|
|
|
- ActiComplete.Remarks = AuditRemark
|
|
|
|
|
- ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
|
|
|
|
|
- receiveVal := svcActiviti.TaskComplete(ActiComplete)
|
|
|
|
|
- if receiveVal != "true" {
|
|
|
|
|
- panic("工作流异常,请联系管理员!" + receiveVal)
|
|
|
|
|
- }
|
|
|
|
|
- cols := []string{
|
|
|
|
|
- "Id",
|
|
|
|
|
- "Status",
|
|
|
|
|
- "ProfessionalAudit",
|
|
|
|
|
|
|
+ svcActiviti := workflow.GetActivitiService(utils.DBE)
|
|
|
|
|
+ var ActiComplete workflow.ActiCompleteVM
|
|
|
|
|
+ ActiComplete.ProcessKey = workflow.OIL_DAILY_CONTRACT_EVALUATION
|
|
|
|
|
+ ActiComplete.BusinessKey = contractReviewEntity.BusinessKey
|
|
|
|
|
+ ActiComplete.UserId = this.User.Id //审批人员
|
|
|
|
|
+ ActiComplete.Result = "1" //前台审批[同意、不同意]
|
|
|
|
|
+ ActiComplete.UserNames = ProfessionalAudit
|
|
|
|
|
+ ActiComplete.Remarks = AuditRemark
|
|
|
|
|
+ ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
|
|
|
|
|
+ receiveVal := svcActiviti.TaskComplete(ActiComplete)
|
|
|
|
|
+ if receiveVal != "true" {
|
|
|
|
|
+ panic("工作流异常,请联系管理员!" + receiveVal)
|
|
|
|
|
+ }
|
|
|
|
|
+ cols := []string{
|
|
|
|
|
+ "Id",
|
|
|
|
|
+ "Status",
|
|
|
|
|
+ "ProfessionalAudit",
|
|
|
|
|
+ }
|
|
|
|
|
+ supplierCertId := strings.Split(contractReviewEntity.BusinessKey, "-")[0]
|
|
|
|
|
+ contractReviewEntity.Status = suppliercert.PROF_AUDIT_STATUS //专业处室接收
|
|
|
|
|
+ contractReviewEntity.ProfessionalAudit, _ = strconv.Atoi(ProfessionalAudit)
|
|
|
|
|
+ conRev.UpdateEntityByIdCols(supplierCertId, contractReviewEntity, cols)
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
- supplierCertId := strings.Split(contractReviewEntity.BusinessKey, "-")[0]
|
|
|
|
|
- contractReviewEntity.Status = suppliercert.PROF_AUDIT_STATUS //专业处室接收
|
|
|
|
|
- contractReviewEntity.ProfessionalAudit, _ = strconv.Atoi(ProfessionalAudit)
|
|
|
|
|
- conRev.UpdateEntityByIdCols(supplierCertId, contractReviewEntity, cols)
|
|
|
|
|
}
|
|
}
|