待办查询

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

@@ -45,10 +45,6 @@ func (this *TodoListController) GetMyTaskEntityList() {
 	supplierTypeCode := this.GetString("SupplierTypeCode")
 	supplierName := this.GetString("SupplierName")
 
-	if stype != "" {
-		where = where + " and b.SupplierTypeCode = '" + stype + "'"
-	}
-
 	if supplierTypeCode != "" {
 		where = where + " and b.SupplierTypeCode = '" + supplierTypeCode + "'"
 	}
@@ -57,168 +53,185 @@ func (this *TodoListController) GetMyTaskEntityList() {
 		where = where + " and a.SupplierName like '%" + supplierName + "%'"
 	}
 
-	//找出待办任务===准入
 	actisvc := workflow.GetActivitiService(utils.DBE)
-	var certIdList string
-	if actisvc.GetMyTasks(workflow.OIL_SUPPLIER_APPLY, this.User.Id) != "" {
-		certIdList = actisvc.GetMyTasks(workflow.OIL_SUPPLIER_APPLY, this.User.Id)
-		certIdList = certIdList + ","
-	}
-	if actisvc.GetMyTasks(workflow.OIL_FIRST_SUPPLIER_APPLY, this.User.Id) != "" {
-		certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetMyTasks(workflow.OIL_FIRST_SUPPLIER_APPLY, this.User.Id))
-		certIdList = certIdList + ","
-	}
-	if actisvc.GetMyTasks(workflow.OIL_SECOND_SUPPLIER_APPLY, this.User.Id) != "" {
-		certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetMyTasks(workflow.OIL_SECOND_SUPPLIER_APPLY, this.User.Id))
-		certIdList = certIdList + ","
-	}
-	if actisvc.GetMyTasks(workflow.OIL_ENUSER_SUPPLIER_APPLY, this.User.Id) != "" {
-		certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetMyTasks(workflow.OIL_ENUSER_SUPPLIER_APPLY, this.User.Id))
-		certIdList = certIdList + ","
-	}
-	if actisvc.GetMyTasks(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, this.User.Id) != "" {
-		certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetMyTasks(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, this.User.Id))
-		certIdList = certIdList + ","
-	}
-	if actisvc.GetMyTasks(workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY, this.User.Id) != "" {
-		certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetMyTasks(workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY, this.User.Id))
-	}
-	certIdList = strings.Trim(certIdList, ",")
-	certIdarr := strings.Split(certIdList, ",")
-	for i, item := range certIdarr {
-		idx := strings.Index(item, "-")
-		if idx >= 0 {
-			certIdarr[i] = strings.Split(item, "-")[0]
-		}
-	}
-	certIdList = strings.Join(certIdarr, ",")
 	svc := supplier.GetOilSupplierService(utils.DBE)
-	var list []supplier.OilSupplierView
-	if certIdList != "" {
-		where += " and b.Id in (" + certIdList + ")"
-		svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, orderby, asc, &list, where)
-		for _, item := range list {
-			todo.Id = item.Id
-			todo.CertId = item.CertId
-			todo.SupplierTypeCode = item.SupplierTypeCode
-			todo.Type = todolist.SUPPLIER
-			todo.SupplierName = item.SupplierName
-			todo.UserName = this.User.Realname
-			todolists = append(todolists, todo)
+	if stype == "1" || stype == "" {
+		//找出待办任务===准入
+		var certIdList string
+		if actisvc.GetMyTasks(workflow.OIL_SUPPLIER_APPLY, this.User.Id) != "" {
+			certIdList = actisvc.GetMyTasks(workflow.OIL_SUPPLIER_APPLY, this.User.Id)
+			certIdList = certIdList + ","
 		}
-	}
-
-	//找出待办任务 -- 增项
-	whereapp := "1=1"
-	whereapp = whereapp + " and b.Status>0"
-	appendIdList := actisvc.GetMyTasks(workflow.OIL_APPEND_APPLY, this.User.Id)
-	appendIdarr := strings.Split(appendIdList, ",")
-	for i, item := range appendIdarr {
-		idx := strings.Index(item, "-")
-		if (idx >= 0) {
-			appendIdarr[i] = strings.Split(item, "-")[0]
+		if actisvc.GetMyTasks(workflow.OIL_FIRST_SUPPLIER_APPLY, this.User.Id) != "" {
+			certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetMyTasks(workflow.OIL_FIRST_SUPPLIER_APPLY, this.User.Id))
+			certIdList = certIdList + ","
 		}
-	}
-	appendIdList = strings.Join(appendIdarr, ",")
-	var listapp []suppliercertappend.OilSupplierCertAppendTodo
-	svcapp := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
-	if appendIdList != "" {
-		whereapp += " and b.Id in (" + appendIdList + ")"
-		svcapp.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertAppendName, page.CurrentPage, page.Size, orderby, asc, &listapp, whereapp)
-		for _, item := range listapp {
-			todo.Id = item.Id
-			todo.Type = todolist.CERTAPPEND
-			todo.SupplierName = item.SupplierName
-			todo.UserName = this.User.Realname
-			todo.SupplierTypeCode = item.AppendType
-			todolists = append(todolists, todo)
+		if actisvc.GetMyTasks(workflow.OIL_SECOND_SUPPLIER_APPLY, this.User.Id) != "" {
+			certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetMyTasks(workflow.OIL_SECOND_SUPPLIER_APPLY, this.User.Id))
+			certIdList = certIdList + ","
 		}
-	}
-
-	//  待办--年审
-	whereannu := "1=1"
-	var listannu []annualaudit.OilAnnualAudit
-	annuIdList := actisvc.GetMyTasks(workflow.OIL_AUDIT_APPLY, this.User.Id)
-	annuIdarr := strings.Split(annuIdList, ",")
-	for i, item := range annuIdarr {
-		idx := strings.Index(item, "-")
-		if idx >= 0 {
-			annuIdarr[i] = strings.Split(item, "-")[0]
+		if actisvc.GetMyTasks(workflow.OIL_ENUSER_SUPPLIER_APPLY, this.User.Id) != "" {
+			certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetMyTasks(workflow.OIL_ENUSER_SUPPLIER_APPLY, this.User.Id))
+			certIdList = certIdList + ","
+		}
+		if actisvc.GetMyTasks(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, this.User.Id) != "" {
+			certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetMyTasks(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, this.User.Id))
+			certIdList = certIdList + ","
+		}
+		if actisvc.GetMyTasks(workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY, this.User.Id) != "" {
+			certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetMyTasks(workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY, this.User.Id))
+			certIdList = certIdList + ","
+		}
+		certIdList = strings.Trim(certIdList, ",")
+		certIdarr := strings.Split(certIdList, ",")
+		for i, item := range certIdarr {
+			idx := strings.Index(item, "-")
+			if idx >= 0 {
+				certIdarr[i] = strings.Split(item, "-")[0]
+			}
+		}
+		certIdList = strings.Join(certIdarr, ",")
+		var list []supplier.OilSupplierView
+		if certIdList != "" {
+			where += " and b.Id in (" + certIdList + ")"
+			svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, orderby, asc, &list, where)
+			for _, item := range list {
+				todo.Id = item.Id
+				todo.CertId = item.CertId
+				todo.SupplierTypeCode = item.SupplierTypeCode
+				todo.Type = todolist.SUPPLIER
+				todo.SupplierName = item.SupplierName
+				todo.UserName = this.User.Realname
+				todolists = append(todolists, todo)
+			}
 		}
 	}
-	annuIdList = strings.Join(annuIdarr, ",")
-	if annuIdList != "" {
-		whereannu += " and Id in (" + annuIdList + ")"
-		//根据部门查询待办任务
-		whereannu += " and Status != 2 "
-		svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listannu, whereannu)
-
-		for _, item := range listannu {
-			todo.Id = item.Id
-			todo.SupplierId = strconv.Itoa(item.SupplierId)
-			todo.Type = todolist.ANNUALAUDIT
-			todo.SupplierName = item.SupplierName
-			todo.UserName = this.User.Realname
-			todo.SupplierTypeCode = item.SupplierTypeName
-			todo.Step = strconv.Itoa(item.Step)
-			todo.WorkflowId = item.WorkflowId
-			todo.Status = item.Status
-			todo.CertId = strconv.Itoa(item.CerId)
-			todolists = append(todolists, todo)
+	if stype == "2" || stype == "" {
+		//找出待办任务 -- 增项
+		whereapp := "1=1"
+		whereapp = whereapp + " and b.Status>0"
+		appendIdList := actisvc.GetMyTasks(workflow.OIL_APPEND_APPLY, this.User.Id)
+		appendIdarr := strings.Split(appendIdList, ",")
+		for i, item := range appendIdarr {
+			idx := strings.Index(item, "-")
+			if (idx >= 0) {
+				appendIdarr[i] = strings.Split(item, "-")[0]
+			}
+		}
+		appendIdList = strings.Join(appendIdarr, ",")
+		var listapp []suppliercertappend.OilSupplierCertAppendTodo
+		svcapp := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
+		if appendIdList != "" {
+			whereapp += " and b.Id in (" + appendIdList + ")"
+			svcapp.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertAppendName, page.CurrentPage, page.Size, orderby, asc, &listapp, whereapp)
+			for _, item := range listapp {
+				todo.Id = item.Id
+				todo.Type = todolist.CERTAPPEND
+				todo.SupplierName = item.SupplierName
+				todo.UserName = this.User.Realname
+				todo.SupplierTypeCode = item.AppendType
+				todolists = append(todolists, todo)
+			}
 		}
 	}
+	if stype == "3" || stype == "" {
+		//  待办--年审
+		whereannu := "1=1"
+		if supplierName != "" {
+			whereannu = whereannu + " and SupplierName like '%" + supplierName + "%'"
+		}
+		var listannu []annualaudit.OilAnnualAudit
+		annuIdList := actisvc.GetMyTasks(workflow.OIL_AUDIT_APPLY, this.User.Id)
+		annuIdarr := strings.Split(annuIdList, ",")
+		for i, item := range annuIdarr {
+			idx := strings.Index(item, "-")
+			if idx >= 0 {
+				annuIdarr[i] = strings.Split(item, "-")[0]
+			}
+		}
+		annuIdList = strings.Join(annuIdarr, ",")
+		if annuIdList != "" {
+			whereannu += " and Id in (" + annuIdList + ")"
+			//根据部门查询待办任务
+			whereannu += " and Status != 2 "
+			svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listannu, whereannu)
 
-	// 待办 ----- 信息变更
-	var listInfo []infochange.OilInfoChange
-	whereInfo := "1=1"
-	infoList := actisvc.GetMyTasks(workflow.OIL_INFO_CHANGE, this.User.Id)
-	infoIdarr := strings.Split(infoList, ",")
-	for i, item := range infoIdarr {
-		idx := strings.Index(item, "-")
-		if (idx >= 0) {
-			infoIdarr[i] = strings.Split(item, "-")[0]
+			for _, item := range listannu {
+				todo.Id = item.Id
+				todo.SupplierId = strconv.Itoa(item.SupplierId)
+				todo.Type = todolist.ANNUALAUDIT
+				todo.SupplierName = item.SupplierName
+				todo.UserName = this.User.Realname
+				todo.SupplierTypeCode = item.SupplierTypeName
+				todo.Step = strconv.Itoa(item.Step)
+				todo.WorkflowId = item.WorkflowId
+				todo.Status = item.Status
+				todo.CertId = strconv.Itoa(item.CerId)
+				todolists = append(todolists, todo)
+			}
 		}
 	}
-	infoList = strings.Join(infoIdarr, ",")
-	if infoList != "" {
-		whereInfo += " and Id in (" + infoList + ")"
-		svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listInfo, whereInfo)
-		for _, item := range listInfo {
-			todo.Id = item.Id
-			todo.Type = todolist.INFOCHANGE
-			todo.SupplierName = item.SupplierName
-			todo.UserName = this.User.Realname
-			todo.SupplierTypeCode = item.SupplierTypeName
-			todo.Status = item.Status
-			todolists = append(todolists, todo)
+	if stype == "4" || stype == "" {
+		// 待办 ----- 信息变更
+		var listInfo []infochange.OilInfoChange
+		whereInfo := "1=1"
+		if supplierName != "" {
+			whereInfo = where + " and SupplierName like '%" + supplierName + "%'"
+		}
+		infoList := actisvc.GetMyTasks(workflow.OIL_INFO_CHANGE, this.User.Id)
+		infoIdarr := strings.Split(infoList, ",")
+		for i, item := range infoIdarr {
+			idx := strings.Index(item, "-")
+			if (idx >= 0) {
+				infoIdarr[i] = strings.Split(item, "-")[0]
+			}
+		}
+		infoList = strings.Join(infoIdarr, ",")
+		if infoList != "" {
+			whereInfo += " and Id in (" + infoList + ")"
+			svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listInfo, whereInfo)
+			for _, item := range listInfo {
+				todo.Id = item.Id
+				todo.Type = todolist.INFOCHANGE
+				todo.SupplierName = item.SupplierName
+				todo.UserName = this.User.Realname
+				todo.SupplierTypeCode = item.SupplierTypeName
+				todo.Status = item.Status
+				todolists = append(todolists, todo)
+			}
 		}
 	}
+	if stype == "5" || stype == "" {
+		// 资质变更
+		var listqual []qualchange.OilQualChangeMain
+		qualList := actisvc.GetMyTasks(workflow.OIL_QUAL_CHANGE, this.User.Id)
+		qualIdarr := strings.Split(qualList, ",")
+		for i, item := range qualIdarr {
+			idx := strings.Index(item, "-")
+			if idx >= 0 {
+				qualIdarr[i] = strings.Split(item, "-")[0]
+			}
+		}
+		qualList = strings.Join(qualIdarr, ",")
+		wherequal := "1=1 "
 
-	// 资质变更
-	var listqual []qualchange.OilQualChangeMain
-	qualList := actisvc.GetMyTasks(workflow.OIL_QUAL_CHANGE, this.User.Id)
-	qualIdarr := strings.Split(qualList, ",")
-	for i, item := range qualIdarr {
-		idx := strings.Index(item, "-")
-		if idx >= 0 {
-			qualIdarr[i] = strings.Split(item, "-")[0]
+		if supplierName != "" {
+			wherequal = wherequal + " and SupplierName like '%" + supplierName + "%'"
 		}
-	}
-	qualList = strings.Join(qualIdarr, ",")
-	wherequal := "1=1 "
-	if qualList != "" {
-		wherequal += " and Id in (" + qualList + ")"
-		wherequal += " and Status != -2 "
-		svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listqual, wherequal)
-		for _, item := range listqual {
-			todo.Id = item.Id
-			todo.CertId = strconv.Itoa(item.SupplierCertId)
-			todo.SupplierId = strconv.Itoa(item.SupplierId)
-			todo.Type = todolist.QUALCHANGE
-			todo.SupplierName = item.SupplierName
-			todo.UserName = this.User.Realname
-			todo.SupplierTypeCode = "0"
-			todolists = append(todolists, todo)
+		if qualList != "" {
+			wherequal += " and Id in (" + qualList + ")"
+			wherequal += " and Status != -2 "
+			svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listqual, wherequal)
+			for _, item := range listqual {
+				todo.Id = item.Id
+				todo.CertId = strconv.Itoa(item.SupplierCertId)
+				todo.SupplierId = strconv.Itoa(item.SupplierId)
+				todo.Type = todolist.QUALCHANGE
+				todo.SupplierName = item.SupplierName
+				todo.UserName = this.User.Realname
+				todo.SupplierTypeCode = "0"
+				todolists = append(todolists, todo)
+			}
 		}
 	}
 
@@ -255,10 +268,6 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 	supplierTypeCode := this.GetString("SupplierTypeCode")
 	supplierName := this.GetString("SupplierName")
 
-	if stype != "" {
-		where = where + " and b.SupplierTypeCode = '" + stype + "'"
-	}
-
 	if supplierTypeCode != "" {
 		where = where + " and b.SupplierTypeCode = '" + supplierTypeCode + "'"
 	}
@@ -267,163 +276,185 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 		where = where + " and a.SupplierName like '%" + supplierName + "%'"
 	}
 
-	//已办列表===准入
 	actisvc := workflow.GetActivitiService(utils.DBE)
-	var certIdList string
-	if actisvc.GetHistoryMyTasks(workflow.OIL_SUPPLIER_APPLY, this.User.Id) != "" {
-		certIdList = actisvc.GetHistoryMyTasks(workflow.OIL_SUPPLIER_APPLY, this.User.Id)
-		certIdList = certIdList + ","
-	}
-	if actisvc.GetHistoryMyTasks(workflow.OIL_FIRST_SUPPLIER_APPLY, this.User.Id) != "" {
-		certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetHistoryMyTasks(workflow.OIL_FIRST_SUPPLIER_APPLY, this.User.Id))
-		certIdList = certIdList + ","
-	}
-	if actisvc.GetHistoryMyTasks(workflow.OIL_SECOND_SUPPLIER_APPLY, this.User.Id) != "" {
-		certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetHistoryMyTasks(workflow.OIL_SECOND_SUPPLIER_APPLY, this.User.Id))
-		certIdList = certIdList + ","
-	}
-	if actisvc.GetHistoryMyTasks(workflow.OIL_ENUSER_SUPPLIER_APPLY, this.User.Id) != "" {
-		certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetHistoryMyTasks(workflow.OIL_ENUSER_SUPPLIER_APPLY, this.User.Id))
-		certIdList = certIdList + ","
-	}
-	if actisvc.GetHistoryMyTasks(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, this.User.Id) != "" {
-		certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetHistoryMyTasks(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, this.User.Id))
-		certIdList = certIdList + ","
-	}
-	if actisvc.GetHistoryMyTasks(workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY, this.User.Id) != "" {
-		certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetHistoryMyTasks(workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY, this.User.Id))
-	}
-	certIdList = strings.Trim(certIdList, ",")
-	certIdarr := strings.Split(certIdList, ",")
-	for i, item := range certIdarr {
-		idx := strings.Index(item, "-")
-		if idx >= 0 {
-			certIdarr[i] = strings.Split(item, "-")[0]
-		}
-	}
-	certIdList = strings.Join(certIdarr, ",")
 	svc := supplier.GetOilSupplierService(utils.DBE)
-	var list []supplier.OilSupplierView
-	if certIdList != "" {
-		where += " and b.Id in (" + certIdList + ")"
-		svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, orderby, asc, &list, where)
-		for _, item := range list {
-			todo.Id = item.Id
-			todo.CertId = item.CertId
-			todo.SupplierTypeCode = item.SupplierTypeCode
-			todo.Type = "1"
-			todo.SupplierName = item.SupplierName
-			todo.UserName = this.User.Realname
-			todolists = append(todolists, todo)
+	if stype == "1" || stype == "" {
+		//已办任务===准入
+		var certIdList string
+		if actisvc.GetHistoryMyTasks(workflow.OIL_SUPPLIER_APPLY, this.User.Id) != "" {
+			certIdList = actisvc.GetHistoryMyTasks(workflow.OIL_SUPPLIER_APPLY, this.User.Id)
+			certIdList = certIdList + ","
 		}
-	}
-
-	//已办列表 -- 增项
-	whereapp := "1=1"
-	whereapp = whereapp + " and b.Status>0"
-	appendIdList := actisvc.GetHistoryMyTasks(workflow.OIL_APPEND_APPLY, this.User.Id)
-	appendIdarr := strings.Split(appendIdList, ",")
-	for i, item := range appendIdarr {
-		idx := strings.Index(item, "-")
-		if (idx >= 0) {
-			appendIdarr[i] = strings.Split(item, "-")[0]
+		if actisvc.GetHistoryMyTasks(workflow.OIL_FIRST_SUPPLIER_APPLY, this.User.Id) != "" {
+			certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetHistoryMyTasks(workflow.OIL_FIRST_SUPPLIER_APPLY, this.User.Id))
+			certIdList = certIdList + ","
 		}
-	}
-	appendIdList = strings.Join(appendIdarr, ",")
-	var listapp []suppliercertappend.OilSupplierCertAppendTodo
-	svcapp := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
-	if appendIdList != "" {
-		whereapp += " and b.Id in (" + appendIdList + ")"
-		svcapp.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertAppendName, page.CurrentPage, page.Size, orderby, asc, &listapp, whereapp)
-		for _, item := range listapp {
-			todo.Id = item.Id
-			todo.Type = "2"
-			todo.SupplierName = item.SupplierName
-			todo.UserName = this.User.Realname
-			todo.SupplierTypeCode = item.AppendType
-			todolists = append(todolists, todo)
+		if actisvc.GetHistoryMyTasks(workflow.OIL_SECOND_SUPPLIER_APPLY, this.User.Id) != "" {
+			certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetHistoryMyTasks(workflow.OIL_SECOND_SUPPLIER_APPLY, this.User.Id))
+			certIdList = certIdList + ","
 		}
-	}
-
-	// 已办列表--年审
-	whereannu := "1=1"
-	var listannu []annualaudit.OilAnnualAudit
-	annuIdList := actisvc.GetHistoryMyTasks(workflow.OIL_AUDIT_APPLY, this.User.Id)
-	annuIdarr := strings.Split(annuIdList, ",")
-	for i, item := range annuIdarr {
-		idx := strings.Index(item, "-")
-		if idx >= 0 {
-			annuIdarr[i] = strings.Split(item, "-")[0]
+		if actisvc.GetHistoryMyTasks(workflow.OIL_ENUSER_SUPPLIER_APPLY, this.User.Id) != "" {
+			certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetHistoryMyTasks(workflow.OIL_ENUSER_SUPPLIER_APPLY, this.User.Id))
+			certIdList = certIdList + ","
+		}
+		if actisvc.GetHistoryMyTasks(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, this.User.Id) != "" {
+			certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetHistoryMyTasks(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, this.User.Id))
+			certIdList = certIdList + ","
+		}
+		if actisvc.GetHistoryMyTasks(workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY, this.User.Id) != "" {
+			certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetHistoryMyTasks(workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY, this.User.Id))
+			certIdList = certIdList + ","
+		}
+		certIdList = strings.Trim(certIdList, ",")
+		certIdarr := strings.Split(certIdList, ",")
+		for i, item := range certIdarr {
+			idx := strings.Index(item, "-")
+			if idx >= 0 {
+				certIdarr[i] = strings.Split(item, "-")[0]
+			}
+		}
+		certIdList = strings.Join(certIdarr, ",")
+		var list []supplier.OilSupplierView
+		if certIdList != "" {
+			where += " and b.Id in (" + certIdList + ")"
+			svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, orderby, asc, &list, where)
+			for _, item := range list {
+				todo.Id = item.Id
+				todo.CertId = item.CertId
+				todo.SupplierTypeCode = item.SupplierTypeCode
+				todo.Type = todolist.SUPPLIER
+				todo.SupplierName = item.SupplierName
+				todo.UserName = this.User.Realname
+				todolists = append(todolists, todo)
+			}
 		}
 	}
-	annuIdList = strings.Join(annuIdarr, ",")
-	if annuIdList != "" {
-		whereannu += " and Id in (" + annuIdList + ")"
-		//根据部门查询待办任务
-		whereannu += " and Status != 2 "
-		svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listannu, whereannu)
-
-		for _, item := range listannu {
-			todo.Id = item.Id
-			todo.Type = "3"
-			todo.SupplierName = item.SupplierName
-			todo.UserName = this.User.Realname
-			todo.SupplierTypeCode = item.SupplierTypeName
-			todolists = append(todolists, todo)
+	if stype == "2" || stype == "" {
+		//已办任务 -- 增项
+		whereapp := "1=1"
+		whereapp = whereapp + " and b.Status>0"
+		appendIdList := actisvc.GetHistoryMyTasks(workflow.OIL_APPEND_APPLY, this.User.Id)
+		appendIdarr := strings.Split(appendIdList, ",")
+		for i, item := range appendIdarr {
+			idx := strings.Index(item, "-")
+			if (idx >= 0) {
+				appendIdarr[i] = strings.Split(item, "-")[0]
+			}
+		}
+		appendIdList = strings.Join(appendIdarr, ",")
+		var listapp []suppliercertappend.OilSupplierCertAppendTodo
+		svcapp := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
+		if appendIdList != "" {
+			whereapp += " and b.Id in (" + appendIdList + ")"
+			svcapp.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertAppendName, page.CurrentPage, page.Size, orderby, asc, &listapp, whereapp)
+			for _, item := range listapp {
+				todo.Id = item.Id
+				todo.Type = todolist.CERTAPPEND
+				todo.SupplierName = item.SupplierName
+				todo.UserName = this.User.Realname
+				todo.SupplierTypeCode = item.AppendType
+				todolists = append(todolists, todo)
+			}
 		}
 	}
+	if stype == "3" || stype == "" {
+		//  已办--年审
+		whereannu := "1=1"
+		if supplierName != "" {
+			whereannu = whereannu + " and SupplierName like '%" + supplierName + "%'"
+		}
+		var listannu []annualaudit.OilAnnualAudit
+		annuIdList := actisvc.GetHistoryMyTasks(workflow.OIL_AUDIT_APPLY, this.User.Id)
+		annuIdarr := strings.Split(annuIdList, ",")
+		for i, item := range annuIdarr {
+			idx := strings.Index(item, "-")
+			if idx >= 0 {
+				annuIdarr[i] = strings.Split(item, "-")[0]
+			}
+		}
+		annuIdList = strings.Join(annuIdarr, ",")
+		if annuIdList != "" {
+			whereannu += " and Id in (" + annuIdList + ")"
+			//根据部门查询待办任务
+			whereannu += " and Status != 2 "
+			svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listannu, whereannu)
 
-	// 已办列表 -- 信息变更
-	var listInfo []infochange.OilInfoChange
-	whereInfo := "1=1"
-	infoList := actisvc.GetHistoryMyTasks(workflow.OIL_INFO_CHANGE, this.User.Id)
-	infoIdarr := strings.Split(infoList, ",")
-	for i, item := range infoIdarr {
-		idx := strings.Index(item, "-")
-		if (idx >= 0) {
-			infoIdarr[i] = strings.Split(item, "-")[0]
+			for _, item := range listannu {
+				todo.Id = item.Id
+				todo.SupplierId = strconv.Itoa(item.SupplierId)
+				todo.Type = todolist.ANNUALAUDIT
+				todo.SupplierName = item.SupplierName
+				todo.UserName = this.User.Realname
+				todo.SupplierTypeCode = item.SupplierTypeName
+				todo.Step = strconv.Itoa(item.Step)
+				todo.WorkflowId = item.WorkflowId
+				todo.Status = item.Status
+				todo.CertId = strconv.Itoa(item.CerId)
+				todolists = append(todolists, todo)
+			}
 		}
 	}
-	infoList = strings.Join(infoIdarr, ",")
-	if infoList != "" {
-		whereInfo += " and Id in (" + infoList + ")"
-		svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listInfo, whereInfo)
-		for _, item := range listInfo {
-			todo.Id = item.Id
-			todo.Type = "4"
-			todo.SupplierName = item.SupplierName
-			todo.UserName = this.User.Realname
-			todo.SupplierTypeCode = item.SupplierTypeName
-			todo.Status = item.Status
-			todolists = append(todolists, todo)
+	if stype == "4" || stype == "" {
+		// 已办 ----- 信息变更
+		var listInfo []infochange.OilInfoChange
+		whereInfo := "1=1"
+		if supplierName != "" {
+			whereInfo = where + " and SupplierName like '%" + supplierName + "%'"
+		}
+		infoList := actisvc.GetHistoryMyTasks(workflow.OIL_INFO_CHANGE, this.User.Id)
+		infoIdarr := strings.Split(infoList, ",")
+		for i, item := range infoIdarr {
+			idx := strings.Index(item, "-")
+			if (idx >= 0) {
+				infoIdarr[i] = strings.Split(item, "-")[0]
+			}
+		}
+		infoList = strings.Join(infoIdarr, ",")
+		if infoList != "" {
+			whereInfo += " and Id in (" + infoList + ")"
+			svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listInfo, whereInfo)
+			for _, item := range listInfo {
+				todo.Id = item.Id
+				todo.Type = todolist.INFOCHANGE
+				todo.SupplierName = item.SupplierName
+				todo.UserName = this.User.Realname
+				todo.SupplierTypeCode = item.SupplierTypeName
+				todo.Status = item.Status
+				todolists = append(todolists, todo)
+			}
 		}
 	}
+	if stype == "5" || stype == "" {
+		// 资质变更
+		var listqual []qualchange.OilQualChangeMain
+		qualList := actisvc.GetHistoryMyTasks(workflow.OIL_QUAL_CHANGE, this.User.Id)
+		qualIdarr := strings.Split(qualList, ",")
+		for i, item := range qualIdarr {
+			idx := strings.Index(item, "-")
+			if idx >= 0 {
+				qualIdarr[i] = strings.Split(item, "-")[0]
+			}
+		}
+		qualList = strings.Join(qualIdarr, ",")
+		wherequal := "1=1 "
 
-	// 已办列表 --资质变更
-	var listqual []qualchange.OilQualChangeMain
-	qualList := actisvc.GetHistoryMyTasks(workflow.OIL_QUAL_CHANGE, this.User.Id)
-	qualIdarr := strings.Split(qualList, ",")
-	for i, item := range qualIdarr {
-		idx := strings.Index(item, "-")
-		if idx >= 0 {
-			qualIdarr[i] = strings.Split(item, "-")[0]
+		if supplierName != "" {
+			wherequal = wherequal + " and SupplierName like '%" + supplierName + "%'"
 		}
-	}
-	qualList = strings.Join(qualIdarr, ",")
-	wherequal := "1=1 "
-	if qualList != "" {
-		wherequal += " and Id in (" + qualList + ")"
-		wherequal += " and Status != -2 "
-		svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listqual, wherequal)
-		for _, item := range listqual {
-			todo.Id = item.Id
-			todo.CertId = strconv.Itoa(item.SupplierCertId)
-			todo.SupplierId = strconv.Itoa(item.SupplierId)
-			todo.Type = "5"
-			todo.SupplierName = item.SupplierName
-			todo.UserName = this.User.Realname
-			todo.SupplierTypeCode = "0"
-			todolists = append(todolists, todo)
+		if qualList != "" {
+			wherequal += " and Id in (" + qualList + ")"
+			wherequal += " and Status != -2 "
+			svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listqual, wherequal)
+			for _, item := range listqual {
+				todo.Id = item.Id
+				todo.CertId = strconv.Itoa(item.SupplierCertId)
+				todo.SupplierId = strconv.Itoa(item.SupplierId)
+				todo.Type = todolist.QUALCHANGE
+				todo.SupplierName = item.SupplierName
+				todo.UserName = this.User.Realname
+				todo.SupplierTypeCode = "0"
+				todolists = append(todolists, todo)
+			}
 		}
 	}