From c11ada735e13b6e244386e41105ad04d8781cd46 Mon Sep 17 00:00:00 2001 From: Kurisu Date: Tue, 7 Dec 2021 11:10:32 +0800 Subject: [PATCH] :zap: 对接新待办 --- fw-valhalla-common/src/main/java/cn/fw/valhalla/common/utils/DateUtil.java | 24 ++++++++++++++++++++---- fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/FollowRecordTask.java | 18 +++++++++--------- fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java | 22 ++++++++++++++++++---- 3 files changed, 47 insertions(+), 17 deletions(-) diff --git a/fw-valhalla-common/src/main/java/cn/fw/valhalla/common/utils/DateUtil.java b/fw-valhalla-common/src/main/java/cn/fw/valhalla/common/utils/DateUtil.java index 7f68382..1106c1e 100644 --- a/fw-valhalla-common/src/main/java/cn/fw/valhalla/common/utils/DateUtil.java +++ b/fw-valhalla-common/src/main/java/cn/fw/valhalla/common/utils/DateUtil.java @@ -282,8 +282,12 @@ public final class DateUtil { * @return 返回短时间字符串格式 yyyy-MM-dd */ public static String getStringDateShort(Date date) { + return getStringDateShort(date, ""); + } + + public static String getStringDateShort(Date date, String defaultStr) { if (date == null) { - return null; + return defaultStr; } String dateString = sdf.format(date); return dateString; @@ -296,8 +300,12 @@ public final class DateUtil { * @return 返回短时间字符串格式 yyyy-MM-dd HH:mm:ss */ public static String getFullDateString(Date date) { + return getFullDateString(date, ""); + } + + public static String getFullDateString(Date date, String defaultStr) { if (date == null) { - return ""; + return defaultStr; } SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); return format.format(date); @@ -310,8 +318,12 @@ public final class DateUtil { * @return 返回短时间字符串格式 yyyy-MM */ public static String getMonthString(Date date) { + return getMonthString(date, ""); + } + + public static String getMonthString(Date date, String defaultStr) { if (date == null) { - return ""; + return defaultStr; } SimpleDateFormat format = new SimpleDateFormat("yyyy-MM"); return format.format(date); @@ -325,8 +337,12 @@ public final class DateUtil { * @return 返回时间字符串 */ public static String getFormatString(Date date, String pattern) { + return getFormatString(date, pattern, ""); + } + + public static String getFormatString(Date date, String pattern, String defaultStr) { if (date == null) { - return ""; + return defaultStr; } SimpleDateFormat format = new SimpleDateFormat(pattern); return format.format(date); diff --git a/fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/FollowRecordTask.java b/fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/FollowRecordTask.java index 013f9b1..db1a8a4 100644 --- a/fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/FollowRecordTask.java +++ b/fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/FollowRecordTask.java @@ -174,19 +174,19 @@ public class FollowRecordTask { dynamicMap.put("id", record.getId().toString()); if (Objects.nonNull(vo)) { dynamicMap.put("state", "1"); - dynamicMap.put("plateNo", StringUtils.isValid(vo.getPlateNo()) ? vo.getPlateNo() : ""); - dynamicMap.put("name", StringUtils.isValid(vo.getName()) ? vo.getName() : ""); + dynamicMap.put("plateNo", StringUtils.isValid(vo.getPlateNo()) ? vo.getPlateNo() : "-"); + dynamicMap.put("name", StringUtils.isValid(vo.getName()) ? vo.getName() : "-"); if (vo instanceof FMDetailVO) { - dynamicMap.put("buyDate", DateUtil.getFullDateString(((FMDetailVO) vo).getBuyDate())); - dynamicMap.put("expirTime", DateUtil.getFullDateString(((FMDetailVO) vo).getFMExpiration())); + dynamicMap.put("buyDate", DateUtil.getFullDateString(((FMDetailVO) vo).getBuyDate(), "-")); + dynamicMap.put("expirTime", DateUtil.getFullDateString(((FMDetailVO) vo).getFMExpiration(), "-")); } else if (vo instanceof RMDetailVO) { - dynamicMap.put("currentMileage", Optional.ofNullable(((RMDetailVO) vo).getLastMileage()).map(String::valueOf).orElse("")); - dynamicMap.put("arrivalTime", DateUtil.getFullDateString(((RMDetailVO) vo).getDeliveryTime())); + dynamicMap.put("currentMileage", Optional.ofNullable(((RMDetailVO) vo).getLastMileage()).map(String::valueOf).orElse("-")); + dynamicMap.put("arrivalTime", DateUtil.getFullDateString(((RMDetailVO) vo).getDeliveryTime(), "-")); } else if (vo instanceof IRDetailVO) { - dynamicMap.put("expirTime", DateUtil.getFullDateString(((IRDetailVO) vo).getTclInsExpiration())); - dynamicMap.put("insComName", StringUtils.isValid(((IRDetailVO) vo).getTclInsComName()) ? vo.getPlateNo() : ""); + dynamicMap.put("expirTime", DateUtil.getFullDateString(((IRDetailVO) vo).getTclInsExpiration(), "-")); + dynamicMap.put("insComName", StringUtils.isValid(((IRDetailVO) vo).getTclInsComName()) ? vo.getPlateNo() : "-"); } else if (vo instanceof ACDetailVO) { - dynamicMap.put("insComName", StringUtils.isValid(((ACDetailVO) vo).getInsComName()) ? vo.getPlateNo() : ""); + dynamicMap.put("insComName", StringUtils.isValid(((ACDetailVO) vo).getInsComName()) ? vo.getPlateNo() : "-"); } } return dynamicMap; diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java index 3ef9292..409f00d 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java @@ -115,16 +115,22 @@ public class LeaveNeedDoBizService { if (bool) { return; } - bool = customerService.count(Wrappers.lambdaQuery() + int count = customerService.count(Wrappers.lambdaQuery() .eq(Customer::getAdviserId, userId) .eq(Customer::getShopId, shopId) .eq(Customer::getYn, Boolean.TRUE) - ) <= 0; - if (bool) { + ); + if (count <= 0) { return; } leaveNeedDoService.save(leaveNeedDo); - push2Todo(leaveNeedDo.getId(), postUserDTOS.get(0).getUserId(), shopId); + Map map = new HashMap<>(); + map.put("id", String.valueOf(leaveNeedDo.getId())); + map.put("shopId", String.valueOf(shopId)); + map.put("userName", leaveNeedDo.getUserName()); + map.put("customerNum", String.valueOf(count)); + map.put("leaveTime", DateUtil.getFullDateString(leaveNeedDo.getEffectiveTime(), "-")); + push2Todo(leaveNeedDo.getId(), postUserDTOS.get(0).getUserId(), shopId, map); } public AppPage getList(LoginAuthBean currentUser, LeaveQueryVO queryVO) { @@ -590,7 +596,15 @@ public class LeaveNeedDoBizService { } private void push2Todo(Long id, Long userId, Long shopId) { + Map map = new HashMap<>(); + map.put("shopId", String.valueOf(shopId)); + map.put("id", String.valueOf(id)); + push2Todo(id, userId, shopId, map); + } + + private void push2Todo(Long id, Long userId, Long shopId, Map map) { BackLogItemDTO dto = new BackLogItemDTO(userId, getLeave2doCode(), String.valueOf(id), new Date(), shopId); + dto.setDynamicMap(map); todoRpcService.push(dto); } -- libgit2 0.22.2