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

张志伟
2 parents 0d00fc4f 33caa3a1
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
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/StammkundeBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AccidentPoolBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/PoolBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/ACFollowStrategy.java
@@ -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;
+
+
+
@@ -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,
@@ -31,6 +31,10 @@ public class AccidentPool extends BaseAuditableTimeEntity&lt;AccidentPool, Long&gt; {
    */
   private String plateNo;
   /**
+   * 车架号
+   */
+  private String frameNo;
+  /**
    * 品牌id
    */
   private Long brandId;
@@ -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;
 }
@@ -120,7 +120,7 @@ public class StammkundeBizService {
         if (StringUtils.isNotBlank(times[0]) && NumberUtils.isDigits(times[0])) {
             LocalDateTime localDateTime = Instant.ofEpochMilli(NumberUtils.toLong(times[0])).atZone(ZoneId.systemDefault()).toLocalDateTime();
-            queryVO.setStartTime(DateUtil.getEndInTime(DateUtil.localDateTime2Date(localDateTime)));
+            queryVO.setStartTime(DateUtil.getBeginInTime(DateUtil.localDateTime2Date(localDateTime)));
         }
         if (times.length >= 2) {
             if (StringUtils.isNotBlank(times[1]) && NumberUtils.isDigits(times[1])) {
@@ -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());
@@ -278,9 +278,6 @@ public class PoolBizService {
         if (Objects.nonNull(user)) {
             queryVO.setUserId(user.getUserId());
             queryVO.setGroupId(user.getGroupId());
-        } else {
-            boolean bool = CollectionUtils.isEmpty(queryVO.getShopIds()) && Objects.isNull(queryVO.getUserId()) && StringUtils.isEmpty(queryVO.getUserName());
-            BV.isFalse(bool, () -> "请选择服务站或者人员");
         }
         if (Objects.nonNull(queryVO.getOrder()) && StringUtils.isValid(queryVO.getOrderAtt())) {
             StringBuilder sb = new StringBuilder(" order by ");
@@ -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());
     }
@@ -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());