bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
mashuai 2025-08-24 15:50:42 +08:00
parent 3b587c8ed3
commit e3e152b852
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
View File

@ -334,8 +334,8 @@ public class BackReceiveController extends BaseController {
public AjaxResult backReceiveRecordWeb(@RequestBody BackApplyInfo record) {
try {
List<BackApplyInfo> list = backReceiveService.backReceiveRecordWeb(record);
Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
Integer pageIndex = Convert.toInt(record.getPageNum(), 1);
Integer pageSize = Convert.toInt(record.getPageSize(), 10);
return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
} catch (Exception e) {
throw new RuntimeException(e);
@ -347,8 +347,8 @@ public class BackReceiveController extends BaseController {
public AjaxResult backReceiveRecordWebPt(@RequestBody BackApplyInfo record) {
try {
List<BackApplyInfo> list = backReceiveService.backReceiveRecordWebPt(record);
Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
Integer pageIndex = Convert.toInt(record.getPageNum(), 1);
Integer pageSize = Convert.toInt(record.getPageSize(), 10);
return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
} catch (Exception e) {
throw new RuntimeException(e);

3
sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseOutDetailsMapper.xml
View File

@ -462,7 +462,8 @@
su.nick_name leasePerson,
su2.nick_name outPerson,
mm.ma_code,
lod.car_code
lod.car_code,
mt.unit_name as unitName
FROM
lease_out_details lod
LEFT JOIN lease_apply_details lad ON lod.parent_id = lad.parennt_id

8
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java
View File

@ -196,8 +196,8 @@ public class ScrapApplyDetailsController extends BaseController {
public AjaxResult scrapReceiveRecordWeb(@RequestBody BackApplyInfo record) {
try {
List<BackApplyInfo> list = scrapApplyDetailsService.scrapReceiveRecordWeb(record);
Integer pageIndex = com.bonus.sgzb.common.core.text.Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = com.bonus.sgzb.common.core.text.Convert.toInt(ServletUtils.getParameter(TableSupport.PAGE_SIZE), 10);
Integer pageIndex = Convert.toInt(record.getPageNum(), 1);
Integer pageSize = Convert.toInt(record.getPageSize(), 10);
return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
} catch (Exception e) {
throw new RuntimeException(e);
@ -209,8 +209,8 @@ public class ScrapApplyDetailsController extends BaseController {
public AjaxResult scrapReceiveRecordWebPt(@RequestBody BackApplyInfo record) {
try {
List<BackApplyInfo> list = scrapApplyDetailsService.backReceiveRecordWebPt(record);
Integer pageIndex = com.bonus.sgzb.common.core.text.Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = com.bonus.sgzb.common.core.text.Convert.toInt(ServletUtils.getParameter(TableSupport.PAGE_SIZE), 10);
Integer pageIndex = Convert.toInt(record.getPageNum(), 1);
Integer pageSize = Convert.toInt(record.getPageSize(), 10);
return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
} catch (Exception e) {
throw new RuntimeException(e);

8
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java
View File

@ -290,4 +290,12 @@ public class BackApplyInfo extends BaseEntity {
/** 预报废单号*/
private String forecastWasteCode;
/**页数 */
private Integer pageNum;
/** 条数 *、
*
*/
private Integer pageSize;
}