| @@ -26,4 +26,5 @@ public interface WxCarCmdLogMapper extends CommonMapper<WxCarCmdLog, Long> { | |||||
| String queryTenantIdBySynId(HashMap<String,String> params); | String queryTenantIdBySynId(HashMap<String,String> params); | ||||
| Long queryWeekCarPayCount(HashMap<Object,Object> params); | |||||
| } | } | ||||
| @@ -519,13 +519,7 @@ public class DataTowerServiceImpl implements DataTowerService { | |||||
| weekParams.put("enddate", oneWeekEndDate + " 23:59:59"); | weekParams.put("enddate", oneWeekEndDate + " 23:59:59"); | ||||
| weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); | weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); | ||||
| List<Map<String, Object>> oneWeekHistorylist = wxCarCmdLogMapper.queryHistory(weekParams); | |||||
| Map<Object, Object> oneWeekCollect = oneWeekHistorylist.stream().collect(Collectors.toMap(m -> { | |||||
| return m.get("create_date"); | |||||
| }, m -> { | |||||
| return m.get("carcount"); | |||||
| })); | |||||
| datamap.put("oneWeekCarPayCount",oneWeekCollect.get("carcount")==null?0:oneWeekCollect.get("carcount")); | |||||
| datamap.put("oneWeekCarPayCount",wxCarCmdLogMapper.queryWeekCarPayCount(weekParams)); | |||||
| // 近一周缴费金额 | // 近一周缴费金额 | ||||
| weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); | weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); | ||||
| @@ -85,6 +85,12 @@ | |||||
| ) c group by c.create_time order by c.create_time | ) c group by c.create_time order by c.create_time | ||||
| </select> | </select> | ||||
| <select id="queryWeekCarPayCount" resultType="Long" parameterType="hashmap"> | |||||
| select count(id) | |||||
| from wx_car_cmd_log where tenant_id = #{tenantId} and cmd_type=#{cmdType} | |||||
| and create_date BETWEEN #{startdate} and #{enddate} | |||||
| </select> | |||||
| <select id="queryWeekCarPay" resultType="hashmap" parameterType="hashmap"> | <select id="queryWeekCarPay" resultType="hashmap" parameterType="hashmap"> | ||||
| select count(c.id) carcount,c.create_time from ( | select count(c.id) carcount,c.create_time from ( | ||||
| select id,DATE_FORMAT(create_date,'%m/%d') create_time | select id,DATE_FORMAT(create_date,'%m/%d') create_time | ||||