From b82b1679623b1868fe9fd76e1ff817928d02c32f Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 22 八月 2023 18:03:46 +0800
Subject: [PATCH] 大屏
---
server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 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 d43172b..126abd9 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java
@@ -45,6 +45,10 @@
@Autowired
private WorkPlansExtMapper workPlansExtMapper;
@Autowired
+ private CompanyExtService companyExtService;
+ @Autowired
+ private DepartmentExtService departmentExtService;
+ @Autowired
private RouteProcedureExtMapper routeProcedureExtMapper;
@Autowired
private PlansExtMapper plansExtMapper;
@@ -52,8 +56,6 @@
private WStockExtMapper stockExtMapper;
@Autowired
private WorkorderRecordExtMapper workorderRecordExtMapper;
- @Autowired
- private DepartmentExtService departmentExtService;
@Autowired
private DeviceCheckExtService deviceCheckExtService;
@Autowired
@@ -147,6 +149,19 @@
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
@@ -285,6 +300,8 @@
//瀹屾垚鐜�
tt.setRate(Constants.formatBigdecimal(t.getDoneNum()).divide(t.getPlanNum(),4).subtract(new BigDecimal(100)));
}
+ tt.setPlanNum(Constants.formatBigdecimal(t.getPlanNum()));
+ tt.setDoneNum(Constants.formatBigdecimal(t.getDoneNum()));
rList.add(tt);
//鏈�鍚庝竴鍒楃殑鑹搧鏁�/瀹屽伐鏁帮細涓哄綋鍓嶄骇鍝佹渶鍚庝竴閬撳伐搴忕殑鑹搧鏁�/瀹屽伐鏁�
model.setNum(t.getPlanNum());
--
Gitblit v1.9.3