二级物资

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

@@ -938,19 +938,18 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 		usvc := userRole.GetUserService(utils.DBE)
 
 		if supplierCertEntity.InStyle == "3"{
-			status = suppliercert.CENT_AUDIT_STATUS
-			where := "AuditStepCode='" + workflow.PROF_REGULATION + "'"
+			status = suppliercert.THIRD_TRIAL_STATUS
+			where := "AuditStepCode='" + workflow.PROF_RECE + "'"
 			usvc.GetEntity(&setting, where)
-			paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
-			topid := paramSvc.GetBaseparameterMessage("", "paramset", "CENT_AUDIT")
 			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=" + topid
+				where := "Id in (" + uids + ")" + " and UnitId=" + strconv.Itoa(supplierCertEntity.ThirdAudit)
 				usvc.GetEntities(&userlist, where)
 			}
+
 		} else if supplierCertEntity.InStyle == "2" || supplierCertEntity.InStyle == "4" || supplierCertEntity.InStyle == "6" {
 
 			svcActiviti := workflow.GetActivitiService(utils.DBE)

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

@@ -91,6 +91,7 @@ func (this *TodoListController) GetMyTaskEntityList() {
 			has :=svcapp.GetTodoEntitie(OilSupplierName, OilSupplierCertAppendName,  &todo, where)
 			if has {
 				todo.Type = todolist.CERTAPPEND
+				todo.TaskName = item.TaskName
 				todo.UserName = this.User.Realname
 				todo.CreateTime = item.CreateTime
 				todolists = append(todolists, todo)
@@ -233,6 +234,7 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 			svcapp := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
 			has :=svcapp.GetTodoEntitie(OilSupplierName, OilSupplierCertAppendName,  &todo, where)
 			if has {
+				todo.TaskName = item.TaskName
 				todo.Type = todolist.CERTAPPEND
 				todo.UserName = this.User.Realname
 				todo.CreateTime = item.CreateTime