From 9b00b80c926b3d1b38b7ef9b682ee097345dde3f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 17 四月 2025 11:09:31 +0800
Subject: [PATCH] 代码初始化
---
admin/src/views/index.vue | 48 +++++++++++++----------
server/src/main/java/com/doumee/core/constants/Constants.java | 1
server/src/main/java/com/doumee/dao/business/vo/WorkorderIndexNumVO.java | 12 ++++++
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 37 ++++++++++++++++++
server/src/main/java/com/doumee/dao/web/vo/WorkOrderDataVO.java | 4 ++
5 files changed, 81 insertions(+), 21 deletions(-)
diff --git a/admin/src/views/index.vue b/admin/src/views/index.vue
index 35b1186..4bd8f0e 100644
--- a/admin/src/views/index.vue
+++ b/admin/src/views/index.vue
@@ -15,11 +15,11 @@
<div class="fs15">SHE浠婃棩鎻愭姤鏁伴噺</div>
<div class="num">{{ headerData.todaySheNum ||0 }}</div>
</div>
- <img src="@/assets/icons/home_icon1.png" alt="" />
+<!-- <img src="@/assets/icons/home_icon1.png" alt="" />-->
</div>
<div class="content">
- <div>鏈В鍐筹細{{ headerData.sheNum || 0}}</div>
- <div>宸茶В鍐筹細{{ headerData.sheNum || 0}}</div>
+<!-- <div>鏈В鍐筹細{{ headerData.sheNum || 0}}</div>-->
+<!-- <div>宸茶В鍐筹細{{ headerData.sheNum || 0}}</div>-->
<div>鎬诲伐鍗曢噺锛歿{ headerData.sheNum || 0}}</div>
</div>
</div>
@@ -29,11 +29,13 @@
<div class="fs15">璺岀粖婊戜粖鏃ュ伐鍗曟暟閲�</div>
<div class="num">{{ headerData.todayDbhNum ||0 }}</div>
</div>
+<!--
<img src="@/assets/icons/home_icon2.png" alt="" />
+-->
</div>
<div class="content">
- <div>鏈В鍐筹細{{ headerData.dbhNum || 0}}</div>
- <div>宸茶В鍐筹細{{ headerData.dbhNum || 0}}</div>
+ <div>鏈В鍐筹細{{ headerData.dbhYesNum || 0}}</div>
+ <div>宸茶В鍐筹細{{ headerData.dbhNoNum || 0}}</div>
<div>鎬诲伐鍗曢噺锛歿{ headerData.dbhNum || 0}}</div>
</div>
</div>
@@ -43,9 +45,11 @@
<div class="fs15">DCA浠婃棩鎻愪氦鏁伴噺</div>
<div class="num">{{ headerData.todayDcaNum ||0 }}</div>
</div>
- <img src="@/assets/icons/home_icon3.png" alt="" />
+<!-- <img src="@/assets/icons/home_icon3.png" alt="" />-->
</div>
<div class="content">
+ <div>绗﹀悎椤癸細{{ headerData.dcaYesNum || 0}}</div>
+ <div>涓嶇鍚堥」锛歿{ headerData.dcaNoNum || 0}}</div>
<div>鎬绘彁浜ら噺锛歿{ headerData.dcaNum || 0}}</div>
</div>
</div>
@@ -55,11 +59,11 @@
<div class="fs15">DCA浠婃棩宸ュ崟鏁伴噺</div>
<div class="num">{{ headerData.todayDcaChildNum ||0 }}</div>
</div>
- <img src="@/assets/icons/home_icon3.png" alt="" />
+<!-- <img src="@/assets/icons/home_icon3.png" alt="" />-->
</div>
<div class="content">
- <div>鏈В鍐筹細{{ headerData.dcaChildNum || 0}}</div>
- <div>宸茶В鍐筹細{{ headerData.dcaChildNum || 0}}</div>
+ <div>鏈В鍐筹細{{ headerData.dcaChildYesNum || 0}}</div>
+ <div>宸茶В鍐筹細{{ headerData.dcaChildNoNum || 0}}</div>
<div>鎬诲伐鍗曢噺锛歿{ headerData.dcaChildNum || 0}}</div>
</div>
</div>
@@ -207,36 +211,36 @@
this.nowWeek = weeks[new Date().getDay()]
},
initEchart0 () {
- this.initEchartDataDo('echart0', this.staticData0.map(i => i.dateStr), this.staticData0.map(i => i.total),'鍗�')
+ this.initEchartDataDo('echart0', this.staticData0.map(i => i.dateStr), this.staticData0.map(i => i.total),'鍗�','bar')
},
initEchart01 () {
- this.initEchartDataDo('echart01', this.staticData01.map(i => i.dateStr), this.staticData01.map(i => i.total),'鍗�')
+ this.initEchartDataDo('echart01', this.staticData01.map(i => i.dateStr), this.staticData01.map(i => i.total),'鍗�','line')
},
initEchart1 () {
- this.initEchartDataDo('echart1', this.staticData1.map(i => i.dateStr), this.staticData1.map(i => i.total),'娆�')
+ this.initEchartDataDo('echart1', this.staticData1.map(i => i.dateStr), this.staticData1.map(i => i.total),'娆�','bar')
},
initEchart11 () {
- this.initEchartDataDo('echart11', this.staticData11.map(i => i.dateStr), this.staticData11.map(i => i.total),'娆�')
+ this.initEchartDataDo('echart11', this.staticData11.map(i => i.dateStr), this.staticData11.map(i => i.total),'娆�','line')
},
initEchart2 () {
- this.initEchartDataDo('echart2', this.staticData2.map(i => i.dateStr), this.staticData2.map(i => i.total),'鍗�')
+ this.initEchartDataDo('echart2', this.staticData2.map(i => i.dateStr), this.staticData2.map(i => i.total),'鍗�','bar')
},
initEchart21 () {
- this.initEchartDataDo('echart21', this.staticData21.map(i => i.dateStr), this.staticData21.map(i => i.total),'鍗�')
+ this.initEchartDataDo('echart21', this.staticData21.map(i => i.dateStr), this.staticData21.map(i => i.total),'鍗�','line')
},
initEchart3 () {
- this.initEchartDataDo('echart3', this.staticData3.map(i => i.dateStr), this.staticData3.map(i => i.total),'鍗�')
+ this.initEchartDataDo('echart3', this.staticData3.map(i => i.dateStr), this.staticData3.map(i => i.total),'鍗�','bar')
},
initEchart31 () {
- this.initEchartDataDo('echart31',this.staticData31.map(i => i.dateStr), this.staticData31.map(i => i.total),'鍗�')
+ this.initEchartDataDo('echart31',this.staticData31.map(i => i.dateStr), this.staticData31.map(i => i.total),'鍗�','line')
},
- initEchartDataDo (id, xdata,ydata,unit) {
+ initEchartDataDo (id, xdata,ydata,unit,type) {
const myChart = echarts.init(document.getElementById(id))
myChart.setOption({
tooltip: {
trigger: 'axis',
axisPointer: {
- type: 'line'
+ type: type || 'line'
},
formatter: function (params) {
return `
@@ -280,7 +284,7 @@
series: [
{
data: ydata,
- type: 'line',
+ type: type || 'line',
areaStyle: {
normal: {
color: {
@@ -377,7 +381,9 @@
&:nth-of-type(4) {
margin-right: 0;
- background: linear-gradient(270deg, #30d3de 0%, #04b7cd 100%);
+ background: linear-gradient(270deg, #c430dee3 0%, #cd04b9cf 100%);
+ //linear-gradient(270deg, #de3049b8 0%, #cd0421d4 100%);
+ //background: linear-gradient(270deg, #30d3de 0%, #04b7cd 100%);
}
.header {
diff --git a/server/src/main/java/com/doumee/core/constants/Constants.java b/server/src/main/java/com/doumee/core/constants/Constants.java
index f8f1ea0..338742a 100644
--- a/server/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/src/main/java/com/doumee/core/constants/Constants.java
@@ -33,6 +33,7 @@
public static final Integer THREE = 3;
public static final Integer FOUR = 4;
public static final Integer SIX = 6;
+ public static final Integer FIVE = 5;
public static boolean WORKORDER_SHE_EMAIL_SENDING = false;
public static boolean DEALING_COMPANY_SYNC = false ;
public static boolean DEALING_MEMBER_SYNC = false ;
diff --git a/server/src/main/java/com/doumee/dao/business/vo/WorkorderIndexNumVO.java b/server/src/main/java/com/doumee/dao/business/vo/WorkorderIndexNumVO.java
index 1d3282d..1fd41a0 100644
--- a/server/src/main/java/com/doumee/dao/business/vo/WorkorderIndexNumVO.java
+++ b/server/src/main/java/com/doumee/dao/business/vo/WorkorderIndexNumVO.java
@@ -21,13 +21,25 @@
private Long todayDcaNum;
@ApiModelProperty(value = "DCA鎬绘彁鎶ラ噺")
private Long dcaNum;
+ @ApiModelProperty(value = "DCA绗﹀悎椤归噺")
+ private Long dcaYesNum;
+ @ApiModelProperty(value = "DCA涓嶇鍚堥」")
+ private Long dcaNoNum;
@ApiModelProperty(value = "DCA浠婃棩宸ュ崟鏁伴噺")
private Long todayDcaChildNum;
@ApiModelProperty(value = "DCA鎬诲伐鍗曢噺")
private Long dcaChildNum;
+ @ApiModelProperty(value = "DCA宸茶В鍐冲伐鍗曢噺")
+ private Long dcaChildYesNum;
+ @ApiModelProperty(value = "DCA鏈В鍐冲伐鍗�")
+ private Long dcaChildNoNum;
@ApiModelProperty(value = "璺岀粖婊戜粖鏃ユ彁鎶ユ暟閲�")
private Long todayDbhNum;
@ApiModelProperty(value = "璺岀粖婊戞�诲伐鍗曢噺")
private Long dbhNum;
+ @ApiModelProperty(value = "璺岀粖婊戝凡瑙ｅ喅宸ュ崟閲�")
+ private Long dbhYesNum;
+ @ApiModelProperty(value = "璺岀粖婊戞湭瑙ｅ喅宸ュ崟閲�")
+ private Long dbhNoNum;
}
diff --git a/server/src/main/java/com/doumee/dao/web/vo/WorkOrderDataVO.java b/server/src/main/java/com/doumee/dao/web/vo/WorkOrderDataVO.java
index c8738af..aa63d8e 100644
--- a/server/src/main/java/com/doumee/dao/web/vo/WorkOrderDataVO.java
+++ b/server/src/main/java/com/doumee/dao/web/vo/WorkOrderDataVO.java
@@ -22,6 +22,10 @@
@ApiModelProperty(value = "SHE鎬绘暟")
private Integer sheTotal;
+ @ApiModelProperty(value = "DCA绗﹀悎鎬绘暟")
+ private Integer dcaYesTotal;
+ @ApiModelProperty(value = "DCA涓嶇鍚堟�绘暟")
+ private Integer dcaNoTotal;
@ApiModelProperty(value = "WTS鎬绘暟")
private Integer wtsTotal;
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..c77c10c 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());
@@ -1319,6 +1327,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