diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/SysOaClaimController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/SysOaClaimController.java index 51b6541..5a77673 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/SysOaClaimController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/SysOaClaimController.java @@ -41,9 +41,18 @@ public class SysOaClaimController extends BaseController { * 查询差旅费报销列表 */ @SaCheckPermission("system:oaClaim:list") - @GetMapping("/list") - public TableDataInfo list(SysOaClaimBo bo, PageQuery pageQuery) { - return iSysOaClaimService.queryPageList(bo, pageQuery); + @GetMapping("/list-claim") + public TableDataInfo listClaim(SysOaClaimBo bo, PageQuery pageQuery) { + return iSysOaClaimService.queryPageListByClaim(bo, pageQuery); + } + + /** + * 查询差旅费报销列表 + */ + @SaCheckPermission("system:oaClaim:list") + @GetMapping("/list-money") + public TableDataInfo listMoney(SysOaClaimBo bo, PageQuery pageQuery) { + return iSysOaClaimService.queryPageListByMoney(bo, pageQuery); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfProcessController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfProcessController.java index 14fabae..05b36ed 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfProcessController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfProcessController.java @@ -223,7 +223,19 @@ public class WfProcessController extends BaseController { @PostMapping("/startClaim") public R startClaim() { Map variables = new HashMap(); - String procInsId = processService.startClaim(variables); + String procInsId = processService.commonStart("claim"); + return R.ok("流程启动成功",procInsId); + } + + /** + * 根据流程定义id启动流程实例 + * + */ + @SaCheckPermission("workflow:process:start") + @PostMapping("/startMoney") + public R startMoney() { + Map variables = new HashMap(); + String procInsId = processService.commonStart("money"); return R.ok("流程启动成功",procInsId); } diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index d839269..8a619c5 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -13,7 +13,7 @@ ruoyi: # 缓存懒加载 cacheLazy: false # 文件路径 - profile: /home/wy/oa/uploadPath + profile: /home/wangyu/oa/uploadPath # profile: F:\work\fad_oa系统\fad_oa\temp captcha: diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java index 4f2f679..26a9577 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java @@ -43,7 +43,7 @@ public class RuoYiConfig { /** 上传路径 */ @Getter - private static String profile = "/home/wy/oa/uploadPath"; + private static String profile = "/home/wangyu/oa/uploadPath"; // // /** 上传路径 */ // @Getter diff --git a/ruoyi-oa/pom.xml b/ruoyi-oa/pom.xml index 7633ea3..04fc9a0 100644 --- a/ruoyi-oa/pom.xml +++ b/ruoyi-oa/pom.xml @@ -26,11 +26,6 @@ ruoyi-system - - com.ruoyi - ruoyi-flowable - - com.alibaba.fastjson2 diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskController.java index 72b62e6..9cf8a0f 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskController.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskController.java @@ -3,6 +3,7 @@ package com.ruoyi.oa.controller; import java.util.*; import java.util.concurrent.TimeUnit; +import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.oa.domain.SysOaTask; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; @@ -42,11 +43,27 @@ public class SysOaTaskController extends BaseController { /** * 查询任务管理列表 */ - @SaCheckPermission("oa:task:list") @GetMapping("/list") public TableDataInfo list(SysOaTaskBo bo, PageQuery pageQuery) { return iSysOaTaskService.queryPageList(bo, pageQuery); } + /** + * 查询任务管理列表 + */ + @GetMapping("/list-own-create") + public TableDataInfo listOwnCreate(SysOaTaskBo bo, PageQuery pageQuery) { + bo.setCreateUserId(LoginHelper.getUserId()); + return iSysOaTaskService.queryPageListOwn(bo, pageQuery); + } + + /** + * 查询任务管理列表 + */ + @GetMapping("/list-own-work") + public TableDataInfo listOwnWork(SysOaTaskBo bo, PageQuery pageQuery) { + bo.setWorkerId(LoginHelper.getUserId()); + return iSysOaTaskService.queryPageListOwn(bo, pageQuery); + } /** * 根据工作类型字典查询任务列表 @@ -64,7 +81,6 @@ public class SysOaTaskController extends BaseController { * @param bo * @return */ - @SaCheckPermission("oa:task:list") @GetMapping("/listByType") public List listByType(SysOaTaskBo bo){ return iSysOaTaskService.queryListByType(bo); @@ -73,7 +89,6 @@ public class SysOaTaskController extends BaseController { /** * 导出任务管理列表 */ - @SaCheckPermission("oa:task:export") @Log(title = "任务管理", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(SysOaTaskBo bo, HttpServletResponse response) { @@ -86,7 +101,6 @@ public class SysOaTaskController extends BaseController { * * @param taskId 主键 */ - @SaCheckPermission("oa:task:query") @GetMapping("/{taskId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long taskId) { return R.ok(iSysOaTaskService.queryById(taskId)); @@ -95,7 +109,6 @@ public class SysOaTaskController extends BaseController { /** * 新增任务管理 */ - @SaCheckPermission("oa:task:add") @Log(title = "任务管理", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -106,7 +119,6 @@ public class SysOaTaskController extends BaseController { /** * 修改任务管理 */ - @SaCheckPermission("oa:task:edit") @Log(title = "任务管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -114,12 +126,33 @@ public class SysOaTaskController extends BaseController { return toAjax(iSysOaTaskService.updateByBo(bo)); } + + /** + * 修改任务管理 + */ + @Log(title = "任务管理", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/postpone") + public R postponeTask(@Validated(EditGroup.class) @RequestBody SysOaTaskBo bo) { + return toAjax(iSysOaTaskService.postponeTask(bo)); + } + + /** + * 修改任务管理 + */ + @Log(title = "任务管理", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/postponeSuccess") + public R postponeSuccess(@Validated(EditGroup.class) @RequestBody SysOaTaskBo bo) { + return toAjax(iSysOaTaskService.postponeSuccess(bo)); + } + + /** * 删除任务管理 * * @param taskIds 主键串 */ - @SaCheckPermission("oa:task:remove") @Log(title = "任务管理", businessType = BusinessType.DELETE) @DeleteMapping("/{taskIds}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskUserController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskUserController.java deleted file mode 100644 index c8ddf90..0000000 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskUserController.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.ruoyi.oa.controller; - -import java.util.List; -import java.util.Arrays; -import java.util.concurrent.TimeUnit; - -import lombok.RequiredArgsConstructor; -import javax.servlet.http.HttpServletResponse; -import javax.validation.constraints.*; -import cn.dev33.satoken.annotation.SaCheckPermission; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.core.validate.QueryGroup; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.oa.domain.vo.SysOaTaskUserVo; -import com.ruoyi.oa.domain.bo.SysOaTaskUserBo; -import com.ruoyi.oa.service.ISysOaTaskUserService; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 任务工人 - * - * @author hdka - * @date 2024-11-09 - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/system/oaTaskUser") -public class SysOaTaskUserController extends BaseController { - - private final ISysOaTaskUserService iSysOaTaskUserService; - - /** - * 查询任务工人列表 - */ - @SaCheckPermission("system:oaTaskUser:list") - @GetMapping("/list") - public TableDataInfo list(SysOaTaskUserBo bo, PageQuery pageQuery) { - return iSysOaTaskUserService.queryPageList(bo, pageQuery); - } - - /** - * 导出任务工人列表 - */ - @SaCheckPermission("system:oaTaskUser:export") - @Log(title = "任务工人", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(SysOaTaskUserBo bo, HttpServletResponse response) { - List list = iSysOaTaskUserService.queryList(bo); - ExcelUtil.exportExcel(list, "任务工人", SysOaTaskUserVo.class, response); - } - - /** - * 获取任务工人详细信息 - * - * @param taskId 主键 - */ - @SaCheckPermission("system:oaTaskUser:query") - @GetMapping("/{taskId}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long taskId) { - return R.ok(iSysOaTaskUserService.queryById(taskId)); - } - - /** - * 新增任务工人 - */ - @SaCheckPermission("system:oaTaskUser:add") - @Log(title = "任务工人", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody SysOaTaskUserBo bo) { - return toAjax(iSysOaTaskUserService.insertByBo(bo)); - } - - /** - * 修改任务工人 - */ - @SaCheckPermission("system:oaTaskUser:edit") - @Log(title = "任务工人", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody SysOaTaskUserBo bo) { - return toAjax(iSysOaTaskUserService.updateByBo(bo)); - } - - /** - * 删除任务工人 - * - * @param taskIds 主键串 - */ - @SaCheckPermission("system:oaTaskUser:remove") - @Log(title = "任务工人", businessType = BusinessType.DELETE) - @DeleteMapping("/{taskIds}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] taskIds) { - return toAjax(iSysOaTaskUserService.deleteWithValidByIds(Arrays.asList(taskIds), true)); - } -} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaTask.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaTask.java index 4bafcc8..4b5ca0b 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaTask.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaTask.java @@ -10,6 +10,7 @@ import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; /** * 任务管理对象 sys_oa_task @@ -52,10 +53,14 @@ public class SysOaTask extends BaseEntity { /** * 开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date beginTime; /** * 结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date finishTime; /** * 详细描述 @@ -70,4 +75,63 @@ public class SysOaTask extends BaseEntity { */ private String remark; + /** + * 创建者 + */ + private Long createUserId; + + /** + * 被分配者 + */ + private Long workerId; + + /** + * 最初结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date originFinishTime; + + /** + * 推迟次数 + */ + private Long postponements; + + /** + * 任务完成度评分 + */ + private Long rankNumber; + + /** + * 任务完成时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date completedTime; + + /** + * 任务状态 + */ + private Long state; + + /** + * 是否置顶 + */ + private Long taskRank; + + /** + * 是否置顶 + */ + private Long ownRank; + + + /** + * 任务模式 + */ + private Long status; + + /** + * 报工间隔 + */ + private Long timeGap; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskBo.java index e15b7c0..b1ecb16 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskBo.java @@ -13,6 +13,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; /** * 任务管理业务对象 sys_oa_task @@ -34,19 +35,16 @@ public class SysOaTaskBo extends BaseEntity { /** * 项目ID */ - @NotNull(message = "项目ID不能为空", groups = { AddGroup.class, EditGroup.class }) private Long projectId; /** * 任务主题 */ - @NotBlank(message = "任务主题不能为空", groups = { AddGroup.class, EditGroup.class }) private String taskTitle; /** * 工作类型 */ - @NotBlank(message = "工作类型不能为空", groups = { AddGroup.class, EditGroup.class }) private String taskType; /** @@ -62,13 +60,15 @@ public class SysOaTaskBo extends BaseEntity { /** * 开始时间 */ - @NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class }) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date beginTime; /** * 结束时间 */ - @NotNull(message = "结束时间不能为空", groups = { AddGroup.class, EditGroup.class }) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date finishTime; /** @@ -92,5 +92,90 @@ public class SysOaTaskBo extends BaseEntity { */ private String remark; + /** + * 创建者 + */ + private Long createUserId; + + /** + * 被分配者 + */ + private Long workerId; + + /** + * 最初结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date originFinishTime; + + /** + * 推迟次数 + */ + private Long postponements; + + /** + * 任务完成度评分 + */ + private Long rankNumber; + + /** + * 任务完成时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date completedTime; + + /** + * 任务完成时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date tempTime; + + + /** + * 创建人姓名 + */ + private String createUserNickName; + + /** + * 执行人姓名 + */ + private String workerNickName; + + /** + * 项目编号 + */ + private String projectNum; + + /** + * 首次提交可能会挂多个执行人 + */ + private String workerIds; + + /** + * 任务状态 + */ + private Long state; + + /** + * 是否置顶 + */ + private Long taskRank; + /** + * 是否置顶 + */ + private Long ownRank; + + /** + * 任务模式 + */ + private Long status; + + /** + * 报工间隔 + */ + private Long timeGap; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskUserBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskUserBo.java deleted file mode 100644 index cfe57aa..0000000 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaTaskUserBo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.ruoyi.oa.domain.bo; - -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; -import lombok.Data; -import lombok.EqualsAndHashCode; -import javax.validation.constraints.*; - -import java.util.Date; - -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 任务工人业务对象 sys_oa_task_user - * - * @author hdka - * @date 2024-11-09 - */ - -@Data -@EqualsAndHashCode(callSuper = true) -public class SysOaTaskUserBo extends BaseEntity { - - /** - * 主键 - */ - @NotNull(message = "主键不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long userId; - - /** - * 任务键 - */ - @NotNull(message = "任务键不能为空", groups = { EditGroup.class }) - private Long taskId; - - -} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskVo.java index 3f28b0b..8099f43 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaTaskVo.java @@ -8,6 +8,8 @@ import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.convert.ExcelDictConvert; import com.ruoyi.common.core.domain.entity.SysUser; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + import java.util.Date; import java.util.List; @@ -113,4 +115,89 @@ public class SysOaTaskVo { */ private Double projectCostTotal; + /** + * 创建者 + */ + private Long createUserId; + + /** + * 被分配者 + */ + private Long workerId; + + /** + * 最初结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date originFinishTime; + + /** + * 推迟次数 + */ + private Long postponements; + + /** + * 任务完成度评分 + */ + private Long rankNumber; + + /** + * 任务完成时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date completedTime; + + /** + * 任务创建者 + */ + private String createUserNickName; + + /** + * 执行者 + */ + private String workerNickName; + + /** + * 逾期天数 + */ + private Long overDays; + + /** + * 项目名 + */ + private String projectName; + + /** + * 项目编号 + */ + private String projectNum; + + /** + * 任务状态 + */ + private Long state; + + /** + * 任务置顶 + */ + private Long taskRank; + + /** + * 是否置顶 + */ + private Long ownRank; + + + /** + * 任务模式 + */ + private Long status; + + /** + * 报工间隔 + */ + private Long timeGap; + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/listener/SysOaWarehouseListener.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/listener/SysOaWarehouseListener.java index 93c705f..20f095f 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/listener/SysOaWarehouseListener.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/listener/SysOaWarehouseListener.java @@ -18,8 +18,10 @@ import com.ruoyi.oa.domain.vo.SysOaWarehouseVo; import com.ruoyi.oa.service.ISysOaArticleService; import com.ruoyi.oa.service.ISysOaWarehouseMasterService; import com.ruoyi.oa.service.ISysOaWarehouseService; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; +import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -35,7 +37,8 @@ public class SysOaWarehouseListener extends AnalysisEventListener sysOaWarehouseVos; + + private final List sysOaWarehouseVos= new ArrayList<>(); private final StringBuilder successMsg = new StringBuilder(); private final StringBuilder failureMsg = new StringBuilder(); @@ -119,4 +122,5 @@ public class SysOaWarehouseListener extends AnalysisEventListener selectListVoPage(@Param("page") Page build, @Param(Constants.WRAPPER) QueryWrapper lqw); + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaTaskUserMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaTaskUserMapper.java deleted file mode 100644 index 52c74a0..0000000 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaTaskUserMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ruoyi.oa.mapper; - -import com.ruoyi.oa.domain.SysOaTaskUser; -import com.ruoyi.oa.domain.vo.SysOaTaskUserVo; -import com.ruoyi.common.core.mapper.BaseMapperPlus; - -/** - * 任务工人Mapper接口 - * - * @author hdka - * @date 2024-11-09 - */ -public interface SysOaTaskUserMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaClaimService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaClaimService.java index 0a5578c..6601afb 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaClaimService.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaClaimService.java @@ -53,4 +53,7 @@ public interface ISysOaClaimService { * @return vo对象 */ SysOaClaimVo queryByProcInsId(String procInsId); + + TableDataInfo queryPageListByMoney(SysOaClaimBo bo, PageQuery pageQuery); + TableDataInfo queryPageListByClaim(SysOaClaimBo bo, PageQuery pageQuery); } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaTaskService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaTaskService.java index d7a8968..5759138 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaTaskService.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaTaskService.java @@ -61,4 +61,26 @@ public interface ISysOaTaskService { * 校验并批量删除任务管理信息 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 推迟任务申请 + * @param bo + * @return + */ + Boolean postponeTask(SysOaTaskBo bo); + + /** + * 同意推迟 + * @param bo + * @return + */ + Boolean postponeSuccess(SysOaTaskBo bo); + + /** + * 我的任务查询 + * @param bo + * @param pageQuery + * @return + */ + TableDataInfo queryPageListOwn(SysOaTaskBo bo, PageQuery pageQuery); } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaTaskUserService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaTaskUserService.java deleted file mode 100644 index b5f506c..0000000 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaTaskUserService.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.ruoyi.oa.service; - -import com.ruoyi.oa.domain.vo.SysOaTaskUserVo; -import com.ruoyi.oa.domain.bo.SysOaTaskUserBo; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.domain.PageQuery; - -import java.util.Collection; -import java.util.List; - -/** - * 任务工人Service接口 - * - * @author hdka - * @date 2024-11-09 - */ -public interface ISysOaTaskUserService { - - /** - * 查询任务工人 - */ - SysOaTaskUserVo queryById(Long taskId); - - /** - * 查询任务工人列表 - */ - TableDataInfo queryPageList(SysOaTaskUserBo bo, PageQuery pageQuery); - - /** - * 查询任务工人列表 - */ - List queryList(SysOaTaskUserBo bo); - - /** - * 新增任务工人 - */ - Boolean insertByBo(SysOaTaskUserBo bo); - - /** - * 修改任务工人 - */ - Boolean updateByBo(SysOaTaskUserBo bo); - - /** - * 校验并批量删除任务工人信息 - */ - Boolean deleteWithValidByIds(Collection ids, Boolean isValid); -} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaClaimServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaClaimServiceImpl.java index 1150c14..51dbdc9 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaClaimServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaClaimServiceImpl.java @@ -63,6 +63,25 @@ public class SysOaClaimServiceImpl implements ISysOaClaimService { return baseMapper.selectSysOaClaimVoByProcInsId(procInsId); } + @Override + public TableDataInfo queryPageListByMoney(SysOaClaimBo bo, PageQuery pageQuery) { + bo.setUserId(LoginHelper.getUserId()); + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.isNull(SysOaClaim::getEndTime); + Page result = baseMapper.selectPageVo(pageQuery.build(), lqw); + return TableDataInfo.build(result); + + } + + @Override + public TableDataInfo queryPageListByClaim(SysOaClaimBo bo, PageQuery pageQuery) { + bo.setUserId(LoginHelper.getUserId()); + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.isNotNull(SysOaClaim::getEndTime); + Page result = baseMapper.selectPageVo(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + /** * 查询差旅费报销列表 */ @@ -89,7 +108,6 @@ public class SysOaClaimServiceImpl implements ISysOaClaimService { lqw.eq(bo.getUserId() != null, SysOaClaim::getUserId, bo.getUserId()); lqw.eq(StringUtils.isNotBlank(bo.getFileIds()), SysOaClaim::getFileIds, bo.getFileIds()); lqw.eq(bo.getStartTime() != null, SysOaClaim::getStartTime, bo.getStartTime()); - lqw.eq(bo.getEndTime() != null, SysOaClaim::getEndTime, bo.getEndTime()); lqw.eq(bo.getTripDays() != null, SysOaClaim::getTripDays, bo.getTripDays()); lqw.eq(bo.getCost() != null, SysOaClaim::getCost, bo.getCost()); lqw.eq(bo.getDetailNumber() != null, SysOaClaim::getDetailNumber, bo.getDetailNumber()); @@ -122,12 +140,12 @@ public class SysOaClaimServiceImpl implements ISysOaClaimService { add.setFileIds(fileIdsString); add.setUserId(LoginHelper.getUserId()); boolean flag = baseMapper.insert(add) > 0; - - for (SysOaClaimDetailBo sysOaClaimDetail : bo.getClaimDetailList()) { - sysOaClaimDetail.setClaimId(add.getClaimId()); - sysOaClaimDetailService.insertByBo(sysOaClaimDetail); + if(bo.getClaimDetailList() != null && !bo.getClaimDetailList().isEmpty()) { + for (SysOaClaimDetailBo sysOaClaimDetail : bo.getClaimDetailList()) { + sysOaClaimDetail.setClaimId(add.getClaimId()); + sysOaClaimDetailService.insertByBo(sysOaClaimDetail); + } } - if (flag) { bo.setClaimId(add.getClaimId()); } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaRemindServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaRemindServiceImpl.java index b198557..34058b7 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaRemindServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaRemindServiceImpl.java @@ -88,7 +88,6 @@ public class SysOaRemindServiceImpl implements ISysOaRemindService { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.like(StringUtils.isNotBlank(bo.getTaskTitle()), SysOaRemind::getTaskTitle, bo.getTaskTitle()); -// lqw.eq(bo.getTaskTime() != null, SysOaRemind::getTaskTime, bo.getTaskTime()); lqw.eq(StringUtils.isNotBlank(bo.getTaskStatus()), SysOaRemind::getTaskStatus, bo.getTaskStatus()); lqw.between(params.get("beginTime") != null && params.get("endTime") != null, SysOaRemind::getTaskTime, params.get("beginTime"), params.get("endTime")); lqw.orderByDesc(SysOaRemind::getCreateTime); diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java index 8274232..383059d 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskServiceImpl.java @@ -2,6 +2,7 @@ package com.ruoyi.oa.service.impl; import cn.dev33.satoken.fun.SaParamRetFunction; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictType; @@ -17,13 +18,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.oa.domain.SysOaAttendance; import com.ruoyi.oa.domain.SysOaTaskUser; import com.ruoyi.oa.domain.bo.SysOaAttendanceBo; -import com.ruoyi.oa.domain.bo.SysOaTaskUserBo; import com.ruoyi.oa.domain.vo.SysOaAttendanceVo; import com.ruoyi.oa.domain.vo.SysOaTaskUserVo; import com.ruoyi.oa.domain.vo.SysUserVo; -import com.ruoyi.oa.mapper.SysOaTaskUserMapper; import com.ruoyi.oa.service.ISysOaAttendanceService; -import com.ruoyi.oa.service.ISysOaTaskUserService; import com.ruoyi.system.service.ISysDictTypeService; import com.ruoyi.system.service.ISysUserService; import liquibase.pro.packaged.A; @@ -53,11 +51,6 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService { private final ISysDictTypeService dictTypeService; - @Autowired - private ISysOaTaskUserService taskUserService; - - @Autowired - private SysOaTaskUserMapper taskUserMapper; @Autowired private ISysUserService userService; @@ -78,10 +71,19 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService { */ @Override public TableDataInfo queryPageList(SysOaTaskBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - //查询当前用户下的数据列表 - lqw.eq(StringUtils.isNotBlank(LoginHelper.getLoginUser().getUsername()), SysOaTask::getCreateBy,LoginHelper.getLoginUser().getUsername()); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + QueryWrapper lqw = buildQueryWrapper(bo); + lqw.orderByDesc("sot.task_rank"); + lqw.orderByDesc("sot.create_time"); + Page result = baseMapper.selectListVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public TableDataInfo queryPageListOwn(SysOaTaskBo bo, PageQuery pageQuery) { + QueryWrapper lqw = buildQueryWrapper(bo); + lqw.orderByDesc("sot.own_rank"); + lqw.orderByDesc("sot.create_time"); + Page result = baseMapper.selectListVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -132,46 +134,9 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService { */ @Override public List queryListByType(SysOaTaskBo bo){ - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - lqw.eq(StringUtils.isNotEmpty(bo.getProjectId().toString()), SysOaTask::getProjectId, bo.getProjectId()); - lqw.eq(StringUtils.isNotBlank(bo.getTaskType()),SysOaTask::getTaskType, bo.getTaskType()); + QueryWrapper lqw = buildQueryWrapper(bo); + lqw.eq(StringUtils.isNotBlank(bo.getTaskType()),"sot.task_type", bo.getTaskType()); List sysOaTaskVos = baseMapper.selectVoList(lqw); - Long projectId = bo.getProjectId(); - - // 添加负责人列表 - for (SysOaTaskVo sysOaTaskVo : sysOaTaskVos) { - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(SysOaTaskUser::getTaskId, sysOaTaskVo.getTaskId()); - List sysOaTaskUserVos = taskUserMapper.selectVoList(lambdaQueryWrapper); - List sysUserList = new ArrayList<>(); - - // 计算总成本 - Double projectCostTotal = 0.0; - - for (SysOaTaskUserVo sysOaTaskUserVo : sysOaTaskUserVos) { - SysUser sysUser = userService.selectUserById(sysOaTaskUserVo.getUserId()); - - // 查询当前用户对于此项目的工作时长 - SysOaAttendanceBo attendance = new SysOaAttendanceBo(); - attendance.setUserId(sysOaTaskUserVo.getUserId()); - attendance.setProjectId(projectId); - - List sysOaAttendanceVos = attendanceService.queryList(attendance); - - // 写入时间 - Double workTime = 0.0; - for (SysOaAttendanceVo sysOaAttendanceVo : sysOaAttendanceVos) { - workTime+=sysOaAttendanceVo.getDayLength(); - } - - projectCostTotal+=workTime*sysUser.getLaborCost(); - sysUser.setWorkTime(workTime); - - sysUserList.add(sysUser); - } - sysOaTaskVo.setWorkerList(sysUserList); - sysOaTaskVo.setProjectCostTotal(projectCostTotal); - } return sysOaTaskVos; } @@ -180,17 +145,23 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService { */ @Override public List queryList(SysOaTaskBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + QueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(SysOaTaskBo bo) { + private QueryWrapper buildQueryWrapper(SysOaTaskBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getProjectId().toString()), SysOaTask::getProjectId, bo.getProjectId()); - lqw.eq(StringUtils.isNotBlank(bo.getTaskType()), SysOaTask::getTaskType, bo.getTaskType()); - lqw.like(StringUtils.isNotBlank(bo.getTaskTitle()), SysOaTask::getTaskTitle, bo.getTaskTitle()); - lqw.orderByDesc(SysOaTask::getCreateTime); + QueryWrapper lqw = Wrappers.query(); + lqw.eq("sot.del_flag", 0); + lqw.eq(bo.getProjectId()!=null, "sot.project_id", bo.getProjectId()); + lqw.eq(bo.getCreateUserId()!=null, "sot.create_user_id", bo.getCreateUserId()); + lqw.eq(bo.getWorkerId()!=null, "sot.worker_id", bo.getWorkerId()); + lqw.eq(bo.getProjectId()!=null, "sot.project_id", bo.getProjectId()); + lqw.eq(bo.getProjectNum()!=null, "sop.project_num", bo.getProjectNum()); + lqw.like(bo.getTaskTitle()!=null, "sot.task_title", bo.getTaskTitle()); + lqw.like(bo.getCreateUserNickName()!=null, "su1.nick_name", bo.getCreateUserNickName()); + lqw.like(bo.getWorkerNickName()!=null, "su2.nick_name", bo.getWorkerNickName()); + return lqw; } @@ -199,19 +170,28 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService { */ @Override public Boolean insertByBo(SysOaTaskBo bo) { - SysOaTask add = BeanUtil.toBean(bo, SysOaTask.class); - validEntityBeforeSave(add); - boolean flag = baseMapper.insert(add) > 0; - if (flag) { - bo.setTaskId(add.getTaskId()); - List workerIdList = bo.getWorkerList(); - for (Long userId : workerIdList) { - SysOaTaskUserBo sysOaTaskUserBo = new SysOaTaskUserBo(); - sysOaTaskUserBo.setUserId(userId); - sysOaTaskUserBo.setTaskId(add.getTaskId()); - taskUserService.insertByBo(sysOaTaskUserBo); + + // 拿到所有的执行人id列表进行遍历添加 + List workerIdList = Arrays.stream( bo.getWorkerIds().split(",")) + .map(Long::valueOf) + .collect(Collectors.toList()); + boolean flag = false; + for (Long workerId : workerIdList) { + SysOaTask add = BeanUtil.toBean(bo, SysOaTask.class); + add.setCreateUserId(LoginHelper.getUserId()); + validEntityBeforeSave(add); + add.setOriginFinishTime(add.getFinishTime()); + add.setWorkerId(workerId); + flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTaskId(add.getTaskId()); + } + // 判断是否为报工模式 + if (bo.getStatus()==1L){ + // TODO 这里新增item数据，为单个条目 } } + return flag; } @@ -220,19 +200,9 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService { */ @Override public Boolean updateByBo(SysOaTaskBo bo) { + // 先删除所有的bo然后再次进行新增操作 SysOaTask update = BeanUtil.toBean(bo, SysOaTask.class); - - // 先将该任务底下所属的所有工人信息删除 - taskUserMapper.deleteById(update.getTaskId()); - // 再进行重新新增 - List workerIdList = bo.getWorkerList(); - for (Long userId : workerIdList) { - SysOaTaskUserBo sysOaTaskUserBo = new SysOaTaskUserBo(); - sysOaTaskUserBo.setUserId(userId); - sysOaTaskUserBo.setTaskId(update.getTaskId()); - taskUserService.insertByBo(sysOaTaskUserBo); - } validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } @@ -254,4 +224,32 @@ public class SysOaTaskServiceImpl implements ISysOaTaskService { } return baseMapper.deleteBatchIds(ids) > 0; } + + /** + * 推迟任务state=15代表申请延期 + * @param bo + * @return + */ + @Override + public Boolean postponeTask(SysOaTaskBo bo) { + // 将时间交换位置，减少查询数据库次数 + bo.setFinishTime(bo.getTempTime()); + bo.setState(15L); + return updateByBo(bo); + } + + /** + * 20为同 + * @param bo + * @return + */ + @Override + public Boolean postponeSuccess(SysOaTaskBo bo) { + SysOaTask sysOaTask = baseMapper.selectById(bo.getTaskId()); + sysOaTask.setState(0L); + sysOaTask.setPostponements(sysOaTask.getPostponements() + 1); + return baseMapper.updateById(sysOaTask) > 0; + } + + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskUserServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskUserServiceImpl.java deleted file mode 100644 index f214051..0000000 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaTaskUserServiceImpl.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.ruoyi.oa.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.domain.PageQuery; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import com.ruoyi.oa.domain.bo.SysOaTaskUserBo; -import com.ruoyi.oa.domain.vo.SysOaTaskUserVo; -import com.ruoyi.oa.domain.SysOaTaskUser; -import com.ruoyi.oa.mapper.SysOaTaskUserMapper; -import com.ruoyi.oa.service.ISysOaTaskUserService; - -import java.util.List; -import java.util.Map; -import java.util.Collection; - -/** - * 任务工人Service业务层处理 - * - * @author hdka - * @date 2024-11-09 - */ -@RequiredArgsConstructor -@Service -public class SysOaTaskUserServiceImpl implements ISysOaTaskUserService { - - private final SysOaTaskUserMapper baseMapper; - - /** - * 查询任务工人 - */ - @Override - public SysOaTaskUserVo queryById(Long taskId){ - return baseMapper.selectVoById(taskId); - } - - /** - * 查询任务工人列表 - */ - @Override - public TableDataInfo queryPageList(SysOaTaskUserBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } - - /** - * 查询任务工人列表 - */ - @Override - public List queryList(SysOaTaskUserBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(SysOaTaskUserBo bo) { - Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getUserId() != null, SysOaTaskUser::getUserId, bo.getUserId()); - return lqw; - } - - /** - * 新增任务工人 - */ - @Override - public Boolean insertByBo(SysOaTaskUserBo bo) { - SysOaTaskUser add = BeanUtil.toBean(bo, SysOaTaskUser.class); - validEntityBeforeSave(add); - boolean flag = baseMapper.insert(add) > 0; - if (flag) { - bo.setTaskId(add.getTaskId()); - } - return flag; - } - - /** - * 修改任务工人 - */ - @Override - public Boolean updateByBo(SysOaTaskUserBo bo) { - SysOaTaskUser update = BeanUtil.toBean(bo, SysOaTaskUser.class); - validEntityBeforeSave(update); - return baseMapper.updateById(update) > 0; - } - - /** - * 保存前的数据校验 - */ - private void validEntityBeforeSave(SysOaTaskUser entity){ - //TODO 做一些数据校验,如唯一约束 - } - - /** - * 批量删除任务工人 - */ - @Override - public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ - //TODO 做一些业务上的校验,判断是否需要校验 - } - return baseMapper.deleteBatchIds(ids) > 0; - } -} diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml index acb43b9..28a2c4b 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskMapper.xml @@ -30,4 +30,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskUserMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskUserMapper.xml deleted file mode 100644 index c26f2da..0000000 --- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaTaskUserMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java index ed8549a..a90e364 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java @@ -227,6 +227,7 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce } }); } + taskVoList.add(taskVo); } page.setRecords(taskVoList); @@ -738,12 +739,12 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce public String commonStart(String category) { try { - List processDefinition = repositoryService.createProcessDefinitionQuery() - .processDefinitionCategory(category).list(); + ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery() + .processDefinitionCategory(category).latestVersion().singleResult(); // 传个空参进去，不破坏其他模型 Map variables = new HashMap(); // 拿到最新版本的模型 - return startProcess(processDefinition.get(processDefinition.size()-1), variables); + return startProcess(processDefinition, variables); } catch (Exception e) { e.printStackTrace(); throw new ServiceException("流程启动错误");