Merge branch 'develop' of gitadmin/tuoheng_telecomumale into release

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/WorkOrderServiceImpl.java

@@ -69,6 +69,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     @Autowired
     private ChannelMapper channelMapper;
 
+    @Autowired
+    private LegMapper legMapper;
+
     @Override
     public JsonResult addInfo(WorkOrderDto dto) {
         //登录用户信息
@@ -708,12 +711,20 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 //任务执行开始时间取任务执行时间
                 vo.setExecutionStartTime(inspection.getInspectionTime());
                 Channel channel = channelMapper.selectById(inspection.getChannelId());
-                if (null != channel) {
+                if (ObjectUtil.isNotNull(channel)) {
                     if (StringUtils.isEmpty(channel.getCode())) {
                         throw new ServiceException(ServiceExceptionEnum.PARAMETER_IS_NULL);
                     }
                     vo.setCode(channel.getCode());
                 }
+                //航段名称
+                Leg leg = legMapper.selectById(inspection.getLegId());
+                if(ObjectUtil.isNotNull(leg)){
+                    if(StringUtils.isNotEmpty(leg.getLegRange())){
+                        vo.setLegRange(leg.getLegRange());
+                    }
+                }
+
             }
             //问题类型
             if (StringUtils.isEmpty(s.getQuestionId())) {

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/vo/WorkOrderHandleVo.java

@@ -63,6 +63,11 @@ public class WorkOrderHandleVo {
      */
     private String code;
 
+    /**
+     * 片区名称
+     */
+    private String legRange;
+
     /**
      * 任务时间(巡检执行时间)
      */