Просмотр исходного кода

优化审批流&开发车辆显示

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
71bafd930b
2 измененных файлов: 13 добавлений и 7 удалений
  1. +10
    -4
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
  2. +3
    -3
      mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml

+ 10
- 4
mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java Просмотреть файл

@@ -524,13 +524,19 @@ public class DataTowerServiceImpl implements DataTowerService {
// 近一周缴费金额
weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode());
List<Map<String, Object>> weekCarPayHistoryList = wxCarCmdLogMapper.queryWeekCarPay(weekParams);
Map<Object, Object> weekCollect = weekCarPayHistoryList.stream().collect(Collectors.toMap(m -> {
return m.get("create_time");
Map<String, Object> weekCollect = weekCarPayHistoryList.stream().collect(Collectors.toMap(m -> {
return (String)m.get("create_time");
}, m -> {
return m.get("carcount");
return m.get("fee");
}));
TreeMap<Object, Object> weekMap = new TreeMap<>();
weekMap.putAll(weekCollect);
SimpleDateFormat sdfForWeek = new SimpleDateFormat("MM/dd");
for (Date date:days) {
weekMap.put(sdfForWeek.format(date),"0");
}
for (String key : weekCollect.keySet()) {
weekMap.put(key,weekCollect.get(key));
}
datamap.put("oneWeekCarPayFeeCount",weekMap);
// 查询近一周的缴费车辆----end------



+ 3
- 3
mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml Просмотреть файл

@@ -92,10 +92,10 @@
</select>

<select id="queryWeekCarPay" resultType="hashmap" parameterType="hashmap">
select count(c.id) carcount,c.create_time from (
select id,DATE_FORMAT(create_date,'%m/%d') create_time
select sum(fee) fee,c.create_time from (
select id,DATE_FORMAT(create_date,'%m/%d') create_time,CONVERT(JSON_EXTRACT(cmd_json,'$.fee'), Decimal(16,2)) fee
from wx_car_cmd_log where tenant_id = #{tenantId} and cmd_type=#{cmdType}
and create_date BETWEEN #{startdate} and #{enddate}
and create_date BETWEEN #{startdate} and #{enddate}
) c group by c.create_time order by c.create_time
</select>



Загрузка…
Отмена
Сохранить