|
|
@@ -1,13 +1,14 @@
|
|
|
package oilsupplier
|
|
|
|
|
|
import (
|
|
|
- "dashoo.cn/backend/api/business/auditsetting"
|
|
|
- "dashoo.cn/backend/api/business/organize"
|
|
|
"encoding/json"
|
|
|
"strconv"
|
|
|
"strings"
|
|
|
"time"
|
|
|
|
|
|
+ "dashoo.cn/backend/api/business/auditsetting"
|
|
|
+ "dashoo.cn/backend/api/business/organize"
|
|
|
+
|
|
|
"dashoo.cn/business2/permission"
|
|
|
|
|
|
"dashoo.cn/backend/api/business/workflow"
|
|
|
@@ -1007,7 +1008,7 @@ func (this *OilSupplierController) GetDictList() {
|
|
|
|
|
|
// 部门
|
|
|
orgsvc := organize.GetOrganizeService(utils.DBE)
|
|
|
- dictList["Organizes"] = orgsvc.GetCollectionDetailviewlist("'"+this.User.AccCode+"'")
|
|
|
+ dictList["Organizes"] = orgsvc.GetCollectionDetailviewlist("'" + this.User.AccCode + "'")
|
|
|
//var dictCustomer []svccustomer.Customer
|
|
|
//customerSvc.GetEntitysByWhere(this.User.AccCode + CustomerName, "", &dictCustomer)
|
|
|
//dictList["EntrustCorp"] = &dictCustomer
|
|
|
@@ -1057,7 +1058,7 @@ func (this *OilSupplierController) GetDictListByStatus() {
|
|
|
|
|
|
// 部门
|
|
|
orgsvc := organize.GetOrganizeService(utils.DBE)
|
|
|
- dictList["Organizes"] = orgsvc.GetCollectionDetailviewlist("'"+this.User.AccCode+"'")
|
|
|
+ dictList["Organizes"] = orgsvc.GetCollectionDetailviewlist("'" + this.User.AccCode + "'")
|
|
|
//var dictCustomer []svccustomer.Customer
|
|
|
//customerSvc.GetEntitysByWhere(this.User.AccCode + CustomerName, "", &dictCustomer)
|
|
|
//dictList["EntrustCorp"] = &dictCustomer
|
|
|
@@ -1080,7 +1081,6 @@ func (this *OilSupplierController) GetDictListByStatus() {
|
|
|
dictList["Auditer"] = users
|
|
|
}
|
|
|
|
|
|
-
|
|
|
var datainfo DataInfo
|
|
|
datainfo.Items = dictList
|
|
|
this.Data["json"] = &datainfo
|
|
|
@@ -1331,10 +1331,10 @@ func (this *OilSupplierController) UpdateNumberEntity() {
|
|
|
"ModifiedUserId",
|
|
|
"ModifiedBy",
|
|
|
}
|
|
|
- if modelCert.Step <= 2 {
|
|
|
- modelCert.Step = 2 //完成企业基本信息
|
|
|
- colcerts = append(colcerts, "Step")
|
|
|
- }
|
|
|
+ // if modelCert.Step <= 2 {
|
|
|
+ // modelCert.Step = 2 //完成企业基本信息
|
|
|
+ // colcerts = append(colcerts, "Step")
|
|
|
+ // }
|
|
|
|
|
|
err := svcCert.UpdateEntityBytbl(OilSupplierCertName, certId, &modelCert, colcerts)
|
|
|
|
|
|
@@ -1448,6 +1448,7 @@ func (this *OilSupplierController) CanUpdateSupplier() {
|
|
|
this.ServeJSON()
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
// @Title 获取二级初审人员
|
|
|
// @Description 获取二级初审人员
|
|
|
// @router /getauditerbydept/:deptId [get]
|
|
|
@@ -1463,4 +1464,4 @@ func (this *OilSupplierController) GetAuditerByDept() {
|
|
|
datainfo.Item = users
|
|
|
this.Data["json"] = &datainfo
|
|
|
this.ServeJSON()
|
|
|
-}
|
|
|
+}
|