From a98480b0c8f2b0dc99bf6e00ae92f8bd3f7479ea Mon Sep 17 00:00:00 2001 From: Kurisu Date: Tue, 2 Feb 2021 16:52:00 +0800 Subject: [PATCH] :bug: 提测的bug修复 --- doc/v1.1.2/update.sql | 5 +++++ fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml | 2 +- fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/customer/AccidentPool.java | 4 ++++ fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/AccidentPoolDTO.java | 6 +++++- fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AccidentPoolBizService.java | 1 + fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java | 4 +++- fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/ACFollowStrategy.java | 5 ++++- 7 files changed, 23 insertions(+), 4 deletions(-) diff --git a/doc/v1.1.2/update.sql b/doc/v1.1.2/update.sql index d133eb8..98adbac 100644 --- a/doc/v1.1.2/update.sql +++ b/doc/v1.1.2/update.sql @@ -59,6 +59,11 @@ set t1.arrival_count = (select count(t2.arrival_time) where t1.arrival_count is null; +alter table accident_pool + add frame_no varchar(64) null comment '车架号' after plate_no; + + + diff --git a/fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml b/fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml index 385df79..835991a 100644 --- a/fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml +++ b/fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml @@ -8,7 +8,7 @@ > SELECT t1.id, if(t1.type=3 , t4.plate_no, t3.plate_no)plate_no, - t3.frame_no frame_no, + if(t1.type=3 , t4.frame_no, t3.frame_no)frame_no, t2.expires loan_expires, t1.type type, t1.follow_user user_id, diff --git a/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/customer/AccidentPool.java b/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/customer/AccidentPool.java index 649a581..caab676 100644 --- a/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/customer/AccidentPool.java +++ b/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/customer/AccidentPool.java @@ -31,6 +31,10 @@ public class AccidentPool extends BaseAuditableTimeEntity { */ private String plateNo; /** + * 车架号 + */ + private String frameNo; + /** * 品牌id */ private Long brandId; diff --git a/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/AccidentPoolDTO.java b/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/AccidentPoolDTO.java index 7da6db3..2c46151 100644 --- a/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/AccidentPoolDTO.java +++ b/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/AccidentPoolDTO.java @@ -23,6 +23,10 @@ public class AccidentPoolDTO { */ private String mobile; /** + * 车架号 + */ + private String frameNo; + /** * 报案手机号 */ private String reportMobile; @@ -70,5 +74,5 @@ public class AccidentPoolDTO { /** * 报案地点 */ - private String address; + private String reportAddress; } diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AccidentPoolBizService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AccidentPoolBizService.java index 050b1a1..5629205 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AccidentPoolBizService.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AccidentPoolBizService.java @@ -116,6 +116,7 @@ public class AccidentPoolBizService { private AccidentPool conversion2db(AccidentPoolDTO dto, LoginAuthBean currentUser) { AccidentPool pool = new AccidentPool(); BeanUtils.copyProperties(dto, pool); + pool.setAddress(dto.getReportAddress()); pool.setCreateTime(new Date()); pool.setUpdateTime(new Date()); pool.setGroupId(currentUser.getGroupId()); diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java index 5404a96..c18f79b 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java +++ b/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 { recordLog.setAttType(dto.getAttTypeEnum()); recordLog.setDescribes(dto.getDescribes()); recordLog.setRecordId(dto.getRecordId()); - recordLog.setUploadTime(new Date()); + if (Objects.isNull(dto.getId())) { + recordLog.setUploadTime(new Date()); + } followRecordLogService.saveOrUpdate(recordLog); feedbackTask(record.getTaskId(), dto.getFeedbackTypeEnum()); } diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/ACFollowStrategy.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/ACFollowStrategy.java index 4370a6a..5a82bad 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/ACFollowStrategy.java +++ b/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 { } BV.isTrue(record.getUserId().equals(userId), () -> "无法跟进非本人待办任务"); FollowRecordLog recordLog = new FollowRecordLog(); + recordLog.setId(dto.getId()); recordLog.setAttachments(dto.getAttachments()); recordLog.setAttType(dto.getAttTypeEnum()); recordLog.setFeedbackType(dto.getFeedbackTypeEnum()); recordLog.setDescribes(dto.getDescribes()); recordLog.setRecordId(dto.getRecordId()); - recordLog.setUploadTime(new Date()); + if (Objects.isNull(dto.getId())) { + recordLog.setUploadTime(new Date()); + } followRecordLogService.save(recordLog); feedbackTask(record.getTaskId(), dto.getFeedbackTypeEnum()); -- libgit2 0.22.2