供方

src/dashoo.cn/backend/api/business/oilsupplier/enterprisepersonnelstructure/oilenterprisepersonnelstructure.go

@@ -4,18 +4,18 @@ import (
 	"time"
 )
 
-type Oilenterprisepersonnelstructure struct {
+type OilenterPrisePersonnelStructure struct {
 	Id             int       `xorm:"not null pk autoincr INT(10)"`
-	Suppliercertid int       `xorm:"not null comment('供方准入证书信息表ID') INT(10)"`
-	Mainequipment  string    `xorm:"comment('主要设备名称') VARCHAR(100)"`
+	SupplierCertId int       `xorm:"not null comment('供方准入证书信息表ID') INT(10)"`
+	MainEquipment  string    `xorm:"comment('主要设备名称') VARCHAR(100)"`
 	Specifications string    `xorm:"not null default '0' comment('规格型号') VARCHAR(10)"`
 	Number         string    `xorm:"not null default '0' comment('数量') CHAR(10)"`
 	Remark         string    `xorm:"comment('备注') VARCHAR(500)"`
-	Isdelete       int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
-	Createon       time.Time `xorm:"DATETIME"`
-	Createuserid   int       `xorm:"INT(10)"`
-	Createby       string    `xorm:"VARCHAR(50)"`
-	Modifiedon     time.Time `xorm:"DATETIME"`
-	Modifieduserid int       `xorm:"INT(10)"`
-	Modifiedby     string    `xorm:"VARCHAR(50)"`
+	IsDelete       int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+	CreateOn       time.Time `xorm:"DATETIME"`
+	CreateUserId   int       `xorm:"INT(10)"`
+	CreateBy       string    `xorm:"VARCHAR(50)"`
+	ModifiedOn     time.Time `xorm:"DATETIME"`
+	ModifiedUserId int       `xorm:"INT(10)"`
+	ModifiedBy     string    `xorm:"VARCHAR(50)"`
 }

src/dashoo.cn/backend/api/business/oilsupplier/patentstatistical/oilpatentstatistical.go

@@ -4,19 +4,19 @@ import (
 	"time"
 )
 
-type Oilpatentstatistical struct {
+type OilpatentStatiStical struct {
 	Id                int       `xorm:"not null pk autoincr INT(10)"`
-	Suppliercertid    int       `xorm:"not null comment('供方准入证书信息表ID') INT(10)"`
+	SupplierCertId    int       `xorm:"not null comment('供方准入证书信息表ID') INT(10)"`
 	Name              string    `xorm:"comment('名称') VARCHAR(100)"`
 	Content           string    `xorm:"not null default '0' comment('主要内容') VARCHAR(100)"`
-	Approvalauthority string    `xorm:"not null default '0' comment('批准机关') VARCHAR(50)"`
-	Approvaldate      time.Time `xorm:"comment('批准日期') DATETIME"`
+	ApprovalAuthority string    `xorm:"not null default '0' comment('批准机关') VARCHAR(50)"`
+	ApprovalDate      time.Time `xorm:"comment('批准日期') DATETIME"`
 	Remark            string    `xorm:"comment('备注') VARCHAR(500)"`
 	Isdelete          int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
-	Createon          time.Time `xorm:"DATETIME"`
-	Createuserid      int       `xorm:"INT(10)"`
-	Createby          string    `xorm:"VARCHAR(50)"`
-	Modifiedon        time.Time `xorm:"DATETIME"`
-	Modifieduserid    int       `xorm:"INT(10)"`
-	Modifiedby        string    `xorm:"VARCHAR(50)"`
+	CreateOn          time.Time `xorm:"DATETIME"`
+	CreateUserId      int       `xorm:"INT(10)"`
+	CreateBy          string    `xorm:"VARCHAR(50)"`
+	ModifiedOn        time.Time `xorm:"DATETIME"`
+	ModifieduserId    int       `xorm:"INT(10)"`
+	ModifiedBy        string    `xorm:"VARCHAR(50)"`
 }

src/dashoo.cn/backend/api/business/oilsupplier/threeyearsperformance/oilthreeyearsperformance.go

@@ -4,21 +4,21 @@ import (
 	"time"
 )
 
-type Oilthreeyearsperformance struct {
+type OilThreeYearsPerformance struct {
 	Id             int       `xorm:"not null pk autoincr INT(10)"`
-	Suppliercertid int       `xorm:"not null comment('供方准入证书信息表ID') INT(10)"`
-	Projectname    string    `xorm:"comment('主要设备名称') VARCHAR(100)"`
-	Bearcontent    string    `xorm:"not null default '0' comment('承担项目主要内容') VARCHAR(100)"`
-	Ownerunit      string    `xorm:"not null default '0' comment('业主单位') VARCHAR(100)"`
-	Starttime      time.Time `xorm:"comment('起止时间') DATETIME"`
-	Stoptime       time.Time `xorm:"comment('起止时间') DATETIME"`
+	SupplierCertid int       `xorm:"not null comment('供方准入证书信息表ID') INT(10)"`
+	ProjectName    string    `xorm:"comment('主要设备名称') VARCHAR(100)"`
+	BearContent    string    `xorm:"not null default '0' comment('承担项目主要内容') VARCHAR(100)"`
+	OwnerUnit      string    `xorm:"not null default '0' comment('业主单位') VARCHAR(100)"`
+	StartTime      time.Time `xorm:"comment('起止时间') DATETIME"`
+	StopTime       time.Time `xorm:"comment('起止时间') DATETIME"`
 	Tudge          string    `xorm:"not null default '0' comment('是否发生过质量、安全、环境事故') VARCHAR(20)"`
 	Remark         string    `xorm:"comment('备注') VARCHAR(500)"`
-	Isdelete       int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
-	Createon       time.Time `xorm:"DATETIME"`
-	Createuserid   int       `xorm:"INT(10)"`
+	IsDelete       int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+	CreateOn       time.Time `xorm:"DATETIME"`
+	CreateUserid   int       `xorm:"INT(10)"`
 	Createby       string    `xorm:"VARCHAR(50)"`
-	Modifiedon     time.Time `xorm:"DATETIME"`
-	Modifieduserid int       `xorm:"INT(10)"`
-	Modifiedby     string    `xorm:"VARCHAR(50)"`
+	ModifiedOn     time.Time `xorm:"DATETIME"`
+	ModifiedUserId int       `xorm:"INT(10)"`
+	ModifiedBy     string    `xorm:"VARCHAR(50)"`
 }

src/dashoo.cn/backend/api/business/oilsupplier/winningproject/oilwinningproject.go

@@ -6,16 +6,16 @@ import (
 
 type OilWinningProject struct {
 	Id             int       `xorm:"not null pk autoincr INT(10)"`
-	Suppliercertid int       `xorm:"not null comment('供方准入证书信息表ID') INT(10)"`
-	Awardname      string    `xorm:"comment('奖项名称') VARCHAR(100)"`
-	Winningtime    time.Time `xorm:"comment('获奖时间') DATETIME"`
+	SupplierCertid int       `xorm:"not null comment('供方准入证书信息表ID') INT(10)"`
+	AwardName      string    `xorm:"comment('奖项名称') VARCHAR(100)"`
+	WinningTime    time.Time `xorm:"comment('获奖时间') DATETIME"`
 	Authorities    string    `xorm:"not null default '0' comment('颁奖机关') VARCHAR(10)"`
 	Remark         string    `xorm:"comment('备注') VARCHAR(500)"`
-	Isdelete       int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
-	Createon       time.Time `xorm:"DATETIME"`
-	Createuserid   int       `xorm:"INT(10)"`
-	Createby       string    `xorm:"VARCHAR(50)"`
-	Modifiedon     time.Time `xorm:"DATETIME"`
-	Modifieduserid int       `xorm:"INT(10)"`
-	Modifiedby     string    `xorm:"VARCHAR(50)"`
+	IsDelete       int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+	CreateOn       time.Time `xorm:"DATETIME"`
+	CreateuserId   int       `xorm:"INT(10)"`
+	CreateBy       string    `xorm:"VARCHAR(50)"`
+	ModifiedOn     time.Time `xorm:"DATETIME"`
+	ModifieduserId int       `xorm:"INT(10)"`
+	ModifiedBy     string    `xorm:"VARCHAR(50)"`
 }

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

@@ -1,14 +1,15 @@
 package oilsupplier
 
 import (
-	"dashoo.cn/business/userRole"
+	"encoding/json"
+	"strings"
+	"time"
+
 	"dashoo.cn/backend/api/business/baseUser"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
 	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/business/userRole"
 	"dashoo.cn/utils"
-	"encoding/json"
-	"strings"
-	"time"
 )
 
 type OilSupplierCertController struct {
@@ -44,7 +45,7 @@ func (this *OilSupplierCertController) GetEntityList() {
 	RecDate := this.GetString("RecDate")
 	RecUnitId := this.GetString("RecUnitId")
 	RecUnitName := this.GetString("RecUnitName")
-	Status := this.GetString("Status")
+	StatusA := this.GetString("StatusA")
 	BackReason := this.GetString("BackReason")
 	InFlag := this.GetString("InFlag")
 	EffectStartTime := this.GetString("EffectStartTime")
@@ -77,192 +78,154 @@ func (this *OilSupplierCertController) GetEntityList() {
 		where = where + " and Id like '%" + Id + "%'"
 	}
 
-
 	if SupplierId != "" {
 		where = where + " and SupplierId like '%" + SupplierId + "%'"
 	}
 
-
 	if AccessCardNo != "" {
 		where = where + " and AccessCardNo like '%" + AccessCardNo + "%'"
 	}
 
-
 	if SupplierTypeCode != "" {
 		where = where + " and SupplierTypeCode like '%" + SupplierTypeCode + "%'"
 	}
 
-
 	if SupplierTypeName != "" {
 		where = where + " and SupplierTypeName like '%" + SupplierTypeName + "%'"
 	}
 
-
 	if RecUnitReason != "" {
 		where = where + " and RecUnitReason like '%" + RecUnitReason + "%'"
 	}
 
-
 	if RecUnitPerson != "" {
 		where = where + " and RecUnitPerson like '%" + RecUnitPerson + "%'"
 	}
 
-
 	if RecDate != "" {
 		where = where + " and RecDate like '%" + RecDate + "%'"
 	}
 
-
 	if RecUnitId != "" {
 		where = where + " and RecUnitId like '%" + RecUnitId + "%'"
 	}
 
-
 	if RecUnitName != "" {
 		where = where + " and RecUnitName like '%" + RecUnitName + "%'"
 	}
 
-
-	if Status != "" {
-		where = where + " and Status like '%" + Status + "%'"
+	if StatusA != "" {
+		where = where + " and StatusA like '%" + StatusA + "%'"
 	}
 
-
 	if BackReason != "" {
 		where = where + " and BackReason like '%" + BackReason + "%'"
 	}
 
-
 	if InFlag != "" {
 		where = where + " and InFlag like '%" + InFlag + "%'"
 	}
 
-
 	if EffectStartTime != "" {
 		where = where + " and EffectStartTime like '%" + EffectStartTime + "%'"
 	}
 
-
 	if EffectEndTime != "" {
 		where = where + " and EffectEndTime like '%" + EffectEndTime + "%'"
 	}
 
-
 	if AuditProcessNote != "" {
 		where = where + " and AuditProcessNote like '%" + AuditProcessNote + "%'"
 	}
 
-
 	if AuditDate != "" {
 		where = where + " and AuditDate like '%" + AuditDate + "%'"
 	}
 
-
 	if PayNotice != "" {
 		where = where + " and PayNotice like '%" + PayNotice + "%'"
 	}
 
-
 	if SupplierStatus != "" {
 		where = where + " and SupplierStatus like '%" + SupplierStatus + "%'"
 	}
 
-
 	if MgrType != "" {
 		where = where + " and MgrType like '%" + MgrType + "%'"
 	}
 
-
 	if Type != "" {
 		where = where + " and Type like '%" + Type + "%'"
 	}
 
-
 	if MgrUnit != "" {
 		where = where + " and MgrUnit like '%" + MgrUnit + "%'"
 	}
 
-
 	if AddinTime != "" {
 		where = where + " and AddinTime like '%" + AddinTime + "%'"
 	}
 
-
 	if EffectTime != "" {
 		where = where + " and EffectTime like '%" + EffectTime + "%'"
 	}
 
-
 	if ApplyTime != "" {
 		where = where + " and ApplyTime like '%" + ApplyTime + "%'"
 	}
 
-
 	if SupplierNo != "" {
 		where = where + " and SupplierNo like '%" + SupplierNo + "%'"
 	}
 
-
 	if MDMFlag != "" {
 		where = where + " and MDMFlag like '%" + MDMFlag + "%'"
 	}
 
-
 	if InternalFlag != "" {
 		where = where + " and InternalFlag like '%" + InternalFlag + "%'"
 	}
 
-
 	if ImportFlag != "" {
 		where = where + " and ImportFlag like '%" + ImportFlag + "%'"
 	}
 
-
 	if OutsideFlog != "" {
 		where = where + " and OutsideFlog like '%" + OutsideFlog + "%'"
 	}
 
-
 	if Remark != "" {
 		where = where + " and Remark like '%" + Remark + "%'"
 	}
 
-
 	if IsDelete != "" {
 		where = where + " and IsDelete like '%" + IsDelete + "%'"
 	}
 
-
 	if CreateOn != "" {
 		where = where + " and CreateOn like '%" + CreateOn + "%'"
 	}
 
-
 	if CreateUserId != "" {
 		where = where + " and CreateUserId like '%" + CreateUserId + "%'"
 	}
 
-
 	if CreateBy != "" {
 		where = where + " and CreateBy like '%" + CreateBy + "%'"
 	}
 
-
 	if ModifiedOn != "" {
 		where = where + " and ModifiedOn like '%" + ModifiedOn + "%'"
 	}
 
-
 	if ModifiedUserId != "" {
 		where = where + " and ModifiedUserId like '%" + ModifiedUserId + "%'"
 	}
 
-
 	if ModifiedBy != "" {
 		where = where + " and ModifiedBy like '%" + ModifiedBy + "%'"
 	}
 
-
 	if CreateOn != "" {
 		dates := strings.Split(CreateOn, ",")
 		if len(dates) == 2 {
@@ -459,8 +422,6 @@ func (this *OilSupplierCertController) UpdateEntity() {
 		"ModifiedUserId",
 
 		"ModifiedBy",
-
-
 	}
 	err := svc.UpdateEntityBytbl(OilSupplierCertName, id, &model, cols)
 	if err == nil {
@@ -507,4 +468,4 @@ func (this *OilSupplierCertController) DeleteEntity() {
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	}
-}
+}