diff --git a/fuintAdmin/src/views/power/page/record.vue b/fuintAdmin/src/views/power/page/record.vue index 6a57a3dcb..9c88e71e3 100644 --- a/fuintAdmin/src/views/power/page/record.vue +++ b/fuintAdmin/src/views/power/page/record.vue @@ -150,21 +150,26 @@ -
-
-
- -
-
- - {{ item.userName }} - -
-
-
+ + + + + + + + + + + + + + + + + + + @@ -327,13 +332,16 @@ export default { let ids = this.form.recipientRoles.join(',') getByRoleIdApi({roleIds: ids}).then(res => { const getUsertList = res.data; + console.log(getUsertList,335) // recipientUser // this.form.recipientUser = [] getUsertList.forEach(item => { - this.form.recipientUser.push({ - id: item.acctId, - userName: item.accountName, - }) + this.form.recipientUser.push(item.acctId) + // this.form.recipientUser.push({ + // id: item.acctId, + // staffId:item.staffId, + // userName: item.realName, + // }) this.getroleStaff.push({ id: item.acctId, userName: item.accountName, @@ -371,8 +379,8 @@ export default { page: 1, pageSize: 10, deviceName: '', - }, - this.getList() + } + this.getList() }, handleAdd(e) { this.clean() @@ -380,6 +388,7 @@ export default { this.getDutyList() this.title = "新增通知" + this.onlyGetUser() }, userEnter1() { // 在这里调用接口提交设备信息数据 @@ -417,7 +426,7 @@ export default { // this.form.recipientUser = JSON.parse(this.form.recipientUser) // this.form.recipientRoles = JSON.parse(this.form.recipientRoles) // this.getDutyList() - + this.onlyGetUser() getSysNotifyInfo(e.id).then(res => { this.open = true; this.title = "编辑通知" @@ -494,8 +503,18 @@ export default { // this.loading = true; // console.log(this.queryParams,222) // this.addDateRange(this.queryParams, this.dateRange) + this.linshicunshu = [] listUser1(this.queryParamsUser).then(response => { - this.userList = response.data.records; + this.userList = response.data.records + console.log(this.userList,507) + this.userList.forEach(item => { + this.linshicunshu.push({ + id: item.acctId, + staffId: item.staffId, + userName: item.realName ? item.realName : '--' + }) + }) + // this.total = response.data.total; // this.total = response.data.total; // this.loading = false; diff --git a/fuintAdmin/src/views/shopowner.vue b/fuintAdmin/src/views/shopowner.vue index 1e1afb835..7249af062 100644 --- a/fuintAdmin/src/views/shopowner.vue +++ b/fuintAdmin/src/views/shopowner.vue @@ -37,9 +37,8 @@ @click="goList()">更多 -
【{{ - item.notificationType - }}】{{ item.templateContent }} +
+ 【{{item.notificationType}}】{{ item.templateContent }}
暂无通知
@@ -706,7 +705,8 @@ export default { getStoreAmount() { getDataBoard(this.addDateRange(this.queryParams, this.value1)).then(res => { this.storeAmount = res.data - // this.initChart() + this.getDataAnalysis() + this.initChart() }) }, countPercentage(upNum, downNum) { diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java index 5b629217c..2a766ddfa 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java @@ -1647,7 +1647,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl sumAndNum = getSumAndNum(allOrderInfo, map); oilAmount = Double.valueOf(sumAndNum.get("payMoney").toString()); oilNum = Integer.valueOf(sumAndNum.get("allNum").toString()); @@ -1764,7 +1764,10 @@ public class AllOrderInfoServiceImpl extends ServiceImpl 0) { + averageValue = (Double.parseDouble(String.valueOf(oilList.size())) / oilOrders.size()) * 100; + } String formattedResult = getFormattedResult(averageValue); homeDataAnalysisVo.setValue(Double.parseDouble(formattedResult)); list.add(homeDataAnalysisVo); @@ -1789,13 +1792,19 @@ public class AllOrderInfoServiceImpl extends ServiceImpl 0) { + i = ((double) oilAllOrderInfos / (oilAllOrderInfos + productionAllOrderInfos)) * 100; + } Double shareOfOilTransactions = Double.valueOf((getFormattedResult(i))); - Double shareOfNonOilTransactions = Double.valueOf(getFormattedResult(((double) productionAllOrderInfos / (oilAllOrderInfos + productionAllOrderInfos)) * 100)); + Double shareOfNonOilTransactions = 0.0; + if ((oilAllOrderInfos + productionAllOrderInfos) > 0) { + shareOfNonOilTransactions = Double.valueOf(getFormattedResult(((double) productionAllOrderInfos / (oilAllOrderInfos + productionAllOrderInfos)) * 100)); + } HomeDataAnalysisVo oilhomeDataAnalysisVo = new HomeDataAnalysisVo(); oilhomeDataAnalysisVo.setName("油品交易占比"); @@ -1833,25 +1842,41 @@ public class AllOrderInfoServiceImpl extends ServiceImpl0){ + value = Double.parseDouble(getFormattedResult(((double) mtUser / sum) * 100)); + } + mtUserVo.setValue(value); list.add(mtUserVo); HomeDataAnalysisVo productVo = new HomeDataAnalysisVo(); productVo.setName("商品交易占比"); productVo.setType(3); - productVo.setValue(Double.parseDouble(getFormattedResult(((double) product / sum) * 100))); + double value1 = 0.0; + if (sum>0){ + value1 = Double.parseDouble(getFormattedResult(((double) product / sum) * 100)); + } + productVo.setValue(value1); list.add(productVo); HomeDataAnalysisVo oilRechargeVo = new HomeDataAnalysisVo(); oilRechargeVo.setName("油品交易占比"); oilRechargeVo.setType(3); - oilRechargeVo.setValue(Double.parseDouble(getFormattedResult(((double) oilRecharge / sum) * 100))); + double value2 = 0.0; + if (sum>0){ + value2 = Double.parseDouble(getFormattedResult(((double) oilRecharge / sum) * 100)); + } + oilRechargeVo.setValue(value2); list.add(oilRechargeVo); HomeDataAnalysisVo pointMallVo = new HomeDataAnalysisVo(); pointMallVo.setName("积分商城交易占比"); pointMallVo.setType(3); - pointMallVo.setValue(Double.parseDouble(getFormattedResult((double) pointMall / sum * 100))); + double value3 = 0.0; + if (sum>0){ + value3 = Double.parseDouble(getFormattedResult((double) pointMall / sum * 100)); + } + pointMallVo.setValue(value3); list.add(pointMallVo); return list; } @@ -1910,7 +1935,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl getAllDatesBetweenMonth(String startTime, String endTime) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");