后:资质列表排序;投招标对外接口

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplier.go

@@ -300,6 +300,8 @@ type CompanyList struct {
 	SupplierStatus    string    `xorm:"comment('供应商状态（null:正常，1中止，2终止）') VARCHAR(255)"`
 	Type              string    `xorm:"comment('供应商类型') VARCHAR(255)"`
 	ApplyTime         time.Time `xorm:"comment('年审日期') DATETIME"`
+	BusinessScope     string    `xorm:"comment('营业范围') TEXT"`
+
 }
 
 type OilSupplierView1 struct {

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

@@ -1637,7 +1637,7 @@ func (this *AnnualAuditController) FileList() {
 	var list []qualchange.OilQualChangeDetail1
 	svc := qualchange.GetQualChangeService(utils.DBE)
 	where := " 1=1 and a.IsDelete = 0"
-	orderby := "a.Id"
+	orderby := "a.SupplierTypeCode"
 	asc := true
 	Order := this.GetString("Order")
 	Prop := this.GetString("Prop")

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

@@ -53,7 +53,7 @@ type Processinfo struct {
 	AccessCardNo     string
 	WorkflowId       string
 	ProcessKey       string
-	SupplierName     string	
+	SupplierName     string
 	SupplierTypeCode string
 	Status           string
 	Type             string
@@ -1237,7 +1237,7 @@ func (this *SelectController) FileList() {
 	var list []supplierfile.OilSupplierFile
 	svc := supplierfile.GetSupplierfileService(utils.DBE)
 	where := " 1=1"
-	orderby := "Id"
+	orderby := "SupplierTypeCode"
 	asc := true
 	Order := this.GetString("Order")
 	Prop := this.GetString("Prop")

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

@@ -2887,14 +2887,15 @@ func (this *OilSupplierController) CheckSupplierFileNew() {
 	this.ServeJSON()
 }
 
-// @Title 对外
+// @Title 对外-招投标系统
 // @Description
 // @Success 200 {object}
-// @router /getCompanyList [post]
-func (this *OilSupplierController) GetCompanyList() {
+// @router /getSupplierList [post]
+func (this *OilSupplierController) GetSupplierList() {
 
 	//获取分页信息
-	page := this.GetPageInfoForm()
+	CurrentPage, _ := this.GetInt64("pageIndex",1)
+	Size, _ := this.GetInt64("pageSize",10)
 	where := " b.InFlag = 1 "
 	orderby := "Id"
 	asc := false
@@ -2906,9 +2907,9 @@ func (this *OilSupplierController) GetCompanyList() {
 			asc = true
 		}
 	}
-	SupplierName := this.GetString("SupplierName")
+	SupplierName := this.GetString("Keyword")
 	SupplierTypeName := this.GetString("SupplierTypeName")
-	SupplierTypeCode := this.GetString("SupplierTypeCode")
+	SupplierTypeCode := this.GetString("accessCategoryCode")
 	if SupplierName != "" {
 		where = where + " and a.SupplierName like '%" + SupplierName + "%'"
 	}
@@ -2923,15 +2924,13 @@ func (this *OilSupplierController) GetCompanyList() {
 
 	var total int64
 	var list []supplier.CompanyList
-	if this.User.Username == "ceshi2" {
-		total = svc.GetMyPagingEntitiesWithOrderBytbl4(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, orderby, asc, &list, where)
-	}
+	total = svc.GetMyPagingEntitiesWithOrderBytbl4(OilSupplierName, OilSupplierCertName, CurrentPage, Size, orderby, asc, &list, where)
 
 	var datainfo DataInfo
 	datainfo.Items = list
 	datainfo.CurrentItemCount = total
-	datainfo.PageIndex = page.CurrentPage
-	datainfo.ItemsPerPage = page.Size
+	datainfo.PageIndex = CurrentPage
+	datainfo.ItemsPerPage = Size
 	this.Data["json"] = &datainfo
 	this.ServeJSON()
 

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

@@ -1017,7 +1017,7 @@ func (this *OilSupplierCertAppendSubController) FileList() {
 	var list []suppliercertappendsub.OilAppendChangeDetail1
 	svc := suppliercertappendsub.GetOilSupplierCertAppendSubService(utils.DBE)
 	where := " 1=1"
-	orderby := "a.Id"
+	orderby := "a.SupplierTypeCode"
 	asc := true
 	Order := this.GetString("Order")
 	Prop := this.GetString("Prop")

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

@@ -31,7 +31,7 @@ func (this *SupplierfileController) AllFileList() {
 	var list []supplierfile.OilSupplierFile
 	svc := supplierfile.GetSupplierfileService(utils.DBE)
 	where := " 1=1"
-	orderby := "Id"
+	orderby := "SupplierTypeCode"
 	asc := true
 	Order := this.GetString("Order")
 	Prop := this.GetString("Prop")
@@ -67,7 +67,7 @@ func (this *SupplierfileController) FileListAppend() {
 	var list []supplierfile.OilSupplierFile
 	svc := supplierfile.GetSupplierfileService(utils.DBE)
 	where := " 1=1"
-	orderby := "Id"
+	orderby := "SupplierTypeCode"
 	asc := true
 	Order := this.GetString("Order")
 	Prop := this.GetString("Prop")
@@ -104,7 +104,7 @@ func (this *SupplierfileController) FileList() {
 	var list []supplierfile.OilSupplierFile
 	svc := supplierfile.GetSupplierfileService(utils.DBE)
 	where := " 1=1"
-	orderby := "Id"
+	orderby := "SupplierTypeCode"
 	asc := true
 	Order := this.GetString("Order")
 	Prop := this.GetString("Prop")

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

@@ -592,3 +592,10 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 	this.Data["json"] = &datainfo
 	this.ServeJSON()
 }
+
+// @Title 获取待办发港信通提醒
+// @Description get user by token
+// @Success 200 {object} []supplier.OilSupplierView
+// @router /getToDoSend [get]
+func (this *TodoListController) GetToDoSend() {
+}

src/dashoo.cn/backend/api/controllers/toolbox/toolbox.go

@@ -13,6 +13,7 @@ import (
 func TimingTask(){
 	c := new(oilsupplier.OilSupplierCertController)
 	invoice := new(invoice.OilInvoiceController)
+	//todo := new(oilsupplier.TodoListController)
 
 	//tkInFlag := toolbox.NewTask("myTaskInFlag", "0 0 1 * * *", func() error {
 	//	c.UpdataInFlag()
@@ -68,6 +69,12 @@ func TimingTask(){
 	} */
 	toolbox.AddTask("myTaskInvoiceStatus", tkInvoiceStatus)
 
+	// 有待办调港信通
+	//tkToDo := toolbox.NewTask("myTaskToDo", "0 0 2 * * *", func() error {
+	//	todo.GetToDoSend()
+	//	return nil
+	//})
+	//toolbox.AddTask("myTaskToDo", tkToDo)
 
 	toolbox.StartTask()