Browse Source

修复字段硬编码的bug

pull/89/head
zhangxin 3 years ago
parent
commit
979b84b71f
4 changed files with 29 additions and 29 deletions
  1. +5
    -5
      dao/ap/implments/WeekModelLst.dao.impl.go
  2. +5
    -5
      dao/ap/implments/WorkCalendarLst.dao.impl.go
  3. +10
    -10
      meta/ap/WeekModel.meta.go
  4. +9
    -9
      web/controllers/base/base.go

+ 5
- 5
dao/ap/implments/WeekModelLst.dao.impl.go View File

@ -365,14 +365,14 @@ func (impl *WeekModelLstDAOImplement) SelectJoinDayModel(weekModelNr int) ([]mod
//} else {
// session = session.Where(where, parameters...)
//}
session.Where("WeekModelLst.PlantNr = ? and WeekModelLst.WeekModelNr = ?", impl.plantNr, weekModelNr)
condition := fmt.Sprintf("%s.PlantNr = %s.PlantNr and %s = %s",
meta.WeekModelLst.TableName,
meta.DayModel.TableName,
session.Where(fmt.Sprintf("%s = ? and %s = ?", meta.WeekModelLst_PlantNr.ColumnName,meta.WeekModelLst_WeekModelNr.ColumnName), impl.plantNr, weekModelNr)
condition := fmt.Sprintf("%s = %s and %s = %s",
meta.WeekModelLst_PlantNr.ColumnName,
meta.DayModel_PlantNr.ColumnName,
meta.WeekModelLst_DayModelNr.ColumnName,
meta.DayModel_DayModelNr.ColumnName)
session.Join("LEFT", meta.DayModel.TableName, condition)
session = session.OrderBy("WeekModelLst.PlantNr")
session = session.OrderBy(meta.WeekModelLst_PlantNr.ColumnName)
//if orderByFields != nil {
// for _, field := range orderByFields {
// session = session.OrderBy(field.ColumnName)


+ 5
- 5
dao/ap/implments/WorkCalendarLst.dao.impl.go View File

@ -357,14 +357,14 @@ func (impl *WorkCalendarLstDAOImplement) SelectJoinDayModel(workCalendarNr int)
//} else {
// session = session.Where(where, parameters...)
//}
session.Where("WorkCalendarLst.PlantNr = ? and WorkCalendarLst.WorkCalendarNr = ?", impl.plantNr, workCalendarNr)
condition := fmt.Sprintf("%s.PlantNr = %s.PlantNr and %s = %s",
meta.WorkCalendarLst.TableName,
meta.DayModel.TableName,
session.Where(fmt.Sprintf("%s = ? and %s = ?", meta.WorkCalendarLst_PlantNr.ColumnName, meta.WorkCalendarLst_WorkCalendarNr.ColumnName), impl.plantNr, workCalendarNr)
condition := fmt.Sprintf("%s = %s and %s = %s",
meta.WorkCalendarLst_PlantNr.ColumnName,
meta.DayModel_PlantNr.ColumnName,
meta.WorkCalendarLst_DayModelNr.ColumnName,
meta.DayModel_DayModelNr.ColumnName)
session.Join("LEFT", meta.DayModel.TableName, condition)
session = session.OrderBy("WorkCalendarLst.PlantNr")
session = session.OrderBy(meta.WorkCalendarLst_PlantNr.ColumnName)
//if orderByFields != nil {
// for _, field := range orderByFields {
// session = session.OrderBy(field.ColumnName)


+ 10
- 10
meta/ap/WeekModel.meta.go View File

@ -16,16 +16,16 @@ import (
* @Date : 2021-04-20 10:57:41
*
******************************************************************************/
var WeekModel_PlantNr = grmi.NewField("PlantNr", "AP_WeekMode.PlantNr", "plantnr", grmi.TypeInt)
var WeekModel_WeekModelNr = grmi.NewField("WeekModelNr", "AP_WeekMode.WeekModelNr", "weekmodelnr", grmi.TypeInt)
var WeekModel_Descr = grmi.NewField("Descr", "AP_WeekMode.Descr", "descr", grmi.TypeString)
var WeekModel_Abrev = grmi.NewField("Abrev", "AP_WeekMode.Abrev", "abrev", grmi.TypeString)
var WeekModel_CtrlToggle = grmi.NewField("CtrlToggle", "AP_WeekMode.CtrlToggle", "ctrltoggle", grmi.TypeBool)
var WeekModel_LoopDays = grmi.NewField("LoopDays", "AP_WeekMode.LoopDays", "loopdays", grmi.TypeInt)
var WeekModel_DateFrom = grmi.NewField("DateFrom", "AP_WeekMode.DateFrom", "datefrom", grmi.TypeDate)
var WeekModel_LastModify = grmi.NewField("LastModify", "AP_WeekMode.LastModify", "lastmodify", grmi.TypeDateTime)
var WeekModel_LastUser = grmi.NewField("LastUser", "AP_WeekMode.LastUser", "lastuser", grmi.TypeString)
var WeekModel_CreateTime = grmi.NewField("CreateTime", "AP_WeekMode.CreateTime", "createtime", grmi.TypeDateTime)
var WeekModel_PlantNr = grmi.NewField("PlantNr", "AP_WeekModel.PlantNr", "plantnr", grmi.TypeInt)
var WeekModel_WeekModelNr = grmi.NewField("WeekModelNr", "AP_WeekModel.WeekModelNr", "weekmodelnr", grmi.TypeInt)
var WeekModel_Descr = grmi.NewField("Descr", "AP_WeekModel.Descr", "descr", grmi.TypeString)
var WeekModel_Abrev = grmi.NewField("Abrev", "AP_WeekModel.Abrev", "abrev", grmi.TypeString)
var WeekModel_CtrlToggle = grmi.NewField("CtrlToggle", "AP_WeekModel.CtrlToggle", "ctrltoggle", grmi.TypeBool)
var WeekModel_LoopDays = grmi.NewField("LoopDays", "AP_WeekModel.LoopDays", "loopdays", grmi.TypeInt)
var WeekModel_DateFrom = grmi.NewField("DateFrom", "AP_WeekModel.DateFrom", "datefrom", grmi.TypeDate)
var WeekModel_LastModify = grmi.NewField("LastModify", "AP_WeekModel.LastModify", "lastmodify", grmi.TypeDateTime)
var WeekModel_LastUser = grmi.NewField("LastUser", "AP_WeekModel.LastUser", "lastuser", grmi.TypeString)
var WeekModel_CreateTime = grmi.NewField("CreateTime", "AP_WeekModel.CreateTime", "createtime", grmi.TypeDateTime)
/******************************************************************************
*


+ 9
- 9
web/controllers/base/base.go View File

@ -98,11 +98,11 @@ func RegisterRoutes() {
// Attribute的服务实例
var serviceOfAttribute = svr.NewAttributeService()
// Attribute插入一条
// RegisterInsertOneAttribute(attribute, "/insertone", serviceOfAttribute.InsertOne)
RegisterInsertOneAttribute(attribute, "/insertone", serviceOfAttribute.InsertOne)
// Attribute插入多条
// RegisterInsertAttribute(attribute, "/insert", serviceOfAttribute.Insert)
// Attribute删除一条
// RegisterDeleteOneAttribute(attribute, "/deleteone", serviceOfAttribute.DeleteOne)
RegisterDeleteOneAttribute(attribute, "/deleteone", serviceOfAttribute.DeleteOne)
// Attribute删除多条
// RegisterDeleteAttribute(attribute, "/delete", serviceOfAttribute.Delete)
// Attribute查询多条
@ -112,7 +112,7 @@ func RegisterRoutes() {
// Attribute查询一条
RegisterSelectOneAttribute(attribute, "/selectone", serviceOfAttribute.SelectOne)
// Attribute修改一条
// RegisterUpdateOneAttribute(attribute, "/updateone", serviceOfAttribute.UpdateOne)
RegisterUpdateOneAttribute(attribute, "/updateone", serviceOfAttribute.UpdateOne)
// Attribute修改多条
// RegisterUpdateAttribute(attribute, "/update", serviceOfAttribute.Update)
@ -528,11 +528,11 @@ func RegisterRoutes() {
// StatusColor的服务实例
var serviceOfStatusColor = svr.NewStatusColorService()
// StatusColor插入一条
// RegisterInsertOneStatusColor(statuscolor, "/insertone", serviceOfStatusColor.InsertOne)
RegisterInsertOneStatusColor(statuscolor, "/insertone", serviceOfStatusColor.InsertOne)
// StatusColor插入多条
// RegisterInsertStatusColor(statuscolor, "/insert", serviceOfStatusColor.Insert)
// StatusColor删除一条
// RegisterDeleteOneStatusColor(statuscolor, "/deleteone", serviceOfStatusColor.DeleteOne)
RegisterDeleteOneStatusColor(statuscolor, "/deleteone", serviceOfStatusColor.DeleteOne)
// StatusColor删除多条
// RegisterDeleteStatusColor(statuscolor, "/delete", serviceOfStatusColor.Delete)
// StatusColor查询多条
@ -542,7 +542,7 @@ func RegisterRoutes() {
// StatusColor查询一条
RegisterSelectOneStatusColor(statuscolor, "/selectone", serviceOfStatusColor.SelectOne)
// StatusColor修改一条
// RegisterUpdateOneStatusColor(statuscolor, "/updateone", serviceOfStatusColor.UpdateOne)
RegisterUpdateOneStatusColor(statuscolor, "/updateone", serviceOfStatusColor.UpdateOne)
// StatusColor修改多条
// RegisterUpdateStatusColor(statuscolor, "/update", serviceOfStatusColor.Update)
@ -597,11 +597,11 @@ func RegisterRoutes() {
// Uom的服务实例
var serviceOfUom = svr.NewUomService()
// Uom插入一条
// RegisterInsertOneUom(uom, "/insertone", serviceOfUom.InsertOne)
RegisterInsertOneUom(uom, "/insertone", serviceOfUom.InsertOne)
// Uom插入多条
// RegisterInsertUom(uom, "/insert", serviceOfUom.Insert)
// Uom删除一条
// RegisterDeleteOneUom(uom, "/deleteone", serviceOfUom.DeleteOne)
RegisterDeleteOneUom(uom, "/deleteone", serviceOfUom.DeleteOne)
// Uom删除多条
// RegisterDeleteUom(uom, "/delete", serviceOfUom.Delete)
// Uom查询多条
@ -611,7 +611,7 @@ func RegisterRoutes() {
// Uom查询一条
RegisterSelectOneUom(uom, "/selectone", serviceOfUom.SelectOne)
// Uom修改一条
// RegisterUpdateOneUom(uom, "/updateone", serviceOfUom.UpdateOne)
RegisterUpdateOneUom(uom, "/updateone", serviceOfUom.UpdateOne)
// Uom修改多条
// RegisterUpdateUom(uom, "/update", serviceOfUom.Update)


Loading…
Cancel
Save