From 0c4507ad5ebdbf8ac1c2bbcdcf38203908e61378 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 21 八月 2023 16:04:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
index 451eac9..d43172b 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
@@ -49,6 +49,8 @@
@Autowired
private PlansExtMapper plansExtMapper;
@Autowired
+ private WStockExtMapper stockExtMapper;
+ @Autowired
private WorkorderRecordExtMapper workorderRecordExtMapper;
@Autowired
private DepartmentExtService departmentExtService;
@@ -135,6 +137,19 @@
return result;
}
@Override
+ public List<StockDataModel> getStockList(Integer companyId, Integer departId){
+ DepartmentExtListVO department = departmentExtService.getModelById(companyId,departId);
+ if(department == null || Constants.equalsInteger(department.getDeleted(), Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浼佷笟鎴栬�呴儴闂ㄤ俊鎭笉鍚堟硶锛屽鏈夌枒闂紝璇疯仈绯荤郴缁熺鐞嗗憳");
+ }
+ QueryWStockExtDTO param = new QueryWStockExtDTO();
+ param.setRootDepartId(department.getRootId());
+ param.setWmodelDepartId(departId);
+ //鏌ヨ缁熻缁撴灉
+ List<StockDataModel> result = stockExtMapper.getStatisticsStockList(param);
+ return result;
+ }
+ @Override
public List<Unqualified7DayModel> getUnqualified7DayData(Integer companyId, Integer departId, Integer procedureId) {
DepartmentExtListVO department = departmentExtService.getModelById(companyId,departId);
if(department == null || Constants.equalsInteger(department.getDeleted(), Constants.ONE)){
@@ -208,8 +223,7 @@
//鍙兘鏌ョ湅褰撳墠鏍圭粍缁囩殑鏁版嵁
pageWrap.getModel().setRootDepartId(department.getRootId());
pageWrap.getModel().setComDepartId(departId);
- PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
- return deviceCheckExtService.findPage(pageWrap);
+ return deviceCheckExtService.getDeviceCheckPage(pageWrap);
}
@Override
public List<ProcedurePlansPageModel> getProcedurePlansPage(Integer companyId, Integer departId,Integer procedureId){
--
Gitblit v1.9.3