From ae33e68baf21878ce145d75ac377d14c1e2b2a82 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 十二月 2023 14:59:26 +0800
Subject: [PATCH] 设备台账
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateDetailController.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateDetailController.java
index 3b49141..5a09d36 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateDetailController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateDetailController.java
@@ -1,7 +1,7 @@
package org.jeecg.modules.eam.controller;
-
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -23,6 +23,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -64,16 +65,18 @@
public Result<IPage<PrecisionParametersTemplateDetail>> listByPrecisionParametersTemplateId(PrecisionParametersTemplateDetail precisionParametersTemplateDetail, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
QueryWrapper<PrecisionParametersTemplateDetail> queryWrapper = QueryGenerator.initQueryWrapper(precisionParametersTemplateDetail, req.getParameterMap());
Page<PrecisionParametersTemplateDetail> page = new Page<PrecisionParametersTemplateDetail>(pageNo, pageSize);
+ OrderItem orderItem = new OrderItem();
+ orderItem.setColumn("sort");
+ orderItem.setAsc(true);
+ List<OrderItem> orderItems = new ArrayList<>();
+ orderItems.add(orderItem);
+ page.setOrders(orderItems);
IPage<PrecisionParametersTemplateDetail> pageList = precisionParametersTemplateDetailService.page(page, queryWrapper);
List<PrecisionParametersTemplateDetail> records = pageList.getRecords();
for (PrecisionParametersTemplateDetail record : records) {
PrecisionParameters precisionParameters = precisionParametersService.getById(record.getPrecisionParametersId());
- record.setPrecisionParametersNum(precisionParameters.getNum());
record.setPrecisionParametersName(precisionParameters.getName());
- record.setPrecisionParametersCategory(precisionParametersCategoryService.getById(precisionParameters.getPrecisionParametersCategoryId()).getName());
-// record.setUnit(unitService.getById(precisionParameters.getUnitId()).getName());
- String unitName = sysBaseApi.getUnitNameById(precisionParameters.getUnitId());
- record.setUnit(unitName);
+ record.setPrecisionParametersUda1(precisionParameters.getPrecisionParametersUda1());
}
return Result.OK(pageList);
}
--
Gitblit v1.9.3