From 0417d31de9980cbc1735daffffb308d050ce35b4 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期六, 18 九月 2021 16:47:52 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
service-community/src/main/java/com/java110/community/smo/impl/RepairInnerServiceSMOImpl.java | 18 ------------------
1 files changed, 0 insertions(+), 18 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/smo/impl/RepairInnerServiceSMOImpl.java b/service-community/src/main/java/com/java110/community/smo/impl/RepairInnerServiceSMOImpl.java
index 672405d..730650c 100755
--- a/service-community/src/main/java/com/java110/community/smo/impl/RepairInnerServiceSMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/smo/impl/RepairInnerServiceSMOImpl.java
@@ -1,6 +1,5 @@
package com.java110.community.smo.impl;
-
import com.java110.community.dao.IRepairServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
@@ -34,21 +33,14 @@
@Override
public List<RepairDto> queryRepairs(@RequestBody RepairDto repairDto) {
-
//鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
-
int page = repairDto.getPage();
-
if (page != PageDto.DEFAULT_PAGE) {
repairDto.setPage((page - 1) * repairDto.getRow());
}
-
List<RepairDto> repairs = BeanConvertUtil.covertBeanList(repairServiceDaoImpl.getRepairInfo(BeanConvertUtil.beanCovertMap(repairDto)), RepairDto.class);
-
-
return repairs;
}
-
@Override
public int queryRepairsCount(@RequestBody RepairDto repairDto) {
@@ -58,16 +50,11 @@
@Override
public List<RepairDto> queryStaffRepairs(@RequestBody RepairDto repairDto) {
//鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
-
int page = repairDto.getPage();
-
if (page != PageDto.DEFAULT_PAGE) {
repairDto.setPage((page - 1) * repairDto.getRow());
}
-
List<RepairDto> repairs = BeanConvertUtil.covertBeanList(repairServiceDaoImpl.getStaffRepairInfo(BeanConvertUtil.beanCovertMap(repairDto)), RepairDto.class);
-
-
return repairs;
}
@@ -78,16 +65,11 @@
@Override
public List<RepairDto> queryStaffFinishRepairs(@RequestBody RepairDto repairDto) {
-
int page = repairDto.getPage();
-
if (page != PageDto.DEFAULT_PAGE) {
repairDto.setPage((page - 1) * repairDto.getRow());
}
-
List<RepairDto> repairs = BeanConvertUtil.covertBeanList(repairServiceDaoImpl.getStaffFinishRepairInfo(BeanConvertUtil.beanCovertMap(repairDto)), RepairDto.class);
-
-
return repairs;
}
--
Gitblit v1.8.0