merge auditsetting

src/dashoo.cn/backend/api/business/auditsetting/oilauditsetting.go

@@ -4,7 +4,7 @@ import (
 	"time"
 )
 
-type BaseOilAuditSetting struct {
+type Base_OilAuditSetting struct {
 	Id             int       `xorm:"not null pk autoincr INT(10)"`
 	OrganizeId     int       `xorm:"not null default 0 comment('单位ID') INT(10)"`
 	OrganizeName   string    `xorm:"comment('单位名称') VARCHAR(100)"`

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

@@ -229,6 +229,7 @@ var (
 	LimsReportSignName                       string = "LimsReportSign"              //报告签发
 	LimsReportHistoryName                    string = "LimsReportHistory"           //报告历史
 	LimsCustomerpositionName                 string = "LimsCustomerPosition"
+<<<<<<< HEAD
 	LimsPressureLeakName                     string = "LimsPressureLeak"               //阻火器压力损失表
 	LimsSpecifyStandardName                  string = "LimsSpecifyStandard"            //Lims规格型号标准
 	BaseUserName                             string = "Base_User"                      //用户表
@@ -255,6 +256,14 @@ var (
 	LimsReportDrillCollarName                string = "LimsReportDrillCollar"          //  石油专用管材方钻杆检验记录
 	LimsPetroleUmPipeName                    string = "LimsReportPetroleumPipe"              //  石油专用管材钻铤检验记录
 
+=======
+	LimsPressureLeakName                     string = "LimsPressureLeak"    //阻火器压力损失表
+	LimsSpecifyStandardName                  string = "LimsSpecifyStandard" //Lims规格型号标准
+	BaseUserName                             string = "Base_User"           //用户表
+	UserQualificationName                    string = "UserQualification"   //用户资质表
+	LimsInstrumentGroup                      string = "LimsInstrumentGroup" // 检测仪器关联
+	OilAuditSettingName                          string = "Base_OilAuditSetting" // 单位审批步骤自定义配置
+>>>>>>> upstream/master
 )
 
 //分页信息及数据

src/dashoo.cn/backend/api/controllers/system/auditsetting.go

@@ -102,7 +102,7 @@ func (this *OilAuditSettingController) GetEntityList() {
 	}
 
 	svc := auditsetting.GetOilAuditSettingService(utils.DBE)
-	var list []auditsetting.BaseOilAuditSetting
+	var list []auditsetting.Base_OilAuditSetting
 	total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
 	var datainfo DataInfo
 	datainfo.Items = list
@@ -154,7 +154,7 @@ func (this *OilAuditSettingController) GetDictList() {
 func (this *OilAuditSettingController) GetEntity() {
 	Id := this.Ctx.Input.Param(":id")
 
-	var model auditsetting.BaseOilAuditSetting
+	var model auditsetting.Base_OilAuditSetting
 	svc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	svc.GetEntityByIdBytbl(OilAuditSettingName, Id, &model)
 
@@ -168,7 +168,7 @@ func (this *OilAuditSettingController) GetEntity() {
 // @Success	200	{object} controllers.Request
 // @router /add [post]
 func (this *OilAuditSettingController) AddEntity() {
-	var model auditsetting.BaseOilAuditSetting
+	var model auditsetting.Base_OilAuditSetting
 	var jsonBlob = this.Ctx.Input.RequestBody
 	svc := auditsetting.GetOilAuditSettingService(utils.DBE)
 
@@ -212,7 +212,7 @@ func (this *OilAuditSettingController) UpdateEntity() {
 		return
 	}
 
-	var model auditsetting.BaseOilAuditSetting
+	var model auditsetting.Base_OilAuditSetting
 	svc := auditsetting.GetOilAuditSettingService(utils.DBE)
 
 	var jsonBlob = this.Ctx.Input.RequestBody
@@ -270,8 +270,8 @@ func (this *OilAuditSettingController) DeleteEntity() {
 		this.ServeJSON()
 		return
 	}
-	var model auditsetting.BaseOilAuditSetting
-	var entityempty auditsetting.BaseOilAuditSetting
+	var model auditsetting.Base_OilAuditSetting
+	var entityempty auditsetting.Base_OilAuditSetting
 	svc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	opdesc := "删除-" + Id
 	err := svc.DeleteOperationAndWriteLogBytbl(OilAuditSettingName, BaseOperationLogName, Id, &model, &entityempty, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "钻井日报")