Commit a98480b0c8f2b0dc99bf6e00ae92f8bd3f7479ea
1 parent
e3648560
提测的bug修复
Showing
7 changed files
with
23 additions
and
4 deletions
doc/v1.1.2/update.sql
| @@ -59,6 +59,11 @@ set t1.arrival_count = (select count(t2.arrival_time) | @@ -59,6 +59,11 @@ set t1.arrival_count = (select count(t2.arrival_time) | ||
| 59 | where t1.arrival_count is null; | 59 | where t1.arrival_count is null; |
| 60 | 60 | ||
| 61 | 61 | ||
| 62 | +alter table accident_pool | ||
| 63 | + add frame_no varchar(64) null comment '车架号' after plate_no; | ||
| 64 | + | ||
| 65 | + | ||
| 66 | + | ||
| 62 | 67 | ||
| 63 | 68 | ||
| 64 | 69 |
fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | > | 8 | > |
| 9 | SELECT t1.id, | 9 | SELECT t1.id, |
| 10 | if(t1.type=3 , t4.plate_no, t3.plate_no)plate_no, | 10 | if(t1.type=3 , t4.plate_no, t3.plate_no)plate_no, |
| 11 | - t3.frame_no frame_no, | 11 | + if(t1.type=3 , t4.frame_no, t3.frame_no)frame_no, |
| 12 | t2.expires loan_expires, | 12 | t2.expires loan_expires, |
| 13 | t1.type type, | 13 | t1.type type, |
| 14 | t1.follow_user user_id, | 14 | t1.follow_user user_id, |
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/customer/AccidentPool.java
| @@ -31,6 +31,10 @@ public class AccidentPool extends BaseAuditableTimeEntity<AccidentPool, Long> { | @@ -31,6 +31,10 @@ public class AccidentPool extends BaseAuditableTimeEntity<AccidentPool, Long> { | ||
| 31 | */ | 31 | */ |
| 32 | private String plateNo; | 32 | private String plateNo; |
| 33 | /** | 33 | /** |
| 34 | + * 车架号 | ||
| 35 | + */ | ||
| 36 | + private String frameNo; | ||
| 37 | + /** | ||
| 34 | * 品牌id | 38 | * 品牌id |
| 35 | */ | 39 | */ |
| 36 | private Long brandId; | 40 | private Long brandId; |
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/AccidentPoolDTO.java
| @@ -23,6 +23,10 @@ public class AccidentPoolDTO { | @@ -23,6 +23,10 @@ public class AccidentPoolDTO { | ||
| 23 | */ | 23 | */ |
| 24 | private String mobile; | 24 | private String mobile; |
| 25 | /** | 25 | /** |
| 26 | + * 车架号 | ||
| 27 | + */ | ||
| 28 | + private String frameNo; | ||
| 29 | + /** | ||
| 26 | * 报案手机号 | 30 | * 报案手机号 |
| 27 | */ | 31 | */ |
| 28 | private String reportMobile; | 32 | private String reportMobile; |
| @@ -70,5 +74,5 @@ public class AccidentPoolDTO { | @@ -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/cust/AccidentPoolBizService.java
| @@ -116,6 +116,7 @@ public class AccidentPoolBizService { | @@ -116,6 +116,7 @@ public class AccidentPoolBizService { | ||
| 116 | private AccidentPool conversion2db(AccidentPoolDTO dto, LoginAuthBean currentUser) { | 116 | private AccidentPool conversion2db(AccidentPoolDTO dto, LoginAuthBean currentUser) { |
| 117 | AccidentPool pool = new AccidentPool(); | 117 | AccidentPool pool = new AccidentPool(); |
| 118 | BeanUtils.copyProperties(dto, pool); | 118 | BeanUtils.copyProperties(dto, pool); |
| 119 | + pool.setAddress(dto.getReportAddress()); | ||
| 119 | pool.setCreateTime(new Date()); | 120 | pool.setCreateTime(new Date()); |
| 120 | pool.setUpdateTime(new Date()); | 121 | pool.setUpdateTime(new Date()); |
| 121 | pool.setGroupId(currentUser.getGroupId()); | 122 | pool.setGroupId(currentUser.getGroupId()); |
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,7 +533,9 @@ public abstract class AbstractFollowStrategy implements FollowStrategy { | ||
| 533 | recordLog.setAttType(dto.getAttTypeEnum()); | 533 | recordLog.setAttType(dto.getAttTypeEnum()); |
| 534 | recordLog.setDescribes(dto.getDescribes()); | 534 | recordLog.setDescribes(dto.getDescribes()); |
| 535 | recordLog.setRecordId(dto.getRecordId()); | 535 | recordLog.setRecordId(dto.getRecordId()); |
| 536 | - recordLog.setUploadTime(new Date()); | 536 | + if (Objects.isNull(dto.getId())) { |
| 537 | + recordLog.setUploadTime(new Date()); | ||
| 538 | + } | ||
| 537 | followRecordLogService.saveOrUpdate(recordLog); | 539 | followRecordLogService.saveOrUpdate(recordLog); |
| 538 | feedbackTask(record.getTaskId(), dto.getFeedbackTypeEnum()); | 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,12 +126,15 @@ public class ACFollowStrategy extends AbstractFollowStrategy { | ||
| 126 | } | 126 | } |
| 127 | BV.isTrue(record.getUserId().equals(userId), () -> "无法跟进非本人待办任务"); | 127 | BV.isTrue(record.getUserId().equals(userId), () -> "无法跟进非本人待办任务"); |
| 128 | FollowRecordLog recordLog = new FollowRecordLog(); | 128 | FollowRecordLog recordLog = new FollowRecordLog(); |
| 129 | + recordLog.setId(dto.getId()); | ||
| 129 | recordLog.setAttachments(dto.getAttachments()); | 130 | recordLog.setAttachments(dto.getAttachments()); |
| 130 | recordLog.setAttType(dto.getAttTypeEnum()); | 131 | recordLog.setAttType(dto.getAttTypeEnum()); |
| 131 | recordLog.setFeedbackType(dto.getFeedbackTypeEnum()); | 132 | recordLog.setFeedbackType(dto.getFeedbackTypeEnum()); |
| 132 | recordLog.setDescribes(dto.getDescribes()); | 133 | recordLog.setDescribes(dto.getDescribes()); |
| 133 | recordLog.setRecordId(dto.getRecordId()); | 134 | recordLog.setRecordId(dto.getRecordId()); |
| 134 | - recordLog.setUploadTime(new Date()); | 135 | + if (Objects.isNull(dto.getId())) { |
| 136 | + recordLog.setUploadTime(new Date()); | ||
| 137 | + } | ||
| 135 | followRecordLogService.save(recordLog); | 138 | followRecordLogService.save(recordLog); |
| 136 | feedbackTask(record.getTaskId(), dto.getFeedbackTypeEnum()); | 139 | feedbackTask(record.getTaskId(), dto.getFeedbackTypeEnum()); |
| 137 | 140 |