From 56fda1bdd8be6a22bc60753e406b645f1f5deb61 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 21 八月 2023 16:03:51 +0800
Subject: [PATCH] # 修改配置角色 报角色编码存在
---
server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 0ae9a27..c67ff46 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;
@@ -127,12 +129,27 @@
.add(Constants.formatBigdecimal(model.getQualifiedNum()));
model.setUndoneNum(Constants.formatBigdecimal(model.getNum()).subtract(doneNum));
//涓嶈壇鍝佺巼
-// model.set
+ if(doneNum.compareTo(new BigDecimal(0) )>0){
+ model.setUnqualifiedRate(model.getUnqualifiedNum().divide(doneNum,4).multiply(new BigDecimal(100)));
+ }
}
}
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)){
--
Gitblit v1.9.3