| admin/src/views/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| server/src/main/java/com/doumee/core/constants/Constants.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| server/src/main/java/com/doumee/dao/business/vo/WorkorderIndexNumVO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| server/src/main/java/com/doumee/dao/web/vo/WorkOrderDataVO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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 { 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 ; 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; } 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; 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; }
