Browse Source

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

release_toaliyun_real
luozukai 7 years ago
parent
commit
38855a2444
4 changed files with 49 additions and 5 deletions
  1. +3
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java
  3. +36
    -2
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
  4. +8
    -0
      mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml

+ 3
- 1
mallinkService/src/main/java/com/iformall/mapper/WxCUserCarMapper.java View File

@@ -4,6 +4,7 @@ import com.iformall.common.CommonMapper;
import com.iformall.domain.dto.WxCUserBasicInfoDto;
import com.iformall.domain.po.WxCUserCar;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

@@ -15,4 +16,5 @@ public interface WxCUserCarMapper extends CommonMapper<WxCUserCar, Long> {

long queryCarCount(Map<String,Object> carParams);

}
List<Map<String, Object>> queryCarCountHistory(HashMap<String,Object> params);
}

+ 2
- 2
mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java View File

@@ -18,7 +18,7 @@ public interface WxCarCmdLogMapper extends CommonMapper<WxCarCmdLog, Long> {

List<Map<String, Object>> queryTodayCar(HashMap<Object,Object> params);

List<Map<String, Object>> queryWeekCarPay(HashMap<Object,Object> params);
List<Map<String, Object>> queryWeekCarPay(HashMap<String,Object> params);

List<MarkingSceneDataVo> queryForSceneRepotyHistoryCar(HashMap<String,Object> params);

@@ -26,5 +26,5 @@ public interface WxCarCmdLogMapper extends CommonMapper<WxCarCmdLog, Long> {

String queryTenantIdBySynId(HashMap<String,String> params);

Long queryWeekCarPayCount(HashMap<Object,Object> params);
Long queryWeekCarPayCount(HashMap<String,Object> params);
}

+ 36
- 2
mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java View File

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.domain.dto.WxCUserBasicInfoDto;
import com.iformall.domain.po.*;
import com.iformall.domain.vo.WxBillAll;
import com.iformall.enums.*;
@@ -510,10 +511,10 @@ public class DataTowerServiceImpl implements DataTowerService {
datamap.put("history", historymap);

// 查询近一周的缴费车辆----start------
HashMap<Object, Object> weekParams = new HashMap<>();
HashMap<String, Object> weekParams = new HashMap<>();
weekParams.put("tenantId", tenantId);
String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date());
String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date());;
String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date());
weekParams.put("startdate", oneWeekStartdate + " 00:00:00");
weekParams.put("enddate", oneWeekEndDate + " 23:59:59");
weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode());
@@ -538,6 +539,39 @@ public class DataTowerServiceImpl implements DataTowerService {
weekMap.put(key,weekCollect.get(key));
}
datamap.put("oneWeekCarPayFeeCount",weekMap);

// 近一周新增会员历史
List<Map<String, Object>> carCountHistory = wxCUserCarMapper.queryCarCountHistory(weekParams);
Map<String, Object> weekCarCollect = carCountHistory.stream().collect(Collectors.toMap(m -> {
return (String)m.get("create_time");
}, m -> {
return m.get("count");
}));
TreeMap<String, Object> weekCarMap = new TreeMap<>();
for (String date:days) {
weekCarMap.put(date.substring(5,date.length()).replace("-","/"),"0");
}
for (String key : weekCarCollect.keySet()) {
weekCarMap.put(key,weekCarCollect.get(key));
}
datamap.put("oneWeekNewCarUserHistory",weekCarMap);

//近一周新增停车会员数
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto();
wxCUserBasicInfoDto.setTenantId(tenantId);
try {
wxCUserBasicInfoDto.setStartTime(sdf.parse(oneWeekStartdate));
wxCUserBasicInfoDto.setEndTime(sdf.parse(oneWeekEndDate));
}catch (Exception e){
e.printStackTrace();
}
datamap.put("oneWeekNewCarUserCount",wxCUserCarMapper.countUser(wxCUserBasicInfoDto));
//停车会员总数
wxCUserBasicInfoDto = new WxCUserBasicInfoDto();
wxCUserBasicInfoDto.setTenantId(tenantId);
datamap.put("newCarUserSumCount",wxCUserCarMapper.countUser(wxCUserBasicInfoDto));

// 查询近一周的缴费车辆----end------

//今日车流量


+ 8
- 0
mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml View File

@@ -96,4 +96,12 @@
<select id="queryCarCount" parameterType="hashmap" resultType="long">
select count(id) from wx_c_user_car where tenant_id=#{tenantId} and create_date between #{startdate} and #{enddate}
</select>

<select id="queryCarCountHistory" resultType="hashmap" parameterType="hashmap">
select count(c.id) count,c.create_time from (
select uc.id,DATE_FORMAT(uc.create_date,'%m/%d') create_time
from wx_c_user_car uc, wx_c_user_basic_info ubi where uc.c_user_id = ubi.id and uc.tenant_id = #{tenantId} and ubi.tenant_id = #{tenantId}
and uc.create_date between #{startdate} and #{enddate}
) c group by c.create_time order by c.create_time
</select>
</mapper>

Loading…
Cancel
Save