diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAGoOutController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAGoOutController.java new file mode 100644 index 00000000..6b76c3fd --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAGoOutController.java @@ -0,0 +1,62 @@ +package cn.iocoder.yudao.module.bpm.controller.admin.oa; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.goOut.BpmOAGoOutCreateReqVO; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.goOut.BpmOAGoOutRespVO; +import cn.iocoder.yudao.module.bpm.convert.oa.BpmOAGoOutConvert; +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAGoOutDO; +import cn.iocoder.yudao.module.bpm.service.oa.BpmOAGoOutService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.validation.Valid; + +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; + +/** + * OA 外出申请 Controller + * + * @author 符溶馨 + */ +@Tag(name = "管理后台 - OA 外出申请") +@RestController +@RequestMapping("/bpm/oa/goOut") +@Validated +public class BpmOAGoOutController { + + @Resource + private BpmOAGoOutService goOutService; + + + + @PostMapping("/create") + @Operation(summary = "创建外出申请") + public CommonResult createGoOut(@Valid @RequestBody BpmOAGoOutCreateReqVO createReqVO) { + + return success(goOutService.createGoOut(getLoginUserId(), createReqVO)); + } + + @GetMapping("/get") + @Operation(summary = "获得入职申请") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + public CommonResult getGoOut(@RequestParam("id") Long id) { + + BpmOAGoOutDO goOut = goOutService.getGoOut(id); + + return success(BpmOAGoOutConvert.INSTANCE.convert(goOut)); + } + + @GetMapping("/getByProcessInstanceId") + @Operation(summary = "获得外出申请") + @Parameter(name = "processInstanceId", description = "流程实例编号", required = true, example = "1024") + public CommonResult getByProcessInstanceId(@RequestParam("processInstanceId") String processInstanceId) { + + BpmOAGoOutDO goOut = goOutService.getByProcessInstanceId(processInstanceId); + return success(BpmOAGoOutConvert.INSTANCE.convert(goOut)); + } +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutCreateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutCreateReqVO.java new file mode 100644 index 00000000..60ba9eff --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutCreateReqVO.java @@ -0,0 +1,47 @@ +package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.goOut; + +import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; +import java.util.List; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +/** + * 出差申请 创建 Request VO + * + * @author 符溶馨 + */ +@Schema(description = "管理后台 - 出差申请创建 Request VO") +@Data +@EqualsAndHashCode() +@ToString(callSuper = true) +public class BpmOAGoOutCreateReqVO { + + @Schema(description = "外出事由", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "外出事由不能为空") + private String reason; + + @Schema(description = "外出地点") + private String location; + + @Schema(description = "外出的开始时间", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "开始时间不能为空") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime startTime; + + @Schema(description = "流程实例编号") + private String processInstanceId; + + @Schema(description = "状态-参见 bpm_process_instance_result 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private Integer result; + + @Schema(description = "上传文件", requiredMode = Schema.RequiredMode.REQUIRED) + private List fileItems; +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutRespVO.java new file mode 100644 index 00000000..17ee707d --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/goOut/BpmOAGoOutRespVO.java @@ -0,0 +1,45 @@ +package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.goOut; + +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOABaseRespVO; +import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; +import java.util.List; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +/** + * 出差申请 创建 Request VO + * + * @author 符溶馨 + */ +@Schema(description = "管理后台 - 出差申请创建 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class BpmOAGoOutRespVO extends BpmOABaseRespVO { + + @Schema(description = "外出事由") + private String reason; + + @Schema(description = "外出地点") + private String location; + + @Schema(description = "外出的开始时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime startTime; + + @Schema(description = "流程实例编号") + private String processInstanceId; + + @Schema(description = "状态-参见 bpm_process_instance_result 枚举", example = "1") + private Integer result; + + @Schema(description = "上传文件") + private List fileItems; +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/oa/BpmOAGoOutConvert.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/oa/BpmOAGoOutConvert.java new file mode 100644 index 00000000..aad1bb45 --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/oa/BpmOAGoOutConvert.java @@ -0,0 +1,22 @@ +package cn.iocoder.yudao.module.bpm.convert.oa; + +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.goOut.BpmOAGoOutCreateReqVO; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.goOut.BpmOAGoOutRespVO; +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAGoOutDO; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * 外出申请 Convert + * + * @author 符溶馨 + */ +@Mapper +public interface BpmOAGoOutConvert { + + BpmOAGoOutConvert INSTANCE = Mappers.getMapper(BpmOAGoOutConvert.class); + + BpmOAGoOutDO convert(BpmOAGoOutCreateReqVO bean); + + BpmOAGoOutRespVO convert(BpmOAGoOutDO bean); +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAGoOutDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAGoOutDO.java new file mode 100644 index 00000000..1ca85355 --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAGoOutDO.java @@ -0,0 +1,76 @@ +package cn.iocoder.yudao.module.bpm.dal.dataobject.oa; + +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; +import lombok.*; + +import java.time.LocalDateTime; +import java.util.List; + +/** + * OA 外出申请 DO + * + * + * @author 符溶馨 + + */ +@TableName(value ="bpm_oa_go_out", autoResultMap = true) +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class BpmOAGoOutDO extends BaseDO { + + /** + * 出差表单主键 + */ + @TableId + private Long id; + + /** + * 申请人的用户编号 + * 关联 AdminUserDO 的 id 属性 + */ + private Long userId; + + /** + * 外出事由 + */ + private String reason; + + /** + * 外出地点 + */ + private String location; + + /** + * 开始时间 + */ + private LocalDateTime startTime; + + /** + * 出差的结果 + * 枚举 {@link BpmProcessInstanceResultEnum} + * 考虑到简单,所以直接复用了 BpmProcessInstanceResultEnum 枚举,也可以自己定义一个枚举哈 + */ + private Integer result; + + /** + * 对应的流程编号 + * 关联 ProcessInstance 的 id 属性 + */ + private String processInstanceId; + + /** + * 附件基本信息 + */ + @TableField(typeHandler = JacksonTypeHandler.class) + private List fileItems ; +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOAGoOutMapper.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOAGoOutMapper.java new file mode 100644 index 00000000..fbb170b9 --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOAGoOutMapper.java @@ -0,0 +1,14 @@ +package cn.iocoder.yudao.module.bpm.dal.mysql.oa; + +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAGoOutDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 外出申请 Mapper + * + * @author 符溶馨 + */ +@Mapper +public interface BpmOAGoOutMapper extends BaseMapperX { +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAGoOutService.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAGoOutService.java new file mode 100644 index 00000000..1e88459c --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAGoOutService.java @@ -0,0 +1,37 @@ +package cn.iocoder.yudao.module.bpm.service.oa; + +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.goOut.BpmOAGoOutCreateReqVO; +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAGoOutDO; + +public interface BpmOAGoOutService { + + /** + * 创建外出申请 + * @param loginUserId 登录用户ID + * @param createReqVO 创建信息 + * @return 外出申请ID + */ + Long createGoOut(Long loginUserId, BpmOAGoOutCreateReqVO createReqVO); + + /** + * 更新外出申请的状态 + * + * @param id 编号 + * @param result 结果 + */ + void updateGoOutResult(String processInstanceId, Long id, Integer result); + + /** + * 获得外出申请 + * @param processInstanceId 流程实例编号 + * @return 外出申请 + */ + BpmOAGoOutDO getByProcessInstanceId(String processInstanceId); + + /** + * 获得外出申请 + * @param id 外出申请ID + * @return 外出申请 + */ + BpmOAGoOutDO getGoOut(Long id); +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAGoOutServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAGoOutServiceImpl.java new file mode 100644 index 00000000..7609e2ff --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAGoOutServiceImpl.java @@ -0,0 +1,123 @@ +package cn.iocoder.yudao.module.bpm.service.oa; + +import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.goOut.BpmOAGoOutCreateReqVO; +import cn.iocoder.yudao.module.bpm.controller.admin.upload.UploadUserFile; +import cn.iocoder.yudao.module.bpm.convert.oa.BpmOAGoOutConvert; +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAGoOutDO; +import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOAGoOutMapper; +import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; +import cn.iocoder.yudao.module.bpm.service.task.BpmHistoryProcessInstanceService; +import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService; +import cn.iocoder.yudao.module.system.api.user.AdminUserApi; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_GOOut_NOT_EXISTS; + +/** + * OA 外出申请 Service 实现类 + * + * @author 符溶馨 + + */ +@Service +@Validated +public class BpmOAGoOutServiceImpl extends BpmOABaseService implements BpmOAGoOutService{ + + /** + * OA 外出对应的流程定义 KEY + */ + public static final String PROCESS_KEY = "oa_go_out_2"; + + @Resource + private BpmOAGoOutMapper goOutMapper; + + @Resource + private BpmProcessInstanceService processInstanceService; + + @Resource + private BpmHistoryProcessInstanceService historyProcessInstanceService; + + @Resource + private AdminUserApi userApi; + + @Override + public Long createGoOut(Long userId, BpmOAGoOutCreateReqVO createReqVO) { + + //插入OA 出差申请 + BpmOAGoOutDO goOut = BpmOAGoOutConvert.INSTANCE.convert(createReqVO).setUserId(userId) + .setResult(BpmProcessInstanceResultEnum.PROCESS.getResult()); + goOutMapper.insert(goOut) ; + + // 发起 BPM 流程 + Map processInstanceVariables = new HashMap<>(); + String processInstanceId = processInstanceService.createProcessInstance(userId, + new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY) + .setVariables(processInstanceVariables).setBusinessKey(String.valueOf(goOut.getId()))); + + // 将工作流的编号,更新到 OA 请假单中 + goOutMapper.updateById(new BpmOAGoOutDO().setId(goOut.getId()).setProcessInstanceId(processInstanceId)); + + // 判断是否为重新发起的流程 + if (processInstanceId != null && createReqVO.getResult() == 3) { + + historyProcessInstanceService.createHistoryProcessInstance(processInstanceId, createReqVO.getProcessInstanceId()); + } + + List fileItems = createReqVO.getFileItems() ; + //这里的逻辑,如果fileItems不为空,且有数据,那么说明是上传了附件的,则需要更工作流文件表对应的实例Id + if (fileItems != null && !fileItems.isEmpty()) { + uploadBpmFileProcessInstanceId(processInstanceId,fileItems) ; + } + + // 发起外出申请后,设置外勤打卡权限 + userApi.updateFieldwork(getLoginUserId(), 1); + + return goOut.getId(); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void updateGoOutResult(String processInstanceId, Long id, Integer result) { + validateLeaveExists(id); + + // -- 自己取消 + // -- 审核拒绝 + //所有关联的采购申请改为 未支付状态 + if (BpmProcessInstanceResultEnum.REJECT.getResult().equals(result) + || BpmProcessInstanceResultEnum.CANCEL.getResult().equals(result) + || BpmProcessInstanceResultEnum.BACK.getResult().equals(result)) { + + // 发起外出申请后,设置关闭外勤打卡权限 + userApi.updateFieldwork(getLoginUserId(), 0); + } + + goOutMapper.updateById(new BpmOAGoOutDO().setId(id).setResult(result)); + } + + @Override + public BpmOAGoOutDO getByProcessInstanceId(String processInstanceId) { + + return goOutMapper.selectOne(BpmOAGoOutDO::getProcessInstanceId, processInstanceId); + } + + @Override + public BpmOAGoOutDO getGoOut(Long id) { + return goOutMapper.selectById(id); + } + + private void validateLeaveExists(Long id) { + if (goOutMapper.selectById(id) == null) { + throw exception(OA_GOOut_NOT_EXISTS); + } + } +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/BpmOAGoOutResultListener.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/BpmOAGoOutResultListener.java new file mode 100644 index 00000000..fcf5f046 --- /dev/null +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/BpmOAGoOutResultListener.java @@ -0,0 +1,31 @@ +package cn.iocoder.yudao.module.bpm.service.oa.listener; + +import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEvent; +import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEventListener; +import cn.iocoder.yudao.module.bpm.service.oa.BpmOAGoOutService; +import cn.iocoder.yudao.module.bpm.service.oa.BpmOAGoOutServiceImpl; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * OA 外出申请单的结果的监听器实现类 + * + * @author 符溶馨 + */ +@Component +public class BpmOAGoOutResultListener extends BpmProcessInstanceResultEventListener { + + @Resource + private BpmOAGoOutService goOutService; + + @Override + protected String getProcessDefinitionKey() { + return BpmOAGoOutServiceImpl.PROCESS_KEY; + } + + @Override + protected void onEvent(BpmProcessInstanceResultEvent event) { + goOutService.updateGoOutResult(event.getId(), Long.parseLong(event.getBusinessKey()), event.getResult()); + } +}