Merge remote-tracking branch 'origin/dev' into test

张志伟
2 parents b3cb80bc 8571fd66
Showing 2 changed files with 3 additions and 3 deletions
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/LeaveNeedDoBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AccidentPoolBizService.java
@@ -328,7 +328,7 @@ public class LeaveNeedDoBizService {
             }
         }
         clearKey(key);
-        BackLogItemDTO backLogItemDTO = new BackLogItemDTO(user.getUserId(), getLeave2doCode(), String.valueOf(leaveId), new Date());
+        BackLogItemDTO backLogItemDTO = new BackLogItemDTO(user.getUserId(), getLeave2doCode(), String.valueOf(leaveId), new Date(), null);
         todoRpcService.complete(backLogItemDTO);
     }
  
@@ -441,7 +441,7 @@ public class LeaveNeedDoBizService {
     }
  
     private void push2Todo(Long id, Long userId) {
-        BackLogItemDTO dto = new BackLogItemDTO(userId, getLeave2doCode(), String.valueOf(id), new Date());
+        BackLogItemDTO dto = new BackLogItemDTO(userId, getLeave2doCode(), String.valueOf(id), new Date(), null);
         todoRpcService.push(dto);
     }
  
@@ -173,7 +173,7 @@ public class AccidentPoolBizService {
         }
         for (FollowRecord record : list) {
             record.setLimitTime(DateUtil.localDateTime2Date(LocalDateTime.now()));
-            BackLogItemDTO dto = new BackLogItemDTO(record.getUserId(), getACCode(), String.valueOf(record.getId()), DateUtil.localDateTime2Date(LocalDateTime.now()));
+            BackLogItemDTO dto = new BackLogItemDTO(record.getUserId(), getACCode(), String.valueOf(record.getId()), DateUtil.localDateTime2Date(LocalDateTime.now()), record.getShopId());
             todoRpcService.cancel(dto);
         }
         followRecordService.updateBatchById(list);