Merge remote-tracking branch 'origin/demo_' into demo_

platform-service/src/main/java/com/platform/service/repair/strategy/AbstractRepairBaseStrategy.java

@@ -156,6 +156,9 @@ public abstract class AbstractRepairBaseStrategy implements RepairBaseStrategy{
         applicationForm.setNeedStop(dto.getNeedStop());
         applicationForm.setUpdateTime(LocalDateTime.now());
         applicationForm.setOutType(dto.getOutType());
+        if(StringUtils.isBlank(applicationForm.getDispatchUserId())){
+            applicationForm.setDispatchUserId(dto.getDispatchUserId());
+        }
         // 保存维修图片
         repairApplicationFormMapper.updateByPrimaryKeySelective(applicationForm);
         // 更新设备状态为使用中

platform-service/src/main/java/com/platform/service/repair/strategy/impl/LongYanRepairStrategy.java

@@ -193,6 +193,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
                 form.setRepairUserName(userInfo.getUsername());
                 form.setRepairUserId(userInfo.getUserId());
                 form.setStatus(RepairApplicationFormStatusEnum.PROCESSING.getValue());
+                form.setRepairStartTime(LocalDateTime.now()); // 接单后就开始维修
                 continueFlag = Boolean.TRUE;
                 model.setRepairUserName(form.getRepairUserName());
                 model.setRepairUserId(form.getRepairUserId());