From 6ba8d21856ee23df8601396a2f23f1b67a3e33a9 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期二, 22 八月 2023 16:08:53 +0800
Subject: [PATCH] 1213
---
server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 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..ea3ae1e 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
@@ -45,13 +45,17 @@
@Autowired
private WorkPlansExtMapper workPlansExtMapper;
@Autowired
+ private CompanyExtService companyExtService;
+ @Autowired
+ private DepartmentExtService departmentExtService;
+ @Autowired
private RouteProcedureExtMapper routeProcedureExtMapper;
@Autowired
private PlansExtMapper plansExtMapper;
@Autowired
- private WorkorderRecordExtMapper workorderRecordExtMapper;
+ private WStockExtMapper stockExtMapper;
@Autowired
- private DepartmentExtService departmentExtService;
+ private WorkorderRecordExtMapper workorderRecordExtMapper;
@Autowired
private DeviceCheckExtService deviceCheckExtService;
@Autowired
@@ -127,9 +131,37 @@
.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<DepartmentExtListVO> getDepartmentList(Integer companyId){
+ CompanyExtListVO companyExtListVO = companyExtService.getModelById(companyId);
+ if(companyExtListVO == null || Constants.equalsInteger(companyExtListVO.getDeleted(), Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝浼佷笟鎴栬�呴儴闂ㄤ俊鎭笉鍚堟硶锛屽鏈夌枒闂紝璇疯仈绯荤郴缁熺鐞嗗憳");
+ }
+ QueryDepartmentExtDTO param = new QueryDepartmentExtDTO();
+ param.setDeleted(Constants.ZERO);
+ param.setCompanyId(companyId);
+ param.setType(Constants.DEPART_TYPE.com);
+ List<DepartmentExtListVO> result = departmentExtService.findList(param);
return result;
}
@Override
@@ -206,8 +238,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