From 074f334d060ec7d33d39cdeaae5ed84a2a2dd3a3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 八月 2023 18:20:59 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 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 c67ff46..9826144 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
@@ -150,6 +152,19 @@
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
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)){
@@ -164,7 +179,7 @@
List<Unqualified7DayModel> result = new ArrayList<>();
Date date = DateUtil.getCurrentDate();
for (int i = 0; i < 7; i++) {
- Date td = DateUtil.addDaysToDate(date, 7-i);
+ Date td = DateUtil.addDaysToDate(date, i-6);
Unqualified7DayModel m = getReusltModelByDate(td,model);
if(m == null){
m = new Unqualified7DayModel();
@@ -223,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){
@@ -274,6 +288,7 @@
QueryRouteProcedureExtDTO r = new QueryRouteProcedureExtDTO();
r.setRouteId(model.getRouteId());
r.setDeleted(Constants.ZERO);
+ r.setWorkPlanId(model.getId());
List<RouteProcedureExtListVO> list = routeProcedureExtMapper.selectStatisticsList(r);
List<WorkPlansProcedureModel> rList = new ArrayList<>();
if(list != null){
@@ -284,8 +299,10 @@
tt.setRate(new BigDecimal(0));
if( Constants.formatBigdecimal(t.getPlanNum()).compareTo(new BigDecimal(0)) >0){
//瀹屾垚鐜�
- tt.setRate(Constants.formatBigdecimal(t.getDoneNum()).divide(t.getPlanNum(),4).subtract(new BigDecimal(100)));
+ tt.setRate(Constants.formatBigdecimal(t.getDoneNum()).divide(t.getPlanNum(),4).multiply(new BigDecimal(100)));
}
+ tt.setPlanNum(Constants.formatBigdecimal(t.getPlanNum()));
+ tt.setDoneNum(Constants.formatBigdecimal(t.getDoneNum()));
rList.add(tt);
//鏈�鍚庝竴鍒楃殑鑹搧鏁�/瀹屽伐鏁帮細涓哄綋鍓嶄骇鍝佹渶鍚庝竴閬撳伐搴忕殑鑹搧鏁�/瀹屽伐鏁�
model.setNum(t.getPlanNum());
@@ -301,7 +318,9 @@
private Unqualified7DayModel getReusltModelByDate(Date td, List<Unqualified7DayModel> model ) {
if(model !=null){
for(Unqualified7DayModel m : model){
- if(StringUtils.equals(DateUtil.getShortTime(td),DateUtil.getShortTime(m.getCreateTime()))){
+ String d1 = DateUtil.getShortTime(td);
+ String d2 = DateUtil.getShortTime(m.getCreateTime());
+ if(StringUtils.equals(d1,d2)){
return m;
}
}
--
Gitblit v1.9.3