dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
wangh 2024-05-23 09:18:59 +08:00
parent 3acbf2bcda
commit 14a3c56a73
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuintAdmin_zt/src/views/financialStatement/runningWater/tab/instituion.vue
View File

@ -108,7 +108,11 @@
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="deptId" align="center" label="机构编号" width="220"> </el-table-column>
<el-table-column prop="deptName" align="center" label="机构名称"> </el-table-column>
<el-table-column prop="deptName" align="center" label="机构名称">
<template slot-scope="slot">
<span>{{slot.row.deptName}}({{slot.row.parentStoreName}})</span>
</template>
</el-table-column>
<el-table-column prop="inertiaStore" align="center" label="活跃门店数量"> </el-table-column>
<el-table-column prop="amount" align="center" label="交易金额"> </el-table-column>
<el-table-column prop="strokeCount" align="center" label="交易笔数"> </el-table-column>

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
View File

@ -590,8 +590,8 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
long dayNum = 0;
// 查询父级
SysDept sysDept1 = sysDeptMapper.selectDeptById(sysDept.getParentId());
sysDept.setParentStoreId(sysDept.getParentId());
sysDept.setParentStoreName(sysDept1.getParentName());
sysDept.setParentStoreId(sysDept.getDeptId());
sysDept.setParentStoreName(sysDept1.getDeptName());
//计算天数
if (ObjectUtil.isNotEmpty(allOrderInfo.getParams().get("beginTime")) && ObjectUtil.isNotEmpty(allOrderInfo.getParams().get("endTime"))) {
String beginTimeStr = allOrderInfo.getParams().get("beginTime").toString();