|
@@ -406,7 +406,6 @@ func (this *TodoListController) GetMyTaskEntityList() {
|
|
|
// @router /getmytaskfinishedlist [get]
|
|
// @router /getmytaskfinishedlist [get]
|
|
|
func (this *TodoListController) GetMyTaskFinishedList() {
|
|
func (this *TodoListController) GetMyTaskFinishedList() {
|
|
|
var todolists []todolist.TodoList
|
|
var todolists []todolist.TodoList
|
|
|
- var todo todolist.TodoList
|
|
|
|
|
|
|
|
|
|
page := this.GetPageInfoForm()
|
|
page := this.GetPageInfoForm()
|
|
|
where := " 1=1 "
|
|
where := " 1=1 "
|
|
@@ -509,6 +508,7 @@ func (this *TodoListController) GetMyTaskFinishedList() {
|
|
|
if certIdList != "" {
|
|
if certIdList != "" {
|
|
|
where += " and b.Id in (" + certIdList + ")"
|
|
where += " and b.Id in (" + certIdList + ")"
|
|
|
svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, orderby, asc, &list, where)
|
|
svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, orderby, asc, &list, where)
|
|
|
|
|
+ var todo todolist.TodoList
|
|
|
for _, item := range list {
|
|
for _, item := range list {
|
|
|
todo.Id = item.Id
|
|
todo.Id = item.Id
|
|
|
todo.CertId = item.CertId
|
|
todo.CertId = item.CertId
|
|
@@ -604,6 +604,7 @@ func (this *TodoListController) GetMyTaskFinishedList() {
|
|
|
if appendIdList != "" {
|
|
if appendIdList != "" {
|
|
|
whereapp += " and b.Id in (" + appendIdList + ")"
|
|
whereapp += " and b.Id in (" + appendIdList + ")"
|
|
|
svcapp.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertAppendName, page.CurrentPage, page.Size, orderby, asc, &listapp, whereapp)
|
|
svcapp.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertAppendName, page.CurrentPage, page.Size, orderby, asc, &listapp, whereapp)
|
|
|
|
|
+ var todo todolist.TodoList
|
|
|
for _, item := range listapp {
|
|
for _, item := range listapp {
|
|
|
todo.Id = item.Id
|
|
todo.Id = item.Id
|
|
|
todo.Type = todolist.CERTAPPEND
|
|
todo.Type = todolist.CERTAPPEND
|
|
@@ -642,7 +643,7 @@ func (this *TodoListController) GetMyTaskFinishedList() {
|
|
|
//根据部门查询待办任务
|
|
//根据部门查询待办任务
|
|
|
whereannu += " and Status != 2 "
|
|
whereannu += " and Status != 2 "
|
|
|
svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listannu, whereannu)
|
|
svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listannu, whereannu)
|
|
|
-
|
|
|
|
|
|
|
+ var todo todolist.TodoList
|
|
|
for _, item := range listannu {
|
|
for _, item := range listannu {
|
|
|
todo.Id = item.Id
|
|
todo.Id = item.Id
|
|
|
todo.SupplierId = strconv.Itoa(item.SupplierId)
|
|
todo.SupplierId = strconv.Itoa(item.SupplierId)
|
|
@@ -682,6 +683,7 @@ func (this *TodoListController) GetMyTaskFinishedList() {
|
|
|
if infoList != "" {
|
|
if infoList != "" {
|
|
|
whereInfo += " and Id in (" + infoList + ")"
|
|
whereInfo += " and Id in (" + infoList + ")"
|
|
|
svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listInfo, whereInfo)
|
|
svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listInfo, whereInfo)
|
|
|
|
|
+ var todo todolist.TodoList
|
|
|
for _, item := range listInfo {
|
|
for _, item := range listInfo {
|
|
|
todo.Id = item.Id
|
|
todo.Id = item.Id
|
|
|
todo.Type = todolist.INFOCHANGE
|
|
todo.Type = todolist.INFOCHANGE
|
|
@@ -743,6 +745,7 @@ func (this *TodoListController) GetMyTaskFinishedList() {
|
|
|
where = where + " and CheckUserId like '%" + this.User.Id + "%' "
|
|
where = where + " and CheckUserId like '%" + this.User.Id + "%' "
|
|
|
|
|
|
|
|
svc := register.GetOilCorporateInfoService(utils.DBE)
|
|
svc := register.GetOilCorporateInfoService(utils.DBE)
|
|
|
|
|
+ var todo todolist.TodoList
|
|
|
var list []register.OilCorporateInfo
|
|
var list []register.OilCorporateInfo
|
|
|
_, list = svc.GetCompanyListByWhere(page.CurrentPage, page.Size, "Id desc", "OilCorporateInfo", where)
|
|
_, list = svc.GetCompanyListByWhere(page.CurrentPage, page.Size, "Id desc", "OilCorporateInfo", where)
|
|
|
for _, item := range list {
|
|
for _, item := range list {
|
lining