Merge branch 'dev-补录附件' of http://git.znkjfw.com/ak/zn-cloud into dev

2025-07-01 10:23:27 +08:00 · 2025-07-01 10:23:27 +08:00 · 608accbc8c
commit 608accbc8c
parent 2a08243491 64baec0471
4 changed files with 147 additions and 0 deletions
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/attachment/BpmOAAttachmentReqVO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/attachment/BpmOAAttachmentReqVO.java
@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.attachment;
+
+import cn.iocoder.yudao.framework.common.pojo.UploadUserFile;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 功能描述 补充附件请求类
+ *
+ * @author: yj
+ * @date: 2025年06月26日 14:41
+ */
+@Schema(description = "管理后台 - 补充附件 Request VO")
+@Data
+@EqualsAndHashCode()
+@ToString(callSuper = true)
+public class BpmOAAttachmentReqVO {
+
+    @Schema(description = "流程业务ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "流程业务ID")
+    private Long processBusinessId ;
+
+    @Schema(description = "流程类型", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String processType;
+
+    @Schema(description = "上传文件(包括历史的附件)", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List<UploadUserFile> fileItems;
+
+}
+
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
@ -1,18 +1,30 @@
 package cn.iocoder.yudao.module.bpm.controller.admin.task;

+import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.BpmOALeaveController;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.attachment.BpmOAAttachmentReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.print.BpmProcessInstancePrintDataReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.print.BpmProcessInstancePrintDataRespVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.*;
 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO;
 import cn.iocoder.yudao.module.bpm.convert.task.BpmTaskConvert;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.financialpayment.FinancialPaymentDO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAPetitionDO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAReimbursementDO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASealDO;
+import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOALeaveMapper;
+import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOAPetitionMapper;
+import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOAReimbursementMapper;
+import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOASealMapper;
 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
 import cn.iocoder.yudao.module.bpm.service.financialpayment.FinancialPaymentService;
 import cn.iocoder.yudao.module.bpm.service.message.BpmMessageService;
+import cn.iocoder.yudao.module.bpm.service.oa.BpmOAAttachmentService;
 import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
 import cn.iocoder.yudao.module.bpm.service.task.BpmTaskService;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@ -22,14 +34,19 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

+import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;

 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@ -189,4 +206,34 @@ public class BpmProcessInstanceController {
        return success(processInstanceService.getOAReportPrintData(reqVO));
    }

+    private final Map<String, List> entityTypeMap = new ConcurrentHashMap<>();
+
+    @PostConstruct
+    public void init() {
+        // 注册支持的实体类型
+        entityTypeMap.put("leave", new ArrayList<Class<?>>(Arrays.asList(BpmOALeaveDO.class, BpmOALeaveMapper.class)));
+        entityTypeMap.put("petition", new ArrayList<Class<?>>(Arrays.asList(BpmOAPetitionDO.class, BpmOAPetitionMapper.class)));
+        entityTypeMap.put("reimbursement", new ArrayList<Class<?>>(Arrays.asList(BpmOAReimbursementDO.class, BpmOAReimbursementMapper.class)));
+        entityTypeMap.put("seal", new ArrayList<Class<?>>(Arrays.asList(BpmOASealDO.class, BpmOASealMapper.class)));
+
+    }
+
+    @Resource
+    private BpmOAAttachmentService bpmOAAttachmentService;
+    @PostMapping("/uploadAttachment")
+    public CommonResult<?> uploadAttachment(@Valid @RequestBody BpmOAAttachmentReqVO reqVO) {
+        // 解析实体类型
+        List<Class<?>> entityClazzs = resolveEntityType(reqVO.getProcessType());
+        // 调用通用服务
+        bpmOAAttachmentService.updateAttachment(entityClazzs, reqVO.getProcessBusinessId(), reqVO.getFileItems());
+        return success("附件更新成功");
+    }
+
+    private List<Class<?>> resolveEntityType(String typeName) {
+        List<Class<?>> entityClazzs = entityTypeMap.get(typeName);
+        if (entityClazzs == null) {
+            throw new ServiceException(500, "不支持的流程类型");
+        }
+        return entityClazzs;
+    }
 }
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAAttachmentService.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAAttachmentService.java
@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.bpm.service.oa;
+
+import cn.iocoder.yudao.framework.common.pojo.UploadUserFile;
+
+import java.util.List;
+
+public interface BpmOAAttachmentService {
+
+    /**
+     * 更新业务实体的附件信息
+     * @param entityClazzs 业务实体
+     * @param entityId 业务ID
+     * @param fileItems 附件数据
+     */
+    void updateAttachment(List<Class<?>> entityClazzs, Long entityId, List<UploadUserFile> fileItems);
+
+
+}
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAAttachmentServiceImpl.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAAttachmentServiceImpl.java
@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.bpm.service.oa;
+
+import cn.hutool.extra.spring.SpringUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.pojo.UploadUserFile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import liquibase.pro.packaged.T;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.common.engine.impl.persistence.entity.EntityManager;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.lang.reflect.Method;
+import java.util.List;
+
+@Service
+@Validated
+@Slf4j
+public class BpmOAAttachmentServiceImpl implements BpmOAAttachmentService {
+
+    /**
+     * 更新业务实体的附件信息
+     * @param entityClazzs 业务实体
+     * @param entityId 业务ID
+     * @param fileItems 附件数据
+     */
+    public void updateAttachment(List<Class<?>> entityClazzs, Long entityId, List<UploadUserFile> fileItems) {
+        try {
+            // 1. 获取实体, 赋值实体类
+            Class doClass = entityClazzs.get(0) ;
+            Object entity = doClass.getDeclaredConstructor().newInstance();
+            Method setIdMethod = doClass.getMethod("setId", Long.class)  ;
+            setIdMethod.invoke(entity, entityId);
+            Method setFileItems = doClass.getMethod("setFileItems", List.class)  ;
+            setFileItems.invoke(entity, fileItems);
+            //获取MyBatist的操作类实体
+            Class mapperClass = entityClazzs.get(1) ;
+            BaseMapper mapper = (BaseMapper) SpringUtil.getBean(mapperClass);
+            mapper.updateById(entity);
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            throw new ServiceException(500, "系统异常，请联系管理员");
+        }
+    }
+}