From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderDetailServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderDetailServiceImpl.java
index edb8323..f8f3c12 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderDetailServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderDetailServiceImpl.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.DailyMaintenanceOrderDetail;
+import org.jeecg.modules.eam.entity.MaintenanceStandardDetail;
import org.jeecg.modules.eam.mapper.DailyMaintenanceOrderDetailMapper;
import org.jeecg.modules.eam.service.IDailyMaintenanceOrderDetailService;
import org.springframework.stereotype.Service;
@@ -20,9 +22,22 @@
@Service
public class DailyMaintenanceOrderDetailServiceImpl extends ServiceImpl<DailyMaintenanceOrderDetailMapper, DailyMaintenanceOrderDetail> implements IDailyMaintenanceOrderDetailService {
+ /**
+ *浜岀骇淇濆吇宸ュ崟鏄庣粏
+ */
@Override
public IPage<Map<String, Object>> getDailyMaintenanceOrderDetailList(Integer pageNo, Integer pageSize, Map<String, Object> params) {
IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
- return super.getBaseMapper().getDailyMaintenanceOrderDetailList(pageData,params);
+ String sql = QueryGenerator.installAuthJdbc(MaintenanceStandardDetail.class);
+ return super.getBaseMapper().getDailyMaintenanceOrderDetailList(pageData,params,sql);
+ }
+
+ /**
+ *涓夌骇淇濆吇宸ュ崟鏄庣粏
+ */
+ @Override
+ public IPage<Map<String, Object>> get3MaintenanceOrderDetailList(Integer pageNo, Integer pageSize, Map<String, Object> params) {
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ return super.getBaseMapper().get3MaintenanceOrderDetailList(pageData,params);
}
}
--
Gitblit v1.9.3