diff --git a/services/base/LabelTemplateHead.service.go b/services/base/LabelTemplateHead.service.go index e2b457d..41ddb18 100644 --- a/services/base/LabelTemplateHead.service.go +++ b/services/base/LabelTemplateHead.service.go @@ -4,6 +4,7 @@ package base import ( "LAPP_ACURA_MOM_BACKEND/global" + "LAPP_ACURA_MOM_BACKEND/grmi" model "LAPP_ACURA_MOM_BACKEND/models/base" "LAPP_ACURA_MOM_BACKEND/services/base/implments" ) @@ -153,7 +154,28 @@ type LabelTemplateHeadService interface { * @Date : 2021-10-25 11:26:18 * ******************************************************************************/ - Select(*global.User, map[string]string) (interface{}, error) + Select(*global.User, map[string]string) ([]model.LabelTemplateHead, error) + /****************************************************************************** + * + * @Function Name : SelectAndPaging + *----------------------------------------------------------------------------- + * + * @Description : 查询LabelTemplateDetail + * + * @Function Parameters : 当前访问人员信息 + * + * @Function Parameters : 查询参数 + * + * @Return Value : 查询结果 + * + * @Return Value : 执行时发生的错误 + * + * @Author : 代码生成器创建 + * + * @Date : 2021-11-25 16:19:35 + * + ******************************************************************************/ + SelectAndPaging(*global.User, map[string]string) (grmi.PagingResult, error) /****************************************************************************** * * @Function Name : Update diff --git a/services/base/implments/LabelTemplateHead.service.impl.go b/services/base/implments/LabelTemplateHead.service.impl.go index f5669dd..982f40b 100644 --- a/services/base/implments/LabelTemplateHead.service.impl.go +++ b/services/base/implments/LabelTemplateHead.service.impl.go @@ -238,7 +238,7 @@ func (impl *LabelTemplateHeadServiceImplement) UpdateOne(user *global.User, enti /**处理数据**/ for k, _ := range entity.LabelTemplateDetail { entity.LabelTemplateDetail[k].LabelTemplateId = entity.LabelTemplateId - entity.LabelTemplateDetail[k].Pos = k+1 + entity.LabelTemplateDetail[k].Pos = k + 1 } lstdao := dal.NewLabelTemplateDetailDAO(session, user.PlantNr, user.UserId) err = lstdao.DeleteWhere([]grmi.Predicate{ @@ -323,7 +323,7 @@ func (impl *LabelTemplateHeadServiceImplement) Delete(user *global.User, entitie * @Reference LAPP_GAAS_GFrame_BACKEND/services/base/LabelTemplateHeadService.Select * ******************************************************************************/ -func (impl *LabelTemplateHeadServiceImplement) Select(user *global.User, urlParameters map[string]string) (interface{}, error) { +func (impl *LabelTemplateHeadServiceImplement) Select(user *global.User, urlParameters map[string]string) ([]model.LabelTemplateHead, error) { grmi.Log(user, "/services/base/implments/LabelTemplateHead.service.impl.go", "SelectLabelTemplateHead", "查询LabelTemplateHead") @@ -336,19 +336,37 @@ func (impl *LabelTemplateHeadServiceImplement) Select(user *global.User, urlPara return nil, err } dao := dal.NewLabelTemplateHeadDAO(session, user.PlantNr, user.UserId) - if condition.Fill(urlParameters) { - result, err := dao.SelectAndPaging(condition.Paging, predicates, condition.OrderByFields) - if err != nil { - return nil, err - } - return result, nil - } else { - result, err := dao.Select(predicates, condition.OrderByFields) - if err != nil { - return nil, err - } - return result, nil + result, err := dao.Select(predicates, condition.OrderByFields) + if err != nil { + return nil, err + } + return result, nil +} + +/****************************************************************************** + * + * @Reference LAPP_ACURA_MOM_BACKEND/services/base/LabelParserHeadService.SelectAndPaging + * + ******************************************************************************/ +func (impl *LabelTemplateHeadServiceImplement) SelectAndPaging(user *global.User, urlParameters map[string]string) (grmi.PagingResult, error) { + + grmi.Log(user, "/services/base/implments/LabelTemplateHead.service.impl.go", "SelectAndPaging", "SelectAndPaging") + + condition := DefaultConditionOfLabelParserHeadAndPaging + engine := db.Eloquent.Master() + session := engine.NewSession() + defer session.Close() + predicates, err := condition.BuildPredicates(urlParameters) + if err != nil { + return grmi.EmptyPagingResult, err + } + dao := dal.NewLabelTemplateHeadDAO(session, user.PlantNr, user.UserId) + condition.Fill(urlParameters) + result, err := dao.SelectAndPaging(condition.Paging, predicates, condition.OrderByFields) + if err != nil { + return grmi.EmptyPagingResult, err } + return result, nil } /****************************************************************************** diff --git a/web/controllers/base/base.go b/web/controllers/base/base.go index fd53625..d7bc4d2 100644 --- a/web/controllers/base/base.go +++ b/web/controllers/base/base.go @@ -1699,11 +1699,11 @@ func RegisterRoutes() { // Printer的服务实例 var serviceOfPrinter = svr.NewPrinterService() // Printer插入一条 - // RegisterInsertOnePrinter(printer, "/insertone", serviceOfPrinter.InsertOne) + RegisterInsertOnePrinter(printer, "/insertone", serviceOfPrinter.InsertOne) // Printer插入多条 // RegisterInsertPrinter(printer, "/insert", serviceOfPrinter.Insert) // Printer删除一条 - // RegisterDeleteOnePrinter(printer, "/deleteone", serviceOfPrinter.DeleteOne) + RegisterDeleteOnePrinter(printer, "/deleteone", serviceOfPrinter.DeleteOne) // Printer删除多条 // RegisterDeletePrinter(printer, "/delete", serviceOfPrinter.Delete) // Printer查询多条 @@ -1713,7 +1713,7 @@ func RegisterRoutes() { // Printer查询一条 RegisterSelectOnePrinter(printer, "/selectone", serviceOfPrinter.SelectOne) // Printer修改一条 - // RegisterUpdateOnePrinter(printer, "/updateone", serviceOfPrinter.UpdateOne) + RegisterUpdateOnePrinter(printer, "/updateone", serviceOfPrinter.UpdateOne) // Printer修改多条 // RegisterUpdatePrinter(printer, "/update", serviceOfPrinter.Update) @@ -1722,21 +1722,21 @@ func RegisterRoutes() { // LabelTemplateHead的服务实例 var serviceOfLabelTemplateHead = svr.NewLabelTemplateHeadService() // LabelTemplateHead插入一条 - // RegisterInsertOneLabelTemplateHead(labeltemplatehead, "/insertone", serviceOfLabelTemplateHead.InsertOne) + RegisterInsertOneLabelTemplateHead(labeltemplatehead, "/insertone", serviceOfLabelTemplateHead.InsertOne) // LabelTemplateHead插入多条 // RegisterInsertLabelTemplateHead(labeltemplatehead, "/insert", serviceOfLabelTemplateHead.Insert) // LabelTemplateHead删除一条 - // RegisterDeleteOneLabelTemplateHead(labeltemplatehead, "/deleteone", serviceOfLabelTemplateHead.DeleteOne) + RegisterDeleteOneLabelTemplateHead(labeltemplatehead, "/deleteone", serviceOfLabelTemplateHead.DeleteOne) // LabelTemplateHead删除多条 // RegisterDeleteLabelTemplateHead(labeltemplatehead, "/delete", serviceOfLabelTemplateHead.Delete) // LabelTemplateHead查询多条 - //RegisterSelectLabelTemplateHead(labeltemplatehead, "/selectlist", serviceOfLabelTemplateHead.Select) + RegisterSelectLabelTemplateHead(labeltemplatehead, "/selectlist", serviceOfLabelTemplateHead.Select) // LabelTemplateHead查询多条并分页 - //RegisterQueryLabelTemplateHead(labeltemplatehead, "/query", serviceOfLabelTemplateHead.SelectAndPaging) + RegisterQueryLabelTemplateHead(labeltemplatehead, "/query", serviceOfLabelTemplateHead.SelectAndPaging) // LabelTemplateHead查询一条 RegisterSelectOneLabelTemplateHead(labeltemplatehead, "/selectone", serviceOfLabelTemplateHead.SelectOne) // LabelTemplateHead修改一条 - // RegisterUpdateOneLabelTemplateHead(labeltemplatehead, "/updateone", serviceOfLabelTemplateHead.UpdateOne) + RegisterUpdateOneLabelTemplateHead(labeltemplatehead, "/updateone", serviceOfLabelTemplateHead.UpdateOne) // LabelTemplateHead修改多条 // RegisterUpdateLabelTemplateHead(labeltemplatehead, "/update", serviceOfLabelTemplateHead.Update) @@ -1745,11 +1745,11 @@ func RegisterRoutes() { // LabelTemplateDetail的服务实例 var serviceOfLabelTemplateDetail = svr.NewLabelTemplateDetailService() // LabelTemplateDetail插入一条 - // RegisterInsertOneLabelTemplateDetail(labeltemplatedetail, "/insertone", serviceOfLabelTemplateDetail.InsertOne) + RegisterInsertOneLabelTemplateDetail(labeltemplatedetail, "/insertone", serviceOfLabelTemplateDetail.InsertOne) // LabelTemplateDetail插入多条 // RegisterInsertLabelTemplateDetail(labeltemplatedetail, "/insert", serviceOfLabelTemplateDetail.Insert) // LabelTemplateDetail删除一条 - // RegisterDeleteOneLabelTemplateDetail(labeltemplatedetail, "/deleteone", serviceOfLabelTemplateDetail.DeleteOne) + RegisterDeleteOneLabelTemplateDetail(labeltemplatedetail, "/deleteone", serviceOfLabelTemplateDetail.DeleteOne) // LabelTemplateDetail删除多条 // RegisterDeleteLabelTemplateDetail(labeltemplatedetail, "/delete", serviceOfLabelTemplateDetail.Delete) // LabelTemplateDetail查询多条 @@ -1759,7 +1759,7 @@ func RegisterRoutes() { // LabelTemplateDetail查询一条 RegisterSelectOneLabelTemplateDetail(labeltemplatedetail, "/selectone", serviceOfLabelTemplateDetail.SelectOne) // LabelTemplateDetail修改一条 - // RegisterUpdateOneLabelTemplateDetail(labeltemplatedetail, "/updateone", serviceOfLabelTemplateDetail.UpdateOne) + RegisterUpdateOneLabelTemplateDetail(labeltemplatedetail, "/updateone", serviceOfLabelTemplateDetail.UpdateOne) // LabelTemplateDetail修改多条 // RegisterUpdateLabelTemplateDetail(labeltemplatedetail, "/update", serviceOfLabelTemplateDetail.Update) @@ -1768,11 +1768,11 @@ func RegisterRoutes() { // LabelHead的服务实例 var serviceOfLabelHead = svr.NewLabelHeadService() // LabelHead插入一条 - // RegisterInsertOneLabelHead(labelhead, "/insertone", serviceOfLabelHead.InsertOne) + RegisterInsertOneLabelHead(labelhead, "/insertone", serviceOfLabelHead.InsertOne) // LabelHead插入多条 // RegisterInsertLabelHead(labelhead, "/insert", serviceOfLabelHead.Insert) // LabelHead删除一条 - // RegisterDeleteOneLabelHead(labelhead, "/deleteone", serviceOfLabelHead.DeleteOne) + RegisterDeleteOneLabelHead(labelhead, "/deleteone", serviceOfLabelHead.DeleteOne) // LabelHead删除多条 // RegisterDeleteLabelHead(labelhead, "/delete", serviceOfLabelHead.Delete) // LabelHead查询多条 @@ -1782,7 +1782,7 @@ func RegisterRoutes() { // LabelHead查询一条 RegisterSelectOneLabelHead(labelhead, "/selectone", serviceOfLabelHead.SelectOne) // LabelHead修改一条 - // RegisterUpdateOneLabelHead(labelhead, "/updateone", serviceOfLabelHead.UpdateOne) + RegisterUpdateOneLabelHead(labelhead, "/updateone", serviceOfLabelHead.UpdateOne) // LabelHead修改多条 // RegisterUpdateLabelHead(labelhead, "/update", serviceOfLabelHead.Update)