工单问题修改

颜惠青
1 parent 680ff92d
Showing 13 changed files with 143 additions and 28 deletions
urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/MainInfoRespVO.java
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/permission/RoleApi.java
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/permission/RoleApiImpl.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoPageReqVO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/BuzStatusUpdateAspect.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/garden/AppGardenTaskConvert.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/maininfo/MainInfoConvert.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoDO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoExtDO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoMapper.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/enums/ErrorCodeConstants.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
@@ -142,8 +142,8 @@ public class MainInfoRespVO {
     @Schema(description = "共同处理人")
     private Set<Long> coHandlers;
-    @Schema(description = "共同处理人名称，多个逗号拼接")
-    private String coHandlersName;
+    @Schema(description = "共同处理人名称，多个为数组")
+    private List<String> coHandlersName;
     @Schema(description = "提交人电话")
     private String userMobile;
@@ -45,6 +45,13 @@ public interface RoleApi {
      */
     List<Long> getRoleIdsByUserId(Long userId);
+    /**
+     * 根据用户id获取角色信息
+     * @param userId
+     * @return
+     */
+    List<RoleRespVO> getRoleListByUsrId(Long userId);
+
     /**
      * 通过角色类型，获得用户编号列表
 package com.zteits.urbanops.module.system.api.permission;
+import com.zteits.urbanops.framework.common.util.object.BeanUtils;
 import com.zteits.urbanops.module.system.controller.admin.permission.vo.role.RoleRespVO;
 import com.zteits.urbanops.module.system.dal.dataobject.permission.RoleDO;
 import com.zteits.urbanops.module.system.service.permission.RoleService;
@@ -41,6 +42,13 @@ public class RoleApiImpl implements RoleApi {
     }
     @Override
+    public List<RoleRespVO> getRoleListByUsrId(Long userId) {
+        List<Long> roleIds = roleService.getRoleIdsByUserId(userId);
+        List<RoleDO>  roleDOList = roleService.getRoleList(roleIds);
+        return BeanUtils.toBean(roleDOList, RoleRespVO.class);
+    }
+
+    @Override
     public List<Long> getUserIdsByRoleCode(String roleCode) {
         return roleService.getUserIdsByRoleCode(roleCode);
     }
@@ -121,4 +121,7 @@ public class MainInfoPageReqVO extends PageParam {
     @Schema(description = "实施人员部门id", example = "12")
     private Long workerCompanyId;
+    @Schema(description = "工单来源编码")
+    private String woSourceId;
+
 }
 \ No newline at end of file
@@ -22,6 +22,7 @@ import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -64,6 +65,7 @@ public class BuzStatusUpdateAspect {
     public void buzStatusUpdatePointcut() {}
     @Around("buzStatusUpdatePointcut()")
+    @Transactional(rollbackFor = Exception.class)
     public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
         // 1. 获取方法参数（AppUniversalApprovalReqVO）
         Object[] args = joinPoint.getArgs();
@@ -11,6 +11,7 @@ import com.zteits.urbanops.module.bpm.controller.admin.task.vo.task.BpmTaskRespV
 import com.zteits.urbanops.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
 import com.zteits.urbanops.module.bpm.framework.flowable.core.util.FlowableUtils;
 import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO;
+import com.zteits.urbanops.module.system.api.user.AdminUserApi;
 import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO;
 import com.zteits.urbanops.module.workorder.api.constant.BpmCommonConstant;
 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskRespVO;
@@ -25,10 +26,7 @@ import org.flowable.task.api.history.HistoricTaskInstance;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 import static com.zteits.urbanops.framework.common.util.collection.MapUtils.findAndThen;
@@ -97,18 +95,18 @@ public interface AppGardenTaskConvert {
         return new PageResult<>(taskVOList, pageResult.getTotal());
     }
-    default PageResult<AppGardenWorkOrderRespVO> buildBuziTaskPage(PageResult<MainInfoExtDO> pageResult, AttachmentMapper attachmentMapper){
+    default PageResult<AppGardenWorkOrderRespVO> buildBuziTaskPage(PageResult<MainInfoExtDO> pageResult, AttachmentMapper attachmentMapper, AdminUserApi adminUserApi){
         // 1. 源分页对象为空，返回空分页
         if (pageResult == null) {
             return PageResult.empty();
         }
         // 2. 转换列表数据，保留分页参数（总数、页码、页大小等）
-        List<AppGardenWorkOrderRespVO> targetList = convertList(pageResult.getList(), attachmentMapper);
+        List<AppGardenWorkOrderRespVO> targetList = convertList(pageResult.getList(), attachmentMapper,adminUserApi);
         return new PageResult<>(targetList, pageResult.getTotal());
     }
-    default List<AppGardenWorkOrderRespVO> convertList(List<MainInfoExtDO> sourceList, AttachmentMapper attachmentMapper) {
+    default List<AppGardenWorkOrderRespVO> convertList(List<MainInfoExtDO> sourceList, AttachmentMapper attachmentMapper, AdminUserApi adminUserApi) {
         // 1. 源列表为空，返回空列表（避免NPE）
         if (sourceList == null || sourceList.isEmpty()) {
             return Collections.emptyList();
@@ -116,17 +114,19 @@ public interface AppGardenTaskConvert {
         // 2. 遍历源列表，调用单对象转换方法
         return sourceList.stream()
-                .map(source -> convert(source, attachmentMapper))
+                .map(source -> convert(source, attachmentMapper,adminUserApi))
                 .collect(Collectors.toList());
     }
     /**
      * MainInfoExtDO → AppGardenWorkOrderRespVO
-     * @param source 源对象
+     *
+     * @param source           源对象
      * @param attachmentMapper 附件Mapper，用于查询图片列表
+     * @param adminUserApi
      * @return 目标对象
      */
-    default AppGardenWorkOrderRespVO convert(MainInfoExtDO source, AttachmentMapper attachmentMapper) {
+    default AppGardenWorkOrderRespVO convert(MainInfoExtDO source, AttachmentMapper attachmentMapper, AdminUserApi adminUserApi) {
         // 1. 源对象为空，直接返回null
         if (source == null) {
             return null;
@@ -134,6 +134,20 @@ public interface AppGardenTaskConvert {
         AppGardenWorkOrderRespVO target = new AppGardenWorkOrderRespVO();
         org.springframework.beans.BeanUtils.copyProperties(source, target);
+        Set<Long> userIds = target.getCoHandlers();
+        if (userIds != null && !userIds.isEmpty()) {
+            Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
+            List<String> coHandlersNameList = Optional.ofNullable(target.getCoHandlers())
+                    .orElse(Set.of())
+                    .stream()
+                    .filter(Objects::nonNull)
+                    .map(userMap::get)
+                    .filter(Objects::nonNull)
+                    .map(AdminUserRespDTO::getNickname)
+                    .filter(nickname -> nickname != null && !nickname.isEmpty())
+                    .collect(Collectors.toList());
+            target.setCoHandlersName(coHandlersNameList);
+        }
         // 3. 手动赋值扩展字段：查询问题图片列表和完成图片列表
         List<String> problemImgsList = queryAttachment(
@@ -10,10 +10,7 @@ import com.zteits.urbanops.module.workorder.dto.MainInfoRespVO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 /**
@@ -64,14 +61,18 @@ public interface MainInfoConvert {
             }
             mainInfoVo.setCompanyName(deptName);
             if (mainInfoVo.getCoHandlers() != null && !mainInfoVo.getCoHandlers().isEmpty()) {
-                String coHandlersName = mainInfoVo.getCoHandlers() == null ? "" : mainInfoVo.getCoHandlers().stream()
-                        .filter(userId -> userId != null)
+                List<String> coHandlersNameList = Optional.ofNullable(mainInfoVo.getCoHandlers())
+                        .orElse(Set.of())
+                        .stream()
+                        .filter(Objects::nonNull)
                         .map(userMap::get)
                         .filter(Objects::nonNull)
                         .map(AdminUserRespDTO::getNickname)
                         .filter(nickname -> nickname != null && !nickname.isEmpty())
-                        .collect(Collectors.joining(","));
-                mainInfoVo.setCoHandlersName(coHandlersName);
+                        .collect(Collectors.toList());
+                mainInfoVo.setCoHandlersName(coHandlersNameList);
+            }else{
+                mainInfoVo.setCoHandlersName(new ArrayList<>());
             }
             mainInfoVo.setUserMobile(userMap.get(mainInfoVo.getUserId()).getMobile());
         }
@@ -171,6 +171,18 @@ public class MainInfoDO extends BaseDO {
      * 实施人员部门id
      */
     private Long workerCompanyId;
+    /**
+     * 工单来源编码
+     */
+    private String woSourceId;
+    /**
+     * 工单来源名称
+     */
+    private String woSourceName;
+    /**
+     * 特殊部门id，工单默认是登录人部门，实施后为实施人的部门id
+     */
+    private Long deptId;
 package com.zteits.urbanops.module.workorder.dal.dataobject.maininfo;
 import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Set;
 /**
  * 类描述：工单扩展信息，支持工作流任务信息 DO
@@ -174,5 +177,35 @@ public class MainInfoExtDO extends BaseDO {
      */
     private String key_;
+    /**
+     * 共同处理人
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private Set<Long> coHandlers;
+    /**
+     * 实施人员ID
+     */
+    private Long workerId;
+    /**
+     * 实施人员名称
+     */
+    private String workerName;
+    /**
+     * 实施人员部门id
+     */
+    private Long workerCompanyId;
+    /**
+     * 工单来源编码
+     */
+    private String woSourceId;
+    /**
+     * 工单来源名称
+     */
+    private String woSourceName;
+    /**
+     * 特殊部门id，工单默认是登录人部门，实施后为实施人的部门id
+     */
+    private Long deptId;
+
 }
 \ No newline at end of file
@@ -2,6 +2,7 @@ package com.zteits.urbanops.module.workorder.dal.mysql.maininfo;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
@@ -129,6 +130,8 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
             @Result(column = "process_instance_id", property = "processInstanceId"),
             @Result(column = "remark", property = "remark"),
             @Result(column = "handle_result", property = "handleResult"),
+            @Result(column = "co_handlers", property = "coHandlers", typeHandler = JacksonTypeHandler.class),
+
             @Result(column = "creator", property = "creator"),
             @Result(column = "create_time", property = "createTime"),
             @Result(column = "updater", property = "updater"),
@@ -240,6 +243,8 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
             @Result(column = "process_instance_id", property = "processInstanceId"),
             @Result(column = "remark", property = "remark"),
             @Result(column = "handle_result", property = "handleResult"),
+            @Result(column = "co_handlers", property = "coHandlers", typeHandler = JacksonTypeHandler.class),
+
             @Result(column = "creator", property = "creator"),
             @Result(column = "create_time", property = "createTime"),
             @Result(column = "updater", property = "updater"),
@@ -345,6 +350,8 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
             @Result(column = "process_instance_id", property = "processInstanceId"),
             @Result(column = "remark", property = "remark"),
             @Result(column = "handle_result", property = "handleResult"),
+            @Result(column = "co_handlers", property = "coHandlers", typeHandler = JacksonTypeHandler.class),
+
             @Result(column = "creator", property = "creator"),
             @Result(column = "create_time", property = "createTime"),
             @Result(column = "updater", property = "updater"),
@@ -461,6 +468,7 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
             @Result(column = "process_instance_id", property = "processInstanceId"),
             @Result(column = "remark", property = "remark"),
             @Result(column = "handle_result", property = "handleResult"),
+            @Result(column = "co_handlers", property = "coHandlers", typeHandler = JacksonTypeHandler.class),
             @Result(column = "creator", property = "creator"),
             @Result(column = "create_time", property = "createTime"),
             @Result(column = "updater", property = "updater"),
@@ -568,6 +576,7 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
             @Result(column = "process_instance_id", property = "processInstanceId"),
             @Result(column = "remark", property = "remark"),
             @Result(column = "handle_result", property = "handleResult"),
+            @Result(column = "co_handlers", property = "coHandlers", typeHandler = JacksonTypeHandler.class),
             @Result(column = "creator", property = "creator"),
             @Result(column = "create_time", property = "createTime"),
             @Result(column = "updater", property = "updater"),
@@ -89,6 +89,7 @@ public interface MainInfoMapper extends BaseMapperX&lt;MainInfoDO&gt; {
                 .eqIfPresent(MainInfoDO::getWorkerCompanyId, reqVO.getWorkerName())
                 .eqIfPresent(MainInfoDO::getWorkerId, reqVO.getOrderType())
                 .likeIfPresent(MainInfoDO::getWorkerName, reqVO.getWorkerName())
+                .eqIfPresent(MainInfoDO::getWoSourceId, reqVO.getWoSourceId())
                 .eqIfPresent(MainInfoDO::getSourceId, reqVO.getSourceId())
                 .likeIfPresent(MainInfoDO::getSourceName, reqVO.getSourceName())
@@ -27,5 +27,7 @@ public interface ErrorCodeConstants {
     ErrorCode  APP_WORKER_ID_NOT_EMPTY = new ErrorCode(1-900-001-007, "WorkerDataId不能为空！");
-    ErrorCode  APP_WORKER_LEVEL_ID_NOT_EXISTS = new ErrorCode(1-900-001-007, "养护级别编码错误，不存在！");
+    ErrorCode  APP_WORKER_LEVEL_ID_NOT_EXISTS = new ErrorCode(1-900-002-000, "养护级别编码错误，不存在！");
+
+    ErrorCode  APP_USER_ROLE_NOT_EXISTS= new ErrorCode(1-900-002-001, "该人员未分配角色 ！");
 }
@@ -22,8 +22,10 @@ import com.zteits.urbanops.module.bpm.service.task.BpmProcessInstanceService;
 import com.zteits.urbanops.module.bpm.service.task.BpmTaskService;
 import com.zteits.urbanops.module.garden.api.road.RoadApi;
 import com.zteits.urbanops.module.garden.dto.road.RoadStreetRespDTO;
+import com.zteits.urbanops.module.system.api.permission.RoleApi;
 import com.zteits.urbanops.module.system.api.user.AdminUserApi;
 import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO;
+import com.zteits.urbanops.module.system.controller.admin.permission.vo.role.RoleRespVO;
 import com.zteits.urbanops.module.workorder.api.WorkOrderApi;
 import com.zteits.urbanops.module.workorder.api.constant.BpmCommonConstant;
 import com.zteits.urbanops.module.workorder.controller.admin.garden.vo.BpmGardenWorkOrderPageReqVO;
@@ -107,6 +109,9 @@ public class BpmGardenServiceImpl implements BpmGardenService{
     private AdminUserApi adminUserApi;
     @Resource
+    private RoleApi roleApi;
+
+    @Resource
     private BpmProcessInstanceService processInstanceService;
     @Resource
@@ -141,6 +146,15 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         workOrder.setCuringLevelId(Integer.valueOf(dictData.getValue()));
         workOrder.setCuringLevelName(dictData.getLabel());
         workOrder.setCompanyId(SecurityFrameworkUtils.getCompanyId());
+
+        workOrder.setDeptId(SecurityFrameworkUtils.getDeptId());
+        List<RoleRespVO> roleList = roleApi.getRoleListByUsrId(SecurityFrameworkUtils.getLoginUserId());
+        if(null == roleList || roleList.size()==0){
+            throw exception(APP_USER_ROLE_NOT_EXISTS);
+        }
+        workOrder.setWoSourceId(roleList.get(0).getCode());
+        workOrder.setWoSourceName(roleList.get(0).getName());
+
         if(StringUtil.isNotEmpty(createRequestVo.getBusiLine())){
             workOrder.setBusiLine(createRequestVo.getBusiLine());
         }else {
@@ -347,7 +361,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         PageResult<MainInfoExtDO> pageResult = workOrderExtMapper.selectWorkOrderTodoPage(pageParam,pageReqVO);
         List<MainInfoExtDO> list = pageResult.getList();
         if(null != list && list.size()>0){
-            return AppGardenTaskConvert.INSTANCE.convert(list.get(0),attachmentMapper);
+            return AppGardenTaskConvert.INSTANCE.convert(list.get(0),attachmentMapper, adminUserApi);
         }
         return null;
     }
@@ -361,7 +375,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         PageResult<MainInfoExtDO> pageResult = workOrderExtMapper.selectWorkOrderDonePage(pageParam,pageReqVO);
         List<MainInfoExtDO> list = pageResult.getList();
         if(null != list && list.size()>0){
-            return AppGardenTaskConvert.INSTANCE.convert(list.get(0),attachmentMapper);
+            return AppGardenTaskConvert.INSTANCE.convert(list.get(0),attachmentMapper, adminUserApi);
         }
         return null;
     }
@@ -375,7 +389,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         PageResult<MainInfoExtDO> pageResult = workOrderExtMapper.selectWorkOrderMyPage(pageParam,pageReqVO);
         List<MainInfoExtDO> list = pageResult.getList();
         if(null != list && list.size()>0){
-            return AppGardenTaskConvert.INSTANCE.convert(list.get(0),attachmentMapper);
+            return AppGardenTaskConvert.INSTANCE.convert(list.get(0),attachmentMapper, adminUserApi);
         }
         return null;
     }
@@ -412,7 +426,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         //taskBuzReqVO.setKey(BpmCommonConstant.BPM_GARDEN_INSPECT_WO);
         //selectWorkOrderUniqueMyPage 个性化 去重 按工单唯一处理
         PageResult<MainInfoExtDO> pageResult = workOrderExtMapper.selectWorkOrderUniqueMyPage(pageVO,taskBuzReqVO);
-        return AppGardenTaskConvert.INSTANCE.buildBuziTaskPage(pageResult,attachmentMapper);
+        return AppGardenTaskConvert.INSTANCE.buildBuziTaskPage(pageResult,attachmentMapper, adminUserApi);
     }
     @Override
     public PageResult<AppGardenWorkOrderRespVO> getTaskDoneBuzSimplePage(AppGardenWorkOrderPageReqVO pageVO) {
@@ -446,7 +460,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         //taskBuzReqVO.setKey(BpmCommonConstant.BPM_GARDEN_INSPECT_WO);
         //已办改为获取最新一条数据
         PageResult<MainInfoExtDO> pageResult = workOrderExtMapper.selectWorkOrderDoneUniquePage(pageVO,taskBuzReqVO);
-        return AppGardenTaskConvert.INSTANCE.buildBuziTaskPage(pageResult,attachmentMapper);
+        return AppGardenTaskConvert.INSTANCE.buildBuziTaskPage(pageResult,attachmentMapper, adminUserApi);
     }
     @Override
@@ -480,8 +494,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         //TODO 先写死
         //taskBuzReqVO.setKey(BpmCommonConstant.BPM_GARDEN_INSPECT_WO);
         PageResult<MainInfoExtDO> pageResult = workOrderExtMapper.selectWorkOrderTodoPage(pageVO,taskBuzReqVO);
-
-        return AppGardenTaskConvert.INSTANCE.buildBuziTaskPage(pageResult,attachmentMapper);
+        return AppGardenTaskConvert.INSTANCE.buildBuziTaskPage(pageResult,attachmentMapper,adminUserApi);
     }
@@ -549,6 +562,15 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         workOrder.setCuringLevelName(dictData.getLabel());
         workOrder.setCommitDate(LocalDateTime.now());
         workOrder.setCompanyId(SecurityFrameworkUtils.getCompanyId());
+
+        workOrder.setDeptId(SecurityFrameworkUtils.getDeptId());
+        List<RoleRespVO> roleList = roleApi.getRoleListByUsrId(SecurityFrameworkUtils.getLoginUserId());
+        if(null == roleList || roleList.size()==0){
+            throw exception(APP_USER_ROLE_NOT_EXISTS);
+        }
+        workOrder.setWoSourceId(roleList.get(0).getCode());
+        workOrder.setWoSourceName(roleList.get(0).getName());
+
         if(StringUtil.isNotEmpty(createRequestVo.getBusiLine())){
             workOrder.setBusiLine(createRequestVo.getBusiLine());
         }else {
@@ -568,6 +590,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         Map<String, Object> processInstanceVariables = new HashMap<>();
         processInstanceVariables.put(BPM_COMMON_PROD_ROADID, workOrder.getRoadId());
         processInstanceVariables.put(BPM_COMMON_PROD_APPLYUSERID, userId);
+        processInstanceVariables.put(BPM_COMMON_PROD_ISNEED,null);
         Map<String, List<Long>> startUserSelectAssignees = new HashMap<>();
         List<AdminUserRespDTO> userList = workOrderExtMapper.getUserByRoadIdAndRoleCode(workOrder.getRoadId(),BpmCommonConstant.TEAM_LEADER_YL,createRequestVo.getBusiLine());
         if(org.springframework.util.ObjectUtils.isEmpty(userList)){