Commit c1f7f0a7d3041c2e7779d7952e82f1f04b123a78
Merge remote-tracking branch 'origin/dev' into test
Showing
9 changed files
with
24 additions
and
8 deletions
doc/v1.1.2/update.sql
fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/customer/AccidentPool.java
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/AccidentPoolDTO.java
... | ... | @@ -23,6 +23,10 @@ public class AccidentPoolDTO { |
23 | 23 | */ |
24 | 24 | private String mobile; |
25 | 25 | /** |
26 | + * 车架号 | |
27 | + */ | |
28 | + private String frameNo; | |
29 | + /** | |
26 | 30 | * 报案手机号 |
27 | 31 | */ |
28 | 32 | private String reportMobile; |
... | ... | @@ -70,5 +74,5 @@ public class AccidentPoolDTO { |
70 | 74 | /** |
71 | 75 | * 报案地点 |
72 | 76 | */ |
73 | - private String address; | |
77 | + private String reportAddress; | |
74 | 78 | } | ... | ... |
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/StammkundeBizService.java
... | ... | @@ -120,7 +120,7 @@ public class StammkundeBizService { |
120 | 120 | |
121 | 121 | if (StringUtils.isNotBlank(times[0]) && NumberUtils.isDigits(times[0])) { |
122 | 122 | LocalDateTime localDateTime = Instant.ofEpochMilli(NumberUtils.toLong(times[0])).atZone(ZoneId.systemDefault()).toLocalDateTime(); |
123 | - queryVO.setStartTime(DateUtil.getEndInTime(DateUtil.localDateTime2Date(localDateTime))); | |
123 | + queryVO.setStartTime(DateUtil.getBeginInTime(DateUtil.localDateTime2Date(localDateTime))); | |
124 | 124 | } |
125 | 125 | if (times.length >= 2) { |
126 | 126 | if (StringUtils.isNotBlank(times[1]) && NumberUtils.isDigits(times[1])) { | ... | ... |
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AccidentPoolBizService.java
... | ... | @@ -116,6 +116,7 @@ public class AccidentPoolBizService { |
116 | 116 | private AccidentPool conversion2db(AccidentPoolDTO dto, LoginAuthBean currentUser) { |
117 | 117 | AccidentPool pool = new AccidentPool(); |
118 | 118 | BeanUtils.copyProperties(dto, pool); |
119 | + pool.setAddress(dto.getReportAddress()); | |
119 | 120 | pool.setCreateTime(new Date()); |
120 | 121 | pool.setUpdateTime(new Date()); |
121 | 122 | pool.setGroupId(currentUser.getGroupId()); | ... | ... |
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/PoolBizService.java
... | ... | @@ -278,9 +278,6 @@ public class PoolBizService { |
278 | 278 | if (Objects.nonNull(user)) { |
279 | 279 | queryVO.setUserId(user.getUserId()); |
280 | 280 | queryVO.setGroupId(user.getGroupId()); |
281 | - } else { | |
282 | - boolean bool = CollectionUtils.isEmpty(queryVO.getShopIds()) && Objects.isNull(queryVO.getUserId()) && StringUtils.isEmpty(queryVO.getUserName()); | |
283 | - BV.isFalse(bool, () -> "请选择服务站或者人员"); | |
284 | 281 | } |
285 | 282 | if (Objects.nonNull(queryVO.getOrder()) && StringUtils.isValid(queryVO.getOrderAtt())) { |
286 | 283 | StringBuilder sb = new StringBuilder(" order by "); | ... | ... |
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java
... | ... | @@ -533,7 +533,9 @@ public abstract class AbstractFollowStrategy implements FollowStrategy { |
533 | 533 | recordLog.setAttType(dto.getAttTypeEnum()); |
534 | 534 | recordLog.setDescribes(dto.getDescribes()); |
535 | 535 | recordLog.setRecordId(dto.getRecordId()); |
536 | - recordLog.setUploadTime(new Date()); | |
536 | + if (Objects.isNull(dto.getId())) { | |
537 | + recordLog.setUploadTime(new Date()); | |
538 | + } | |
537 | 539 | followRecordLogService.saveOrUpdate(recordLog); |
538 | 540 | feedbackTask(record.getTaskId(), dto.getFeedbackTypeEnum()); |
539 | 541 | } | ... | ... |
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/ACFollowStrategy.java
... | ... | @@ -126,12 +126,15 @@ public class ACFollowStrategy extends AbstractFollowStrategy { |
126 | 126 | } |
127 | 127 | BV.isTrue(record.getUserId().equals(userId), () -> "无法跟进非本人待办任务"); |
128 | 128 | FollowRecordLog recordLog = new FollowRecordLog(); |
129 | + recordLog.setId(dto.getId()); | |
129 | 130 | recordLog.setAttachments(dto.getAttachments()); |
130 | 131 | recordLog.setAttType(dto.getAttTypeEnum()); |
131 | 132 | recordLog.setFeedbackType(dto.getFeedbackTypeEnum()); |
132 | 133 | recordLog.setDescribes(dto.getDescribes()); |
133 | 134 | recordLog.setRecordId(dto.getRecordId()); |
134 | - recordLog.setUploadTime(new Date()); | |
135 | + if (Objects.isNull(dto.getId())) { | |
136 | + recordLog.setUploadTime(new Date()); | |
137 | + } | |
135 | 138 | followRecordLogService.save(recordLog); |
136 | 139 | feedbackTask(record.getTaskId(), dto.getFeedbackTypeEnum()); |
137 | 140 | ... | ... |