Explorar el Código

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

release_toaliyun_real
luozukai hace 7 años
padre
commit
d02b1757ea
Se han modificado 3 ficheros con 7 adiciones y 40 borrados
  1. +7
    -19
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
  2. +0
    -20
      mallinkService/src/main/java/com/iformall/utils/DateUtils.java
  3. +0
    -1
      mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml

+ 7
- 19
mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java Ver fichero

@@ -512,10 +512,8 @@ public class DataTowerServiceImpl implements DataTowerService {
// 查询近一周的缴费车辆----start------ // 查询近一周的缴费车辆----start------
HashMap<Object, Object> weekParams = new HashMap<>(); HashMap<Object, Object> weekParams = new HashMap<>();
weekParams.put("tenantId", tenantId); weekParams.put("tenantId", tenantId);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
List<Date> days = DateUtils.dateToWeek(new Date());
String oneWeekStartdate = sdf.format(days.get(0));
String oneWeekEndDate = sdf.format(days.get(days.size()-1));
String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date());
String oneWeekEndDate = DateUtils.getTimeBefore(1, new Date());;
weekParams.put("startdate", oneWeekStartdate + " 00:00:00"); weekParams.put("startdate", oneWeekStartdate + " 00:00:00");
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());
@@ -530,26 +528,16 @@ public class DataTowerServiceImpl implements DataTowerService {
}, m -> { }, m -> {
return m.get("fee"); return m.get("fee");
})); }));
List<String> days = DateUtils.getTjTimeList(oneWeekStartdate, oneWeekEndDate, "0");

TreeMap<String, Object> weekMap = new TreeMap<>(); TreeMap<String, Object> weekMap = new TreeMap<>();
SimpleDateFormat sdfForWeek = new SimpleDateFormat("MM/dd");
for (Date date:days) {
weekMap.put(sdfForWeek.format(date),"0");
for (String date:days) {
weekMap.put(date.substring(5,date.length()).replace("-","/"),"0");
} }
for (String key : weekCollect.keySet()) { for (String key : weekCollect.keySet()) {
weekMap.put(key,weekCollect.get(key)); weekMap.put(key,weekCollect.get(key));
} }

TreeMap<String, Object> weekResultMap = new TreeMap<>();
int count = 1;
for (String key : weekMap.keySet()) {
if(count == 7){
weekResultMap.put("日",weekMap.get(key));
}else{
weekResultMap.put(count+"",weekMap.get(key));
}
count++;
}
datamap.put("oneWeekCarPayFeeCount",weekResultMap);
datamap.put("oneWeekCarPayFeeCount",weekMap);
// 查询近一周的缴费车辆----end------ // 查询近一周的缴费车辆----end------


//今日车流量 //今日车流量


+ 0
- 20
mallinkService/src/main/java/com/iformall/utils/DateUtils.java Ver fichero

@@ -938,24 +938,4 @@ public class DateUtils {
return false; return false;
} }
} }


/**
* 根据日期获得所在周的日期
* @param mdate
* @return
*/
@SuppressWarnings("deprecation")
public static List<Date> dateToWeek(Date mdate) {
int b = mdate.getDay();
Date fdate;
List<Date> list = new ArrayList<>();
Long fTime = mdate.getTime() - b * 24 * 3600000;
for (int a = 1; a <= 7; a++) {
fdate = new Date();
fdate.setTime(fTime + (a * 24 * 3600000));
list.add(a-1, fdate);
}
return list;
}
} }

+ 0
- 1
mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml Ver fichero

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

Cargando…
Cancelar
Guardar