|
@@ -508,11 +508,11 @@ public class FinanceReportController extends BaseController {
|
|
|
Page<Map<String,Object>> page = financeService.balanceConsumeDetailList_New2(params, initPage(pageNo, pageSize));
|
|
|
List<Map<String,Object>> list=page.getContent();
|
|
|
for (Map<String, Object> map : list) {
|
|
|
- if(Integer.parseInt(map.get("meal_type").toString())==4) {
|
|
|
- map.put("price_1", "0");
|
|
|
- }else {
|
|
|
- map.put("price_1", "350");
|
|
|
- }
|
|
|
+// if(Integer.parseInt(map.get("meal_type").toString())==4) {
|
|
|
+// map.put("price_1", "0");
|
|
|
+// }else {
|
|
|
+// map.put("price_1", "350");
|
|
|
+// }
|
|
|
map.put("sum_price_1", "0");
|
|
|
map.put("sum_price_2", "0");
|
|
|
map.put("sum_price_3", "0");
|
|
@@ -656,11 +656,11 @@ public class FinanceReportController extends BaseController {
|
|
|
Page<Map<String,Object>> page = financeService.balanceConsumeDetailList_New2(params, initPage(1, 10000));
|
|
|
List<Map<String,Object>> list=page.getContent();
|
|
|
for (Map<String, Object> map : list) {
|
|
|
- if(Integer.parseInt(map.get("meal_type").toString())==4) {
|
|
|
- map.put("price_1", "0");
|
|
|
- }else {
|
|
|
- map.put("price_1", "350");
|
|
|
- }
|
|
|
+// if(Integer.parseInt(map.get("meal_type").toString())==4) {
|
|
|
+// map.put("price_1", "0");
|
|
|
+// }else {
|
|
|
+// map.put("price_1", "350");
|
|
|
+// }
|
|
|
map.put("sum_price_1", "0");
|
|
|
map.put("sum_price_2", "0");
|
|
|
map.put("sum_price_3", "0");
|
|
@@ -726,8 +726,7 @@ public class FinanceReportController extends BaseController {
|
|
|
if(Integer.parseInt(map.get("count_2").toString())>0) {
|
|
|
map.put("count_2_m", map.get("balance_month") );
|
|
|
map.put("sum_price_2", map.get("price_1")!=null && StringUtils.isNotEmpty(map.get("price_1").toString()) ?
|
|
|
- new BigDecimal(map.get("price_1").toString()).doubleValue()*
|
|
|
- new BigDecimal(map.get("count_2").toString()).intValue()
|
|
|
+ new BigDecimal(map.get("price_1").toString()).doubleValue()
|
|
|
*0.4
|
|
|
: 0);
|
|
|
}else {
|