ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -85,12 +85,12 @@ { SysUser user = SecurityUtils.getLoginUser().getUser(); // System.out.println(user); // System.out.println("===========0-000000000000000000"); // System.out.println("===========0oiii999999999999999-000000000000000000"); // 角色集合 Set<String> roles = permissionService.getRolePermission(user); // 权限集合 Set<String> permissions = permissionService.getMenuPermission(user); // System.out.println(permissions); System.out.println(permissions); AjaxResult ajax = AjaxResult.success(); ajax.put("user", user); ajax.put("roles", roles); zhang-content/src/main/java/com/ruoyi/domain/TravelCount.java
@@ -90,6 +90,11 @@ private Double eatTotal; /** * 共计购物费 */ private Double shopTotal; /** * 共计团费 * * zhang-content/src/main/java/com/ruoyi/domain/TravelDetail.java
@@ -85,6 +85,10 @@ * 交通费 */ private Double travel; /** * 购物费 */ private Double shop; /** * 电子文件路径 zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java
@@ -91,20 +91,21 @@ double eatTotal = 0; double stayTotal = 0; double travelTotal = 0; double shopTotal = 0; //把所有详细数据的费用值累加起来 for (TravelDetail detail : travelDetailList) { entranceTotal+=detail.getEntrance(); eatTotal+=detail.getEat(); stayTotal+=detail.getStay(); travelTotal+=detail.getTravel(); shopTotal += detail.getShop(); } travelCount.setEntranceTotal(entranceTotal); travelCount.setEatTotal(eatTotal); travelCount.setStayTotal(stayTotal); travelCount.setTravelTotal(travelTotal); travelCount.setShopTotal(shopTotal); DecimalFormat df = new DecimalFormat("0.00"); travelCount.setTotalPrice(Double.parseDouble(df.format(entranceTotal+eatTotal+travelCount.getGroupTotal()+stayTotal+travelTotal))); }
