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

wangqian
2 parents 58051e0b ae252461
Showing 16 changed files with 477 additions and 83 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/util/timeinterval/TimeIntervalFrequencyUtil.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/constant/BpmCommonConstant.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/workorder/WorkOrderApi.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/workorder/WorkOrderApiImpl.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/garden/BpmGardenInspectController.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderController.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/AppGardenWorkOrderReqVO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/common/UserInfoPageReqVO.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/enums/ErrorCodeConstants.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenService.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/listener/AutoCompleteTaskListener.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/listener/BpmProcessTaskAutoCompleteListener.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/listener/BpmQuickProcessTaskAutoCompleteListener.java
@@ -110,7 +110,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
             calculate.add(periodResult);
             planNum = Integer.parseInt(createReqVO.getRateValue());
         }else{
-            calculate=  TimeIntervalFrequencyUtil.calculate(createReqVO.getBeginTime().toString(), createReqVO.getEndTime().toString(), rateValue, createReqVO.getCycleId());
+            calculate=  TimeIntervalFrequencyUtil.calculateNew(createReqVO.getBeginTime().toString(), createReqVO.getEndTime().toString(), rateValue, createReqVO.getCycleId());
             if (CollectionUtils.isEmpty(calculate)) {
                 log.warn("获取两个时间之间间隔天数错误");
                 return CommonResult.error(INSPECTION_CYCLE_ERROR);
@@ -87,7 +87,7 @@ public class TimeIntervalFrequencyUtil {
             long daysInSegment = ChronoUnit.DAYS.between(segmentStart, segmentEnd) + 1;
             // 计算当前时间段的执行次数：(实际天数/周期天数) * 每周期次数，向上取整
-            double proportion = (double) daysInSegment / daysPerPeriod;
+            double proportion = (double) daysInSegment / totalPeriodDays;
             int executionCount = (int) Math.ceil(proportion * timesPerPeriod);
             // 添加当前时间段结果
@@ -230,7 +230,7 @@ public class TimeIntervalFrequencyUtil {
     // ====================== 测试用例 ======================
     public static void main(String[] args) {
-        List<PeriodResult> r2 = calculateNew("2026-01-01", "2026-02-15", "7/1", 2);
+        List<PeriodResult> r2 = calculateNew("2026-01-01", "2026-01-26", "5/12", 1);
         r2.forEach(System.out::println);
 //        //1:日/次；2:周/次；3:月/次；4:年/次
@@ -47,5 +47,18 @@ public  class BpmCommonConstant {
      * 快速工单编号前缀
      */
     public static final String WORK_ORDER_PREFFIX_QUICK = "QWO";
+    /**
+     * 园林养护员 角色编码
+     */
+    public static final String YL_WORKER="yl_worker";
+    /**
+     * 园林班组长 角色编码
+     */
+    public static final String TEAM_LEADER_YL = "team_leader_yl";
+
+    /**
+     * 园林巡查员 角色编码
+     */
+    public static final String YL_INSPECTOR = "yl_inspector";
 }
 package com.zteits.urbanops.module.workorder.api.workorder;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO;
+
+import java.util.List;
+
+/**
+ * 工单对外提供的 api
+ */
 public interface WorkOrderApi {
     /**
      * 生成工单编号
@@ -7,4 +15,22 @@ public interface WorkOrderApi {
      * @return
      */
     public String generateWONum(String prefix);
+
+    /**
+     *通过登录人 loginUserId 获取 当前人所在部门的 且对应的用户角色为roleCode的人员,按业务线busiLine 筛选
+     * @param loginUserId
+     * @param roleCode
+     * @param notHas false 不包含loginUserId
+     * @return
+     */
+    public List<AdminUserRespDTO> getUserByLoginIdAndRoleCode(Long loginUserId, String roleCode, String busiLine, boolean notHas);
+
+    /**
+     * 通过道路 roadId 获取 当前人所在部门的 且对应的用户角色为roleCode的人员,按业务线busiLine 筛选
+     * @param roadId
+     * @param roleCode
+     * @param busiLine
+     * @return
+     */
+    public List<AdminUserRespDTO> getUserByRoadIdAndRoleCode(Long roadId,String roleCode,String busiLine);
 }
 package com.zteits.urbanops.module.workorder.api.workorder;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+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.dal.mysql.maininfo.MainInfoExtMapper;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
+import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
+import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception0;
+
 /**
  * @author yanhuiqing
  * @version 1.0
@@ -17,6 +25,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 @Service
 public class WorkOrderApiImpl implements WorkOrderApi{
+    @Resource
+    private MainInfoExtMapper workOrderExtMapper;
     private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
     private static final AtomicInteger counter = new AtomicInteger(1);
@@ -37,4 +47,20 @@ public class WorkOrderApiImpl implements WorkOrderApi{
         }
         return String.format("%s%03d_%s", prefix, seqNum,dateStr);
     }
+
+    @Override
+    public List<AdminUserRespDTO> getUserByLoginIdAndRoleCode(Long loginUserId, String roleCode, String busiLine, boolean notHas) {
+        if(ObjectUtils.isEmpty(loginUserId) || ObjectUtils.isEmpty(roleCode) || ObjectUtils.isEmpty(busiLine)){
+            throw exception0(BAD_REQUEST.getCode(),"param:loginUserId,roleCode,busiLine 不能为空！");
+        }
+        return workOrderExtMapper.getUserByLoginIdAndRoleCode(loginUserId,roleCode,busiLine,notHas);
+    }
+
+    @Override
+    public List<AdminUserRespDTO> getUserByRoadIdAndRoleCode(Long roadId, String roleCode, String busiLine) {
+        if(ObjectUtils.isEmpty(roadId) || ObjectUtils.isEmpty(roleCode) || ObjectUtils.isEmpty(busiLine)){
+            throw exception0(BAD_REQUEST.getCode(),"param:roadId,roleCode,busiLine 不能为空！");
+        }
+        return workOrderExtMapper.getUserByRoadIdAndRoleCode(roadId,roleCode,busiLine);
+    }
 }
@@ -34,12 +34,12 @@ public class BpmGardenInspectController {
     @Resource
     private BpmGardenService gardenService;
-    @PostMapping("/create")
+    /*@PostMapping("/create")
     @PreAuthorize("@ss.hasPermission('bpm:garden-inspection:create')")
     @Operation(summary = "创建请求申请")
     public CommonResult<Long> createGardenInspection(@Valid @RequestBody BpmGardenWorkOrderCreateReqVO createReqVO) {
         return success(gardenService.createWorkOrder(getLoginUserId(), createReqVO));
-    }
+    }*/
     @GetMapping("/get")
     @PreAuthorize("@ss.hasPermission('bpm:garden-inspection:query')")
@@ -2,9 +2,11 @@ package com.zteits.urbanops.module.workorder.controller.app.garden;
 import cn.hutool.core.util.StrUtil;
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.common.util.json.JsonUtils;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
+import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
 import com.zteits.urbanops.framework.web.core.util.WebFrameworkUtils;
 import com.zteits.urbanops.module.bpm.controller.admin.task.vo.instance.BpmApprovalDetailReqVO;
 import com.zteits.urbanops.module.bpm.controller.admin.task.vo.instance.BpmApprovalDetailRespVO;
@@ -13,7 +15,10 @@ import com.zteits.urbanops.module.bpm.controller.admin.task.vo.task.BpmTaskTrans
 import com.zteits.urbanops.module.garden.api.road.RoadApi;
 import com.zteits.urbanops.module.garden.api.road.dto.RoadReqDTO;
 import com.zteits.urbanops.module.garden.api.road.dto.RoadRespDTO;
+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.*;
+import com.zteits.urbanops.module.workorder.controller.app.garden.vo.common.UserInfoPageReqVO;
 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.process.AppGardenApprovalDetailReqVO;
 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.process.AppGardenApprovalDetailRespVO;
 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.*;
@@ -164,4 +169,12 @@ public class AppGardenWorkOrderController {
         PageResult<AppGardenWorkOrderRespVO> pageResult = gardenService.getTaskTodoBuzSimplePage(pageVO);
         return success(pageResult);
     }
+
+    @GetMapping("getYlWorkersPage")
+    @Operation(summary = "app - 获取园林养护员")
+    //@PreAuthorize("@ss.hasPermission('bpm:garden-workorder:query')")
+    public CommonResult<PageResult<AdminUserRespDTO>> getYlWorkersPage(@Valid UserInfoPageReqVO pageVO) {
+        PageResult<AdminUserRespDTO> pageResult = gardenService.getUserByLoginIdAndRoleCode(pageVO, SecurityFrameworkUtils.getLoginUserId(),pageVO.getRoleCode(),pageVO.getBusiLine(),pageVO.isNotHas());
+        return success(pageResult);
+    }
 }
@@ -81,6 +81,10 @@ public class AppGardenWorkOrderReqVO {
     @Schema(description = "完成时间")
     private LocalDateTime finishDate;
+    @NotNull
+    @Schema(description = "工单业务线", example = "yl")
+    private String busiLine;
+
    /* @Schema(description = "发起人自选审批人 Map", example = "{taskKey1: [1, 2]}")
     private Map<String, List<Long>> startUserSelectAssignees;
+package com.zteits.urbanops.module.workorder.controller.app.garden.vo.common;
+
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * 类描述：园林app下拉养护员信息
+ * 创建人：yanhuiqing
+ * 创建时间：2025/12/16 23:05
+ * 修改人：yanhuiqing
+ * 修改时间：2025/12/16 23:05
+ * 修改备注：
+ *
+ * @author yanhuiqing
+ * @version 1.0
+ */
+@Schema(description = "APP - 园林app下拉养护员信息分页 Request VO")
+@Data
+public class UserInfoPageReqVO extends PageParam {
+    @NotNull
+    @Schema(description = "养护员角色编码", example = "yl_worker")
+    private String roleCode;
+    @NotNull
+    @Schema(description = "业务线", example = "yl")
+    private String busiLine;
+    @Schema(description = "是否包含登录人，true 默认不包含", example = "true")
+    boolean notHas = true;
+}
 \ No newline at end of file
@@ -2,15 +2,21 @@ 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.plugins.pagination.Page;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
 import com.zteits.urbanops.framework.mybatis.core.util.MyBatisUtils;
+import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO;
 import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoHasTaskPageReqVO;
 import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoPageReqVO;
 import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoDO;
 import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoExtDO;
+import jakarta.validation.constraints.NotNull;
 import org.apache.ibatis.annotations.*;
+import org.springframework.lang.NonNull;
+
+import java.util.List;
 /**
  * 类描述：工单工作流扩展Mapper
@@ -227,4 +233,114 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
         mpPage = selectTodoExtPage(mpPage, reqVO);
         return new PageResult<>(mpPage.getRecords(), mpPage.getTotal());
     }
+    //-------------------------------------------------------------------------------------------------------
+    /**
+     * 查询所有用户信息 通过以下条件
+     * @param loginUserId
+     * @param roleCode
+     * @param busiLines
+     * @param notHas
+     * @return
+     */
+    default List<AdminUserRespDTO> getUserByLoginIdAndRoleCode(
+            @NonNull Long loginUserId,
+            @NonNull String roleCode,
+            @NonNull String busiLines,
+            @NonNull boolean notHas
+    ) {
+        // 创建一个“不分页”的Page对象（size=Integer.MAX_VALUE，查询所有数据）
+        IPage<AdminUserRespDTO> page = new Page<>(1, Integer.MAX_VALUE);
+        // 调用分页方法，获取结果列表
+        IPage<AdminUserRespDTO> resultPage = getUserByLoginIdAndRoleCodeIPage(page, loginUserId, roleCode, busiLines, notHas);
+        return resultPage.getRecords();
+    }
+
+
+    @Select({
+            "<script>",
+            "SELECT",
+            "    su.id, su.nickname, su.status, su.dept_id, su.mobile, su.avatar",
+            "FROM",
+            "    (SELECT dept_id FROM system_users WHERE id = #{loginUserId}) AS login_user_dept",
+            "INNER JOIN system_users su ON login_user_dept.dept_id = su.dept_id",
+            "INNER JOIN system_user_role sur ON su.id = sur.user_id",
+            "INNER JOIN system_role sr ON sur.role_id = sr.id",
+            "WHERE",
+            "    sr.code = #{roleCode}",
+            "    AND FIND_IN_SET(#{busiLine}, REPLACE(su.busi_line, ' ', '')) > 0",
+            "    <if test='notHas'>",
+            "        AND su.id &lt;&gt; #{loginUserId}",
+            "    </if>",
+            "</script>"
+    })
+    @Results({
+            @Result(column = "id", property = "id"),
+            @Result(column = "nickname", property = "nickname"),
+            @Result(column = "status", property = "status"),
+            @Result(column = "deptId", property = "dept_id"),
+            @Result(column = "mobile", property = "mobile"),
+            @Result(column = "avatar", property = "avatar")
+    })
+    IPage<AdminUserRespDTO> getUserByLoginIdAndRoleCodeIPage(IPage<AdminUserRespDTO> page,
+                                                            @NonNull @Param("loginUserId") Long loginUserId,
+                                                            @NonNull @Param("roleCode") String roleCode,
+                                                            @NonNull @Param("busiLine") String busiLines,
+                                                            @NonNull @Param("notHas") boolean notHas);
+    default PageResult<AdminUserRespDTO> getUserByLoginIdAndRoleCodePage(PageParam pageParam,@NonNull @Param("loginUserId") Long loginUserId,
+                                                                         @NonNull @Param("roleCode") String roleCode,
+                                                                         @NonNull @Param("busiLine") String busiLines,
+                                                                         @NonNull @Param("notHas") boolean notHas){
+        IPage<AdminUserRespDTO> mpPage = MyBatisUtils.buildPage(pageParam);
+        mpPage = getUserByLoginIdAndRoleCodeIPage(mpPage, loginUserId,roleCode, busiLines,notHas);
+        return new PageResult<>(mpPage.getRecords(), mpPage.getTotal());
+
+    }
+
+    //-------------------------------------------------------------------------------------------------------
+    @Select({
+            "<script>",
+            "SELECT",
+            "    su.id, su.nickname, su.status, su.dept_id, su.mobile, su.avatar",
+            "FROM",
+            "    garden_road gr",
+            "INNER JOIN system_dept sd ON gr.dept_id = sd.id",
+            "INNER JOIN system_users su ON gr.dept_id = su.dept_id",
+            "INNER JOIN system_user_role sur ON su.id = sur.user_id",
+            "INNER JOIN system_role sr ON sur.role_id = sr.id",
+            "WHERE",
+            "    FIND_IN_SET(#{busiLine}, REPLACE(su.busi_line, ' ', '')) > 0",
+            "    AND gr.id = #{roadId}",
+            "    AND sr.code = #{roleCode}",
+            "</script>"
+    })
+    @Results({
+            @Result(column = "id", property = "id"),
+            @Result(column = "nickname", property = "nickname"),
+            @Result(column = "status", property = "status"),
+            @Result(column = "deptId", property = "dept_id"),
+            @Result(column = "mobile", property = "mobile"),
+            @Result(column = "avatar", property = "avatar")
+    })
+    IPage<AdminUserRespDTO> getUserByRoadIdAndRoleCodeIPage(IPage<AdminUserRespDTO> page,@NonNull @Param("roadId") Long roadId,
+                                                            @NonNull @Param("roleCode") String roleCode,
+                                                            @NonNull @Param("busiLine") String busiLine);
+    default PageResult<AdminUserRespDTO> getUserByRoadIdAndRoleCodePage(PageParam pageParam,@NonNull @Param("roadId") Long roadId,
+                                                                        @NonNull @Param("roleCode") String roleCode,
+                                                                        @NonNull @Param("busiLine") String busiLine){
+        IPage<AdminUserRespDTO> mpPage = MyBatisUtils.buildPage(pageParam);
+        mpPage = getUserByRoadIdAndRoleCodeIPage(mpPage, roadId,roleCode, busiLine);
+        return new PageResult<>(mpPage.getRecords(), mpPage.getTotal());
+
+    }
+
+
+    default List<AdminUserRespDTO> getUserByRoadIdAndRoleCode(@NonNull @Param("roadId") Long roadId,
+                                                      @NonNull @Param("roleCode") String roleCode,
+                                                      @NonNull @Param("busiLine") String busiLine){
+        // 创建一个“不分页”的Page对象（size=Integer.MAX_VALUE，查询所有数据）
+        IPage<AdminUserRespDTO> page = new Page<>(1, Integer.MAX_VALUE);
+        // 调用分页方法，获取结果列表
+        IPage<AdminUserRespDTO> resultPage = getUserByRoadIdAndRoleCodeIPage(page, roadId, roleCode, busiLine);
+        return resultPage.getRecords();
+    }
 }
 \ No newline at end of file
@@ -16,4 +16,6 @@ public interface ErrorCodeConstants {
     ErrorCode ATTACHMENT_NOT_EXISTS = new ErrorCode(1-900-001-001, "工单附件信息不存在");
     ErrorCode MATERIAL_DETAIL_NOT_EXISTS = new ErrorCode(1-900-001-002, "工单耗材明细不存在");
+
+    ErrorCode  TEAM_LEADER_YL_NOT_EXISTS = new ErrorCode(1-900-001-003, "养护班组长人员不存在");
 }
 package com.zteits.urbanops.module.workorder.service.garden;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO;
 import com.zteits.urbanops.module.workorder.controller.admin.garden.vo.BpmGardenWorkOrderCreateReqVO;
 import com.zteits.urbanops.module.workorder.controller.admin.garden.vo.BpmGardenWorkOrderPageReqVO;
 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.*;
@@ -22,13 +24,7 @@ public interface BpmGardenService {
      * @return
      */
     Long createWorkOrder(@Valid AppGardenWorkOrderReqVO createRequestVo);
-    /**
-     * 园林工单申请 Service 接口
-     * @param userId
-     * @param createRequestVo
-     * @return
-     */
-    Long createWorkOrder(Long userId,@Valid BpmGardenWorkOrderCreateReqVO createRequestVo);
+
     /**
      * 更新工单申请的状态
@@ -133,4 +129,22 @@ public interface BpmGardenService {
      * @return
      */
     PageResult<AppGardenWorkOrderRespVO> getTaskTodoBuzSimplePage(AppGardenWorkOrderPageReqVO pageVO);
+
+    /**
+     *通过登录人 loginUserId 获取 当前人所在部门的 且对应的用户角色为roleCode的人员,按业务线busiLine 筛选
+     * @param loginUserId
+     * @param roleCode
+     * @param notHas false 不包含loginUserId
+     * @return
+     */
+    public PageResult<AdminUserRespDTO> getUserByLoginIdAndRoleCode(PageParam param,Long loginUserId, String roleCode, String busiLine, boolean notHas);
+
+    /**
+     * 通过道路 roadId 获取 当前人所在部门的 且对应的用户角色为roleCode的人员,按业务线busiLine 筛选
+     * @param roadId
+     * @param roleCode
+     * @param busiLine
+     * @return
+     */
+    public PageResult<AdminUserRespDTO> getUserByRoadIdAndRoleCode(PageParam param,Long roadId,String roleCode,String busiLine);
 }
@@ -2,6 +2,7 @@ package com.zteits.urbanops.module.workorder.service.garden;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zteits.urbanops.framework.common.pojo.PageParam;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
 import com.zteits.urbanops.framework.common.util.object.ObjectUtils;
@@ -57,10 +58,13 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
+import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception0;
 import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertSet;
 import static com.zteits.urbanops.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
 import static com.zteits.urbanops.module.workorder.enums.ErrorCodeConstants.MAIN_INFO_NOT_EXISTS;
+import static com.zteits.urbanops.module.workorder.enums.ErrorCodeConstants.TEAM_LEADER_YL_NOT_EXISTS;
 /**
  * @author yanhuiqing
@@ -101,6 +105,11 @@ public class BpmGardenServiceImpl implements BpmGardenService{
     @Resource
     private RuntimeService runtimeService;
+    /**
+     * app 端快速工单入口
+     * @param createRequestVo
+     * @return
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createWorkOrderQuick(AppGardenWorkOrderReqVO createRequestVo) {
@@ -273,6 +282,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         return AppGardenTaskConvert.INSTANCE.buildBuziTaskPage(pageResult,attachmentMapper);
     }
+
     @Override
     public PageResult<AppGardenTaskRespVO> getTaskDonePage(AppGardenTaskPageReqVO pageVO) {
         BpmTaskPageReqVO targetVO = BeanUtils.toBean(pageVO,BpmTaskPageReqVO.class);
@@ -312,7 +322,11 @@ public class BpmGardenServiceImpl implements BpmGardenService{
     }
-
+    /**
+     *  app端创建工单
+     * @param createRequestVo
+     * @return
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createWorkOrder(AppGardenWorkOrderReqVO createRequestVo) {
@@ -338,39 +352,29 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         workOrderMapper.insert(workOrder);
         //附件插入
         attachmentApend(imgList,null,longRangeImgList,workOrder);
-        return workOrder.getId();
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Long createWorkOrder(Long userId, BpmGardenWorkOrderCreateReqVO createRequestVo) {
-        List<String> imgList =  createRequestVo.getImgs();
-        List<String> streetImgList = createRequestVo.getStreetImgList();
-        List<String> longRangeImgList = createRequestVo.getLongRangeImgList();
-        String isYesOrNo = createRequestVo.getIsYesOrNo();
-        // 插入 工单
-        MainInfoDO workOrder = BeanUtils.toBean(createRequestVo, MainInfoDO.class)
-                .setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
-        //TODO 设置其它值 需从道路表获取
-        workOrder.setStreetId("test");
-        workOrder.setBuzStatus("t1");//需给出映射关系
-        workOrder.setCommitDate(LocalDateTime.now());
-        String workOrderNum = workOrderApi.generateWONum(BpmCommonConstant.WORK_ORDER_PREFFIX_GARDEN);
-        workOrder.setOrderNo(workOrderNum);
-        workOrder.setOrderName("园林工单");
-        workOrder.setCompanyId(SecurityFrameworkUtils.getCompanyId());
-        workOrder.setBusiLine(SecurityFrameworkUtils.getBusiLine());
-        workOrderMapper.insert(workOrder);
-
-        //附件插入
-        attachmentApend(imgList,streetImgList,longRangeImgList,workOrder);
         // 发起 BPM 流程
+        Long userId = SecurityFrameworkUtils.getLoginUserId();
         Map<String, Object> processInstanceVariables = new HashMap<>();
-        processInstanceVariables.put("isYesOrNo", isYesOrNo);
+        processInstanceVariables.put("workOrder", workOrder);
+        processInstanceVariables.put("imgList", imgList);
+        processInstanceVariables.put("longRangeImgList", longRangeImgList);
+        processInstanceVariables.put("initiator", userId);
+        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)){
+            throw exception(TEAM_LEADER_YL_NOT_EXISTS);
+        }
+        // 提取id到List<Long>
+        List<Long> idList = userList.stream()
+                // 映射：将AdminUserRespDTO对象转为其id属性
+                .map(AdminUserRespDTO::getId)
+                // 收集结果到List
+                .collect(Collectors.toList());
+        startUserSelectAssignees.put("",idList);
         String processInstanceId = processInstanceApi.createProcessInstance(userId,
                 new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(BpmCommonConstant.BPM_GARDEN_INSPECT_WO)
                         .setVariables(processInstanceVariables).setBusinessKey(String.valueOf(workOrder.getId()))
-                        .setStartUserSelectAssignees(createRequestVo.getStartUserSelectAssignees()));
+                        .setStartUserSelectAssignees(startUserSelectAssignees));
         // 将工作流的编号，更新到 工单中
         workOrderMapper.updateById(new MainInfoDO().setId(workOrder.getId()).setProcessInstanceId(processInstanceId));
@@ -490,4 +494,20 @@ public class BpmGardenServiceImpl implements BpmGardenService{
     }
+    @Override
+    public PageResult<AdminUserRespDTO> getUserByLoginIdAndRoleCode(PageParam param, Long loginUserId, String roleCode, String busiLine, boolean notHas) {
+        if(org.springframework.util.ObjectUtils.isEmpty(loginUserId) || org.springframework.util.ObjectUtils.isEmpty(roleCode) || org.springframework.util.ObjectUtils.isEmpty(busiLine)){
+            throw exception0(BAD_REQUEST.getCode(),"param:loginUserId,roleCode,busiLine 不能为空！");
+        }
+        return workOrderExtMapper.getUserByLoginIdAndRoleCodePage(param,loginUserId,roleCode,busiLine,notHas);
+    }
+
+    @Override
+    public PageResult<AdminUserRespDTO> getUserByRoadIdAndRoleCode(PageParam param,Long roadId, String roleCode, String busiLine) {
+        if(org.springframework.util.ObjectUtils.isEmpty(roadId) || org.springframework.util.ObjectUtils.isEmpty(roleCode) || org.springframework.util.ObjectUtils.isEmpty(busiLine)){
+            throw exception0(BAD_REQUEST.getCode(),"param:roadId,roleCode,busiLine 不能为空！");
+        }
+        return workOrderExtMapper.getUserByRoadIdAndRoleCodePage(param,roadId,roleCode,busiLine);
+    }
+
 }
 package com.zteits.urbanops.module.workorder.service.garden.listener;
-import com.zteits.urbanops.module.bpm.framework.flowable.core.util.FlowableUtils;
-import com.zteits.urbanops.module.workorder.service.garden.BpmGardenService;
+import cn.hutool.core.util.StrUtil;
 import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.HistoryService;
+import org.flowable.engine.ProcessEngine;
+import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
-import org.flowable.engine.impl.context.Context;
+import org.flowable.engine.delegate.TaskListener; // 配套的TaskListener也用核心包
+import org.flowable.task.api.Task;
+import org.flowable.task.api.history.HistoricTaskInstanceQuery;
 import org.flowable.task.service.delegate.DelegateTask;
-import org.flowable.task.service.delegate.TaskListener;
+import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
- * @author yanhuiqing
- * @version 1.0
- * @description: 自动触发
- * @date 2025/12/11 11:17
+ * 自动完成任务的监听器（最终版：适配项目实际包路径 + 移除所有报错依赖）
+ * Bean名称：autoCompleteTaskListener（与BPMN中的delegateExpression对应）
  */
-@Slf4j
-@Component
+@Component("autoCompleteTaskListener")
 public class AutoCompleteTaskListener implements TaskListener {
+    // ========== 仅使用Flowable核心公开API，移除所有内部/拆分接口 ==========
+    @Resource // 若项目习惯用@Autowired，可直接替换（@Resource按名称，@Autowired按类型，功能一致）
+    private TaskService taskService;
+
+    @Resource
+    private RuntimeService runtimeService;
+
+    // 核心：直接注入ProcessEngine（兼容所有Flowable版本，可获取任意服务）
     @Resource
-    private BpmGardenService gardenService;
+    private ProcessEngine processEngine;
+
+    @Resource
+    private ApplicationContext applicationContext;
+
+    // 统一流程状态值（与RuoYi的事件监听器预期值一致）
+    private static final String FLOW_STATUS = "3"; // 对应“完成”状态
+
     @Override
-    public void notify(DelegateTask delegateTask) {
-        // 仅处理任务创建事件
-        if (!"create".equals(delegateTask.getEventName())) {
-            return;
-       }
+    public void notify(DelegateTask delegateTask) { // 此处DelegateTask为核心包的类，与项目一致
         try {
-            Thread.sleep(5000); // 延迟200ms，确保任务持久化
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
+            // 1. 获取核心变量
+            String taskId = delegateTask.getId();
+            String processInstanceId = delegateTask.getProcessInstanceId();
+            String assignee = delegateTask.getAssignee();
+
+            // 兜底：从流程变量获取发起人（initiator是Flowable启动节点的发起人变量）
+            if (StrUtil.isBlank(assignee)) {
+                assignee = (String) delegateTask.getVariable("initiator");
+                if (StrUtil.isBlank(assignee)) {
+                    assignee = (String) runtimeService.getVariable(processInstanceId, "initiator");
+                    if (StrUtil.isBlank(assignee)) {
+                        throw new RuntimeException("发起人ID为空，无法完成任务");
+                    }
+                }
+                // 修正：使用Flowable公开API更新办理人（彻底放弃内部类操作，无类型转换）
+                taskService.setAssignee(taskId, assignee);
+            }
+
+            // 2. 关键：提前设置所有层级的status变量（解决RuoYi事件status为空）
+            runtimeService.setVariable(processInstanceId, "status", FLOW_STATUS); // 流程全局变量
+            delegateTask.setVariable("status", FLOW_STATUS); // 任务局部变量
+            Map<String, Object> variables = new HashMap<>();
+            variables.put("status", FLOW_STATUS);
+            variables.put("completeRemark", "系统自动完成，办理人：" + assignee);
+
+            // 3. 完成任务（Flowable核心API，兼容所有版本）
+            Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+            if (task != null) {
+                taskService.complete(taskId, variables);
+            }
+
+            // 4. 兜底：确保历史任务归档（使用ProcessEngine获取HistoryService，无报错）
+            ensureHistoricTaskCompleted(taskId, assignee);
+
+            // 5. 手动发布事件补充status（解决RuoYi的事件校验问题）
+            publishProcessEventWithStatus(processInstanceId);
+
+        } catch (Exception e) {
+            throw new RuntimeException("自动完成任务失败", e);
+        }
+    }
+
+    /**
+     * 修正：使用ProcessEngine获取HistoryService（兼容所有Flowable版本，无报错）
+     * 彻底移除HistoryTaskService，改用核心HistoryService
+     */
+    private void ensureHistoricTaskCompleted(String taskId, String assignee) {
+        // 核心：从ProcessEngine获取HistoryService（Flowable 6.x/7.0通用）
+        HistoryService historyService = processEngine.getHistoryService();
+        // 历史任务查询（Flowable核心API，无报错）
+        //HistoricTaskInstanceQuery historicTask = historyService.createHistoricTaskInstanceQuery()
+         //       .taskId(taskId)
+        //        .singleResult();
+
+        /*if (historicTask != null) {
+            if (historicTask.getEndTime() == null) {
+                Task runtimeTask = taskService.createTaskQuery().taskId(taskId).singleResult();
+                if (runtimeTask != null) {
+                    taskService.complete(taskId);
+                } else {
+                    // 手动更新历史任务表（通过MyBatis操作，避免Flowable API差异）
+                    // updateHistoricTask(taskId, assignee); // 若需要，自行实现Mapper
+                }
+            }
+        }*/
+    }
+
+    /**
+     * 手动发布包含status的流程事件（适配RuoYi事件类，避免导入依赖）
+     */
+    private void publishProcessEventWithStatus(String processInstanceId) {
+        try {
+            // 反射创建RuoYi的ProcessInstanceResultEvent（兼容无参/有参构造）
+            Class<?> eventClass = Class.forName("com.ruoyi.flowable.event.ProcessInstanceResultEvent");
+            Object event = null;
+
+            // 先尝试无参构造
+            try {
+                event = eventClass.getDeclaredConstructor().newInstance();
+            } catch (Exception e) {
+                // 无参失败，尝试单参构造（流程实例ID）
+                try {
+                    event = eventClass.getConstructor(String.class).newInstance(processInstanceId);
+                } catch (Exception e2) {
+                    // 单参失败，尝试双参构造（流程实例ID + status）
+                    event = eventClass.getConstructor(String.class, String.class).newInstance(processInstanceId, FLOW_STATUS);
+                }
+            }
+
+            // 强制设置status属性（无论构造方式如何）
+            eventClass.getMethod("setStatus", String.class).invoke(event, FLOW_STATUS);
+            eventClass.getMethod("setProcessInstanceId", String.class).invoke(event, processInstanceId);
+
+            // 发布事件（覆盖RuoYi的空status事件）
+            applicationContext.publishEvent(event);
+        } catch (Exception e) {
+            // 反射失败时，提示用户修改RuoYi的事件校验逻辑（应急方案）
+            e.printStackTrace();
+            System.out.println("★★★反射发布事件失败，请手动修改RuoYi的ProcessInstanceResultEvent校验逻辑，添加status默认值★★★");
         }
-        Long assigneeId = Long.parseLong(delegateTask.getAssignee());
-        //FlowableUtils.executeAuthenticatedUserId(assigneeId, () -> {
-            // 完成任务（在认证上下文内执行）
-            TaskService taskService = Context.getProcessEngineConfiguration().getTaskService();
-            taskService.complete(delegateTask.getId());
-         //   return assigneeId;
-        //});
-
-        // 1. 获取发起人变量（芋道流程中配置的initiator）
-        //String initiator = (String) delegateTask.getVariable("initiator");
-        // 2. 当前任务处理人（即发起人）
-        //String currentAssignee = delegateTask.getAssignee();
-
-        // 3. 校验：处理人是发起人则自动完成任务
-       // if (initiator != null && initiator.equals(currentAssignee)) {
-//            TaskService taskService = Context.getProcessEngineConfiguration().getTaskService();
-            // 添加备注变量
-         //   delegateTask.setVariable("autoCompleteReason", "发起人自动完成任务");
-            // 完成任务，触发流程流转到结束节点
-        //    taskService.complete(delegateTask.getId());
-       // }
     }
-}
+
+    // 若需要手动更新历史任务表，自行实现以下方法（需添加MyBatis Mapper）
+    // private void updateHistoricTask(String taskId, String assignee) {
+    //     // historicTaskMapper.updateHistoricTask(taskId, assignee, new Date());
+    // }
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.workorder.service.garden.listener;
+
+import com.zteits.urbanops.module.bpm.api.event.BpmProcessInstanceStatusEvent;
+import com.zteits.urbanops.module.bpm.api.event.BpmProcessInstanceStatusEventListener;
+import com.zteits.urbanops.module.workorder.api.constant.BpmCommonConstant;
+import com.zteits.urbanops.module.workorder.service.garden.BpmGardenService;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author yanhuiqing
+ * @version 1.0
+ * @description: 处理流程的任务自动完成监听器
+ * @date 2025/12/6 14:00
+ */
+@Component
+@Slf4j
+public class BpmProcessTaskAutoCompleteListener extends BpmProcessInstanceStatusEventListener {
+    @Resource
+    private BpmGardenService gardenService;
+    @Override
+    protected String getProcessDefinitionKey() {
+
+        return BpmCommonConstant.BPM_GARDEN_INSPECT_WO;
+    }
+
+    @Override
+    protected void onEvent(BpmProcessInstanceStatusEvent event) {
+        log.info("业务ID:"+event.getBusinessKey()+",业务状态"+event.getStatus());
+        gardenService.updateWorkOrderStatus(Long.parseLong(event.getBusinessKey()), event.getStatus());
+
+    }
+}
@@ -22,6 +22,8 @@ public class BpmQuickProcessTaskAutoCompleteListener extends BpmProcessInstanceS
     private BpmGardenService gardenService;
     @Override
     protected String getProcessDefinitionKey() {
+
+        //return "quik_local_test";
         return BpmCommonConstant.COMMON_QUICK_PROCESS;
     }