功能优化

ruoyi-api/ruoyi-api-server/src/main/java/org/dromara/server/api/RemoteProcessService.java

+package org.dromara.server.api;
+
+
+/**
+ * @author wenhe
+ */
+public interface RemoteProcessService {
+
+    /**
+     * 创建默认审批流程配置
+     *
+     * @param tenantId 租户id
+     * @return boolean
+     */
+    boolean createDefaultProcessConfig(String tenantId);
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/ProcessConfigController.java

 package org.dromara.server.controller;
 
-import java.util.List;
-
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.common.log.annotation.Log;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.common.mybatis.core.page.PageQuery;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.server.domain.vo.ProcessConfigVo;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.server.constant.ProcessKey;
 import org.dromara.server.domain.bo.ProcessConfigBo;
+import org.dromara.server.domain.vo.ProcessConfigVo;
 import org.dromara.server.service.IProcessConfigService;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 流程配置
@@ -65,10 +67,23 @@ public class ProcessConfigController extends BaseController {
     @SaCheckPermission("server:config:query")
     @GetMapping("/{id}")
     public R<ProcessConfigVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
+                                      @PathVariable Long id) {
         return R.ok(processConfigService.queryById(id));
     }
 
+
+    /**
+     * 获取流程配置详细信息
+     *
+     * @param processKey 流程key
+     * @return 流程配置
+     */
+    @GetMapping("/processKey")
+    public R<ProcessConfigVo> getInfo(@NotNull(message = "流程key不能为空")
+                                      @RequestBody String processKey) {
+        return R.ok(processConfigService.getOne(new ProcessConfigBo().setProcessKey(processKey)));
+    }
+
     /**
      * 新增流程配置
      */
@@ -103,4 +118,17 @@ public class ProcessConfigController extends BaseController {
                           @PathVariable Long[] ids) {
         return toAjax(processConfigService.deleteWithValidByIds(List.of(ids), true));
     }
+
+    /**
+     * 创建默认流程配置
+     *
+     * @param tenantId 租户id
+     * @return R<Void>
+     */
+    @PostMapping("/createConfig")
+    public R<Void> createConfig(@RequestBody String tenantId) {
+        processConfigService.createDefaultProcessConfig(ProcessKey.PROCESS_KEY_TRAVEL.getKey(), tenantId);
+        return R.ok();
+    }
+
 }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/ProcessApprove.java

@@ -3,8 +3,6 @@ package org.dromara.server.domain;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.tenant.core.TenantEntity;
 
 import java.io.Serial;
 import java.util.Date;
@@ -16,9 +14,8 @@ import java.util.Date;
  * @date 2024-12-11
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @TableName("process_approve")
-public class ProcessApprove extends TenantEntity {
+public class ProcessApprove  {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/ProcessProgress.java

 package org.dromara.server.domain;
 
-import lombok.experimental.Accessors;
-import org.dromara.common.tenant.core.TenantEntity;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 
 import java.io.Serial;
 
@@ -16,9 +15,8 @@ import java.io.Serial;
  */
 @Data
 @Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
 @TableName("process_progress")
-public class ProcessProgress extends TenantEntity {
+public class ProcessProgress {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -69,11 +67,4 @@ public class ProcessProgress extends TenantEntity {
      */
     private String approveUserName;
 
-    /**
-     * 删除标志（0代表存在 2代表删除）
-     */
-    @TableLogic
-    private String delFlag;
-
-
 }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/bo/ProcessConfigBo.java

 package org.dromara.server.domain.bo;
 
+import lombok.experimental.Accessors;
 import org.dromara.server.domain.ProcessConfig;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
@@ -16,6 +17,7 @@ import jakarta.validation.constraints.*;
  * @date 2024-12-11
  */
 @Data
+@Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = ProcessConfig.class, reverseConvertGenerate = false)
 public class ProcessConfigBo extends BaseEntity {

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/dubbo/RemoteProcessServiceImpl.java

+package org.dromara.server.dubbo;
+
+import lombok.RequiredArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.dromara.server.api.RemoteProcessService;
+import org.dromara.server.constant.ProcessKey;
+import org.dromara.server.service.IProcessConfigService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 流程服务
+ *
+ * @author hzh
+ */
+@RequiredArgsConstructor
+@Service
+@DubboService
+public class RemoteProcessServiceImpl implements RemoteProcessService {
+
+    private final IProcessConfigService processConfigService;
+
+    @Override
+    public boolean createDefaultProcessConfig(String tenantId) {
+        return processConfigService.createDefaultProcessConfig(ProcessKey.PROCESS_KEY_TRAVEL.getKey(), tenantId);
+    }
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/ApplyServiceImpl.java

@@ -92,6 +92,13 @@ public class ApplyServiceImpl extends AbstractBaseService<ApplyVo, ApplyBo, Appl
                 ApplyPerson ap = MapstructUtils.convert(person, ApplyPerson.class);
                 applyPersonMapper.insert(ap);
             }
+            processProgressService.setNextApproveUserList(ProcessKey.PROCESS_KEY_TRAVEL.getKey(), apply.getId());
+
+            ProcessApproveStatus approveStatus = processProgressService.getApproveStatus(ProcessKey.PROCESS_KEY_TRAVEL.getKey(), apply.getId());
+            if (StringUtils.equals(approveStatus.name(), ProcessApproveStatus.END.name())) {
+                apply.setStatus(ApplyStatus.FINISH.getCode());
+                baseMapper.updateById(apply);
+            }
         }
         return result;
     }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java

@@ -9,7 +9,9 @@ import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.seata.spring.annotation.GlobalTransactional;
 import lombok.RequiredArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.constant.Constants;
 import org.dromara.common.core.constant.TenantConstants;
@@ -23,6 +25,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.redis.utils.CacheUtils;
 import org.dromara.common.tenant.core.TenantEntity;
 import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.server.api.RemoteProcessService;
 import org.dromara.system.domain.*;
 import org.dromara.system.domain.bo.SysTenantBo;
 import org.dromara.system.domain.vo.SysTenantVo;
@@ -57,6 +60,8 @@ public class SysTenantServiceImpl implements ISysTenantService {
     private final SysDictDataMapper dictDataMapper;
     private final SysConfigMapper configMapper;
     private final ISysUserService userService;
+    @DubboReference
+    private final RemoteProcessService remoteProcessService;
 
     /**
      * 查询租户
@@ -116,7 +121,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
      * 新增租户
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
     public Boolean insertByBo(SysTenantBo bo) {
         SysTenant add = MapstructUtils.convert(bo, SysTenant.class);
 
@@ -159,8 +164,12 @@ public class SysTenantServiceImpl implements ISysTenantService {
         user.setDeptId(deptId);
         userMapper.insert(user);
 
+        // 同步到云服务用户
         userService.saveOrUpdateYsUser(user);
 
+        //创建审批流程
+        remoteProcessService.createDefaultProcessConfig(tenantId);
+
         //新增系统用户后，默认当前用户为部门的负责人
         SysDept sd = new SysDept();
         sd.setLeader(user.getUserId());