From e2d01b2009c30173ff8e9f77d5c065f4d38fa49d Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期五, 17 五月 2024 17:56:07 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0 --- DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java index 910a8d7..bd1baca 100644 --- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java +++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java @@ -39,11 +39,19 @@ Double aDouble = orderEvaluateMapper.queryCount(uid); List<Map<String, Object>> list = orderEvaluateMapper.queryEvaluate(pageNum, size, uid); for (Map<String, Object> objectMap : list) { - String insertTime = map.get("insertTime").toString(); - objectMap.put("insertTime", DateUtil.conversionFormat(language, insertTime)); + if(null != objectMap.get("insertTime")){ + String insertTime = objectMap.get("insertTime").toString(); + objectMap.put("insertTime", DateUtil.conversionFormat(language, insertTime)); + } } map.put("sumScore", null != aDouble ? new BigDecimal(aDouble).setScale(1, BigDecimal.ROUND_HALF_EVEN).doubleValue() : 0); map.put("list", list); return map; } + + + @Override + public Double queryDriverScore(Integer driverId) throws Exception { + return this.baseMapper.queryDriverScore(driverId); + } } -- Gitblit v1.7.1