合并

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillServiceImpl.java

@@ -208,7 +208,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         String strSumDouble = sumDouble + "";
         // 如果 List 有数据, 表示携带了文件上传, 那么就从excel文件里面读取金额
         if (tempBills.size() > 0) {
-            sumDouble = tempBills.stream().mapToDouble(TempBill::getMoney).sum() * 100;
+            sumDouble = tempBills.stream().mapToDouble(TempBill::getMoney).sum();
             strSumDouble = sumDouble + "";
         }
         // 如果 List 没有数据, records 有数据, 就表示用户做的修改操作 并且没有上传文件, 那么这里的金额应该从数据库读取
@@ -378,7 +378,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
 
             if (StringUtils.isNotBlank(money)) {
-                Double moneyDouble = Double.valueOf(money); // * 100
+                Double moneyDouble = Double.valueOf(money) * 100;
                 money = moneyDouble + "";
                 money = money.substring(0, money.lastIndexOf("."));
                 temp.setMoney(Integer.valueOf(money));

VUECODE/smart-property-manage/src/router/index.js

@@ -221,7 +221,7 @@ export const constantRouterMap = [
         meta: { title: '收费组管理', icon: 'table' }
       },
       {
-        path: '/bill/management/info',
+        path: '/bill/management/info/:id',
         component: () => import('@/views/bill/info/index'),
         name: 'bill-info',
         hidden: true,
@@ -235,14 +235,14 @@ export const constantRouterMap = [
         meta: { title: '新增收费组', icon: 'table' }
       },
       {
-        path: '/bill/management/edi',
+        path: '/bill/management/edi/:id',
         component: () => import('@/views/bill/edi/index'),
         name: 'bill-edi',
         hidden: true,
         meta: { title: '修改收费组', icon: 'table' }
       },
       {
-        path: '/bill/management/info/bill-edi',
+        path: '/bill/management/info/bill-edi/:id',
         component: () => import('@/views/bill/info/bill-edi/index'),
         name: 'bill-info-edi',
         hidden: true,
@@ -278,7 +278,7 @@ export const constantRouterMap = [
         meta: { title: '工单管理', icon: 'table' }
       },
       {
-        path: '/ticket/details/',
+        path: '/ticket/details/:id',
         component: () => import('@/views/ticket/details'),
         name: 'ticket-details',
         hidden: true,

VUECODE/smart-property-manage/src/views/bill/add/index.vue

@@ -24,7 +24,7 @@
             :data="ruleForm"
             name="file"
             class="upload-demo"
-            action="http://106.14.20.193:8086/property-api/bill/uploadExcel/get"
+            :action="uploadUrl"
             multiple>
             <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
           </el-upload>
@@ -92,6 +92,7 @@ export default {
   },
   data() {
     return {
+      uploadUrl: process.env.BASE_API + "/bill/uploadExcel/get",
       ruleForm: {
         billName: '',
         billExplain: '',

VUECODE/smart-property-manage/src/views/bill/edi/index.vue

@@ -24,7 +24,7 @@
             :data="ruleForm"
             name="file"
             class="upload-demo"
-            action="http://106.14.20.193:8086/property-api/bill/uploadExcel/get"
+            :action="uploadUrl"
             multiple>
             <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
           </el-upload>
@@ -94,6 +94,7 @@ export default {
   },
   data() {
     return {
+      uploadUrl: process.env.BASE_API + "/bill/uploadExcel/get",
       ruleForm: {
         billId: '',
         billName: '',