Commit c11ada735e13b6e244386e41105ad04d8781cd46
1 parent
d10c52ef
对接新待办
Showing
3 changed files
with
47 additions
and
17 deletions
fw-valhalla-common/src/main/java/cn/fw/valhalla/common/utils/DateUtil.java
... | ... | @@ -282,8 +282,12 @@ public final class DateUtil { |
282 | 282 | * @return 返回短时间字符串格式 yyyy-MM-dd |
283 | 283 | */ |
284 | 284 | public static String getStringDateShort(Date date) { |
285 | + return getStringDateShort(date, ""); | |
286 | + } | |
287 | + | |
288 | + public static String getStringDateShort(Date date, String defaultStr) { | |
285 | 289 | if (date == null) { |
286 | - return null; | |
290 | + return defaultStr; | |
287 | 291 | } |
288 | 292 | String dateString = sdf.format(date); |
289 | 293 | return dateString; |
... | ... | @@ -296,8 +300,12 @@ public final class DateUtil { |
296 | 300 | * @return 返回短时间字符串格式 yyyy-MM-dd HH:mm:ss |
297 | 301 | */ |
298 | 302 | public static String getFullDateString(Date date) { |
303 | + return getFullDateString(date, ""); | |
304 | + } | |
305 | + | |
306 | + public static String getFullDateString(Date date, String defaultStr) { | |
299 | 307 | if (date == null) { |
300 | - return ""; | |
308 | + return defaultStr; | |
301 | 309 | } |
302 | 310 | SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
303 | 311 | return format.format(date); |
... | ... | @@ -310,8 +318,12 @@ public final class DateUtil { |
310 | 318 | * @return 返回短时间字符串格式 yyyy-MM |
311 | 319 | */ |
312 | 320 | public static String getMonthString(Date date) { |
321 | + return getMonthString(date, ""); | |
322 | + } | |
323 | + | |
324 | + public static String getMonthString(Date date, String defaultStr) { | |
313 | 325 | if (date == null) { |
314 | - return ""; | |
326 | + return defaultStr; | |
315 | 327 | } |
316 | 328 | SimpleDateFormat format = new SimpleDateFormat("yyyy-MM"); |
317 | 329 | return format.format(date); |
... | ... | @@ -325,8 +337,12 @@ public final class DateUtil { |
325 | 337 | * @return 返回时间字符串 |
326 | 338 | */ |
327 | 339 | public static String getFormatString(Date date, String pattern) { |
340 | + return getFormatString(date, pattern, ""); | |
341 | + } | |
342 | + | |
343 | + public static String getFormatString(Date date, String pattern, String defaultStr) { | |
328 | 344 | if (date == null) { |
329 | - return ""; | |
345 | + return defaultStr; | |
330 | 346 | } |
331 | 347 | SimpleDateFormat format = new SimpleDateFormat(pattern); |
332 | 348 | return format.format(date); | ... | ... |
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/task/FollowRecordTask.java
... | ... | @@ -174,19 +174,19 @@ public class FollowRecordTask { |
174 | 174 | dynamicMap.put("id", record.getId().toString()); |
175 | 175 | if (Objects.nonNull(vo)) { |
176 | 176 | dynamicMap.put("state", "1"); |
177 | - dynamicMap.put("plateNo", StringUtils.isValid(vo.getPlateNo()) ? vo.getPlateNo() : ""); | |
178 | - dynamicMap.put("name", StringUtils.isValid(vo.getName()) ? vo.getName() : ""); | |
177 | + dynamicMap.put("plateNo", StringUtils.isValid(vo.getPlateNo()) ? vo.getPlateNo() : "-"); | |
178 | + dynamicMap.put("name", StringUtils.isValid(vo.getName()) ? vo.getName() : "-"); | |
179 | 179 | if (vo instanceof FMDetailVO) { |
180 | - dynamicMap.put("buyDate", DateUtil.getFullDateString(((FMDetailVO) vo).getBuyDate())); | |
181 | - dynamicMap.put("expirTime", DateUtil.getFullDateString(((FMDetailVO) vo).getFMExpiration())); | |
180 | + dynamicMap.put("buyDate", DateUtil.getFullDateString(((FMDetailVO) vo).getBuyDate(), "-")); | |
181 | + dynamicMap.put("expirTime", DateUtil.getFullDateString(((FMDetailVO) vo).getFMExpiration(), "-")); | |
182 | 182 | } else if (vo instanceof RMDetailVO) { |
183 | - dynamicMap.put("currentMileage", Optional.ofNullable(((RMDetailVO) vo).getLastMileage()).map(String::valueOf).orElse("")); | |
184 | - dynamicMap.put("arrivalTime", DateUtil.getFullDateString(((RMDetailVO) vo).getDeliveryTime())); | |
183 | + dynamicMap.put("currentMileage", Optional.ofNullable(((RMDetailVO) vo).getLastMileage()).map(String::valueOf).orElse("-")); | |
184 | + dynamicMap.put("arrivalTime", DateUtil.getFullDateString(((RMDetailVO) vo).getDeliveryTime(), "-")); | |
185 | 185 | } else if (vo instanceof IRDetailVO) { |
186 | - dynamicMap.put("expirTime", DateUtil.getFullDateString(((IRDetailVO) vo).getTclInsExpiration())); | |
187 | - dynamicMap.put("insComName", StringUtils.isValid(((IRDetailVO) vo).getTclInsComName()) ? vo.getPlateNo() : ""); | |
186 | + dynamicMap.put("expirTime", DateUtil.getFullDateString(((IRDetailVO) vo).getTclInsExpiration(), "-")); | |
187 | + dynamicMap.put("insComName", StringUtils.isValid(((IRDetailVO) vo).getTclInsComName()) ? vo.getPlateNo() : "-"); | |
188 | 188 | } else if (vo instanceof ACDetailVO) { |
189 | - dynamicMap.put("insComName", StringUtils.isValid(((ACDetailVO) vo).getInsComName()) ? vo.getPlateNo() : ""); | |
189 | + dynamicMap.put("insComName", StringUtils.isValid(((ACDetailVO) vo).getInsComName()) ? vo.getPlateNo() : "-"); | |
190 | 190 | } |
191 | 191 | } |
192 | 192 | return dynamicMap; | ... | ... |
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java
... | ... | @@ -115,16 +115,22 @@ public class LeaveNeedDoBizService { |
115 | 115 | if (bool) { |
116 | 116 | return; |
117 | 117 | } |
118 | - bool = customerService.count(Wrappers.<Customer>lambdaQuery() | |
118 | + int count = customerService.count(Wrappers.<Customer>lambdaQuery() | |
119 | 119 | .eq(Customer::getAdviserId, userId) |
120 | 120 | .eq(Customer::getShopId, shopId) |
121 | 121 | .eq(Customer::getYn, Boolean.TRUE) |
122 | - ) <= 0; | |
123 | - if (bool) { | |
122 | + ); | |
123 | + if (count <= 0) { | |
124 | 124 | return; |
125 | 125 | } |
126 | 126 | leaveNeedDoService.save(leaveNeedDo); |
127 | - push2Todo(leaveNeedDo.getId(), postUserDTOS.get(0).getUserId(), shopId); | |
127 | + Map<String, String> map = new HashMap<>(); | |
128 | + map.put("id", String.valueOf(leaveNeedDo.getId())); | |
129 | + map.put("shopId", String.valueOf(shopId)); | |
130 | + map.put("userName", leaveNeedDo.getUserName()); | |
131 | + map.put("customerNum", String.valueOf(count)); | |
132 | + map.put("leaveTime", DateUtil.getFullDateString(leaveNeedDo.getEffectiveTime(), "-")); | |
133 | + push2Todo(leaveNeedDo.getId(), postUserDTOS.get(0).getUserId(), shopId, map); | |
128 | 134 | } |
129 | 135 | |
130 | 136 | public AppPage<LeaveNeedDoVO> getList(LoginAuthBean currentUser, LeaveQueryVO queryVO) { |
... | ... | @@ -590,7 +596,15 @@ public class LeaveNeedDoBizService { |
590 | 596 | } |
591 | 597 | |
592 | 598 | private void push2Todo(Long id, Long userId, Long shopId) { |
599 | + Map<String, String> map = new HashMap<>(); | |
600 | + map.put("shopId", String.valueOf(shopId)); | |
601 | + map.put("id", String.valueOf(id)); | |
602 | + push2Todo(id, userId, shopId, map); | |
603 | + } | |
604 | + | |
605 | + private void push2Todo(Long id, Long userId, Long shopId, Map<String, String> map) { | |
593 | 606 | BackLogItemDTO dto = new BackLogItemDTO(userId, getLeave2doCode(), String.valueOf(id), new Date(), shopId); |
607 | + dto.setDynamicMap(map); | |
594 | 608 | todoRpcService.push(dto); |
595 | 609 | } |
596 | 610 | ... | ... |