From 974c9ded44fcee4638122570c6904d4e5e6c217b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 17 四月 2025 18:23:08 +0800
Subject: [PATCH] 代码初始化
---
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
index 0f84282..627ae9f 100644
--- a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
@@ -1219,10 +1219,18 @@
workOrderDataVO.setGcsTotal(Constants.ZERO);
workOrderDataVO.setWtsTotal(Constants.ZERO);
workOrderDataVO.setSheTotal(Constants.ZERO);
+ workOrderDataVO.setDcaNoTotal(Constants.ZERO);
+ workOrderDataVO.setDcaYesTotal(Constants.ZERO);
workOrderDataVO.setUnCloseTotal(Constants.ZERO);
workOrderDataVO.setTotal(Constants.ZERO);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(dataList)){
workOrderDataVO.setTotal(dataList.size());
+ for(Workorder e :dataList){
+ if(Constants.equalsInteger(e.getType(),Constants.ONE)){
+ workOrderDataVO.setDcaYesTotal(workOrderDataVO.getDcaYesTotal()+Constants.formatIntegerNum(e.getDcaYesNum()));//DCA绗﹀悎椤�
+ workOrderDataVO.setDcaNoTotal(workOrderDataVO.getDcaNoTotal()+Constants.formatIntegerNum(e.getDcaNoNum()));//DCA涓嶇鍚堥」
+ }
+ }
workOrderDataVO.setGcsTotal(dataList.stream().filter(j->Constants.equalsInteger(j.getStatus(),Constants.WorkOrderStatus.close.getKey())).collect(Collectors.toList()).size());
workOrderDataVO.setSheTotal(dataList.stream().filter(j->Constants.equalsInteger(j.getStatus(),Constants.WorkOrderStatus.sheClose.getKey())).collect(Collectors.toList()).size());
workOrderDataVO.setWtsTotal(dataList.stream().filter(j->Constants.equalsInteger(j.getStatus(),Constants.WorkOrderStatus.wtsClose.getKey())).collect(Collectors.toList()).size());
@@ -1254,7 +1262,16 @@
workOrderDataVO.setSheTotal(Constants.ZERO);
workOrderDataVO.setUnCloseTotal(Constants.ZERO);
workOrderDataVO.setTotal(Constants.ZERO);
+ workOrderDataVO.setDcaNoTotal(Constants.ZERO);
+ workOrderDataVO.setDcaYesTotal(Constants.ZERO);
+
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(dataList)){
+ for(Workorder e :dataList){
+ if(Constants.equalsInteger(e.getType(),Constants.ONE)){
+ workOrderDataVO.setDcaYesTotal(workOrderDataVO.getDcaYesTotal()+Constants.formatIntegerNum(e.getDcaYesNum()));//DCA绗﹀悎椤�
+ workOrderDataVO.setDcaNoTotal(workOrderDataVO.getDcaNoTotal()+Constants.formatIntegerNum(e.getDcaNoNum()));//DCA涓嶇鍚堥」
+ }
+ }
workOrderDataVO.setTotal(dataList.size());
workOrderDataVO.setGcsTotal(dataList.stream().filter(j->Constants.equalsInteger(j.getStatus(),Constants.WorkOrderStatus.close.getKey())).collect(Collectors.toList()).size());
workOrderDataVO.setSheTotal(dataList.stream().filter(j->Constants.equalsInteger(j.getStatus(),Constants.WorkOrderStatus.sheClose.getKey())).collect(Collectors.toList()).size());
@@ -1319,6 +1336,35 @@
}
}
}
+
+ List<Workorder> yeslist = workorderMapper.selectJoinList(Workorder.class,new MPJLambdaWrapper<Workorder>()
+ .select("type,count(id) as num")
+ .eq(Workorder::getIsdeleted,Constants.ZERO)
+ .in(Workorder::getStatus,Constants.THREE,Constants.FOUR,Constants.FIVE)
+ .in(Workorder::getType,Constants.THREE,Constants.TWO)
+ .groupBy(Workorder::getType ));
+ if(yeslist !=null){
+ for(Workorder w : yeslist){
+ if(Constants.equalsInteger(w.getType(),Constants.TWO)){
+ //DCA瀛愬伐鍗曞凡瑙ｅ喅鍜屾湭瑙ｅ喅
+ model.setDcaChildYesNum(Constants.formatLongNum(w.getNum()));
+ model.setDcaChildNoNum(Constants.formatLongNum(model.getDcaChildNum()) -model.getDcaChildYesNum());
+ }else if(Constants.equalsInteger(w.getType(),Constants.THREE)){
+ //璺岀粖婊戝凡瑙ｅ喅鍜屾湭瑙ｅ喅
+ model.setDbhYesNum(Constants.formatLongNum(w.getNum()));
+ model.setDbhNoNum(Constants.formatLongNum(model.getDbhNum()) -model.getDbhYesNum());
+ }
+ }
+ }
+ Workorder dcaList = workorderMapper.selectJoinOne(Workorder.class,new MPJLambdaWrapper<Workorder>()
+ .select("sum(dca_yes_num) as dcaYesNum,sum(dca_no_num) as dcaNoNum")
+ .eq(Workorder::getIsdeleted,Constants.ZERO)
+ .eq(Workorder::getType,Constants.ONE) );
+ if(dcaList !=null){
+ //DCA绗﹀悎椤瑰拰涓嶇鍚堥」缁熻
+ model.setDcaYesNum((long)Constants.formatIntegerNum(dcaList.getDcaYesNum()));
+ model.setDcaNoNum((long)Constants.formatIntegerNum(dcaList.getDcaNoNum()));
+ }
return model;
}
--
Gitblit v1.9.3