开始作业

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workflowwork/vo/WorkflowWorkRespVO.java

@@ -1,11 +1,11 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowwork.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 作业 Response VO")
 @Data
@@ -20,6 +20,16 @@ public class WorkflowWorkRespVO {
     @ExcelProperty("作业单号")
     private String orderNo;
 
+    @Schema(description = "作业名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @ExcelProperty("作业名称")
+    private String name;
+
+    @Schema(description = "作业票类型")
+    private String type;
+
+    @Schema(description = "紧急程度")
+    private String urgencyLevel;
+
     @Schema(description = "流程设计ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15667")
     @ExcelProperty("流程设计ID")
     private Long designId;
@@ -28,14 +38,13 @@ public class WorkflowWorkRespVO {
     @ExcelProperty("流程设计名称（冗余字段）")
     private String designName;
 
-    @Schema(description = "作业名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
-    @ExcelProperty("作业名称")
-    private String name;
-
     @Schema(description = "作业内容")
     @ExcelProperty("作业内容")
     private String designContent;
 
+    @Schema(description = "作业描述")
+    private String description;
+
     @Schema(description = "发起人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4706")
     @ExcelProperty("发起人ID")
     private Long initiatorId;

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workflowwork/vo/WorkflowWorkSaveReqVO.java

@@ -1,10 +1,10 @@
 package cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowwork.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 作业新增/修改 Request VO")
@@ -14,10 +14,19 @@ public class WorkflowWorkSaveReqVO {
     @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32095")
     private Long id;
 
+    @Schema(description = "作业名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
+    @NotEmpty(message = "作业名称不能为空")
+    private String name;
+
     @Schema(description = "作业单号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "作业单号不能为空")
     private String orderNo;
 
+    @Schema(description = "作业票类型")
+    private String type;
+
+    @Schema(description = "紧急程度")
+    private String urgencyLevel;
+
     @Schema(description = "流程设计ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "15667")
     @NotNull(message = "流程设计ID不能为空")
     private Long designId;
@@ -25,22 +34,19 @@ public class WorkflowWorkSaveReqVO {
     @Schema(description = "流程设计名称（冗余字段）", example = "芋艿")
     private String designName;
 
-    @Schema(description = "作业名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
-    @NotEmpty(message = "作业名称不能为空")
-    private String name;
-
     @Schema(description = "作业内容")
     private String designContent;
 
+    @Schema(description = "作业描述")
+    private String description;
+
     @Schema(description = "发起人ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4706")
-    @NotNull(message = "发起人ID不能为空")
     private Long initiatorId;
 
     @Schema(description = "发起人姓名（冗余字段）", example = "赵六")
     private String initiatorName;
 
     @Schema(description = "发起时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "发起时间不能为空")
     private LocalDateTime initiationTime;
 
     @Schema(description = "当前执行节点ID", example = "29998")

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/controller/admin/workdesign/workflowworknode/WorkflowWorkNodeController.java

@@ -10,7 +10,7 @@ import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodeRespVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodeSaveReqVO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.WorkflowWorkNodeDO;
-import cn.iocoder.yudao.module.iscs.service.workflowworknode.WorkflowWorkNodeService;
+import cn.iocoder.yudao.module.iscs.service.workdesign.WorkflowWorkNodeService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/dataobject/workdesign/WorkflowDesignNodeDO.java

@@ -26,24 +26,36 @@ public class WorkflowDesignNodeDO extends BaseDO {
      */
     @TableId
     private Long id;
+    /**
+     * 流程设计ID
+     */
+    private Long designId;
     /**
      * uuid
      */
     private String uuid;
     /**
-     * nodeName
+     * 父节点ID
+     */
+    private String parentUuid;
+    /**
+     * 子节点ID
+     */
+    private String childrenUuid;
+    /**
+     * 名称
      */
     private String nodeName;
     /**
-     * nodeIcon
+     * 图标
      */
     private String nodeIcon;
     /**
-     * type
+     * 类型
      */
     private String type;
     /**
-     * 坐标
+     * 坐标数据
      */
     private String position;
     /**
@@ -54,14 +66,6 @@ public class WorkflowDesignNodeDO extends BaseDO {
      * 描述
      */
     private String description;
-    /**
-     * 流程设计ID
-     */
-    private Long designId;
-    /**
-     * 父节点ID（用于建立节点上下级关系，NULL表示起始节点）
-     */
-    private Long parentId;
     /**
      * 负责人ID
      */

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/dataobject/workdesign/WorkflowWorkDO.java

@@ -1,14 +1,12 @@
 package cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign;
 
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
+
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 作业 DO
@@ -34,6 +32,18 @@ public class WorkflowWorkDO extends BaseDO {
      * 作业单号
      */
     private String orderNo;
+    /**
+     * 作业名称
+     */
+    private String name;
+    /**
+     * 作业票类型(字典值)
+     */
+    private String type;
+    /**
+     * 紧急程度
+     */
+    private String urgencyLevel;
     /**
      * 流程设计ID
      */
@@ -42,14 +52,14 @@ public class WorkflowWorkDO extends BaseDO {
      * 流程设计名称（冗余字段）
      */
     private String designName;
-    /**
-     * 作业名称
-     */
-    private String name;
     /**
      * 作业内容
      */
     private String designContent;
+    /**
+     * 作业描述
+     */
+    private String description;
     /**
      * 发起人ID
      */

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/dataobject/workdesign/WorkflowWorkNodeDO.java

@@ -1,11 +1,10 @@
 package cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
 
 /**
  * 作业节点 DO
@@ -34,19 +33,15 @@ public class WorkflowWorkNodeDO extends BaseDO {
     /**
      * 节点唯一标识
      */
-    private String nodeId;
+    private String uuid;
     /**
      * 父节点ID
      */
-    private Long parentId;
-    /**
-     * 节点类型
-     */
-    private String nodeType;
+    private String parentUuid;
     /**
-     * 节点类型ID
+     * 子节点ID
      */
-    private Integer typeId;
+    private String childrenUuid;
     /**
      * 节点名称
      */
@@ -55,18 +50,22 @@ public class WorkflowWorkNodeDO extends BaseDO {
      * 节点图标
      */
     private String nodeIcon;
+    /**
+     * 节点类型
+     */
+    private String type;
     /**
      * 节点X坐标
      */
-    private Integer positionX;
+    private String position;
     /**
-     * 节点Y坐标
+     * 表单
      */
-    private Integer positionY;
+    private String data;
     /**
-     * 表单ID
+     * 描述
      */
-    private Long formId;
+    private String description;
     /**
      * 负责人ID
      */
@@ -75,6 +74,38 @@ public class WorkflowWorkNodeDO extends BaseDO {
      * 负责人分组ID
      */
     private Long workerGroupId;
+    /**
+     * 表单ID
+     */
+    private Long formId;
+    /**
+     * 短信模板ID
+     */
+    private Long smsTemplateId;
+    /**
+     * 站内信模板ID
+     */
+    private Long messageTemplateId;
+    /**
+     * 邮件模板ID
+     */
+    private Long emailTemplateId;
+    /**
+     * APP通知模板ID
+     */
+    private Long appTemplateId;
+    /**
+     * 被通知人ID
+     */
+    private Long notifyUserId;
+    /**
+     * 被通知人分组ID
+     */
+    private Long notifyUserGroupId;
+    /**
+     * 通知时间策略
+     */
+    private String notifyTime;
     /**
      * 通知消息配置
      */
@@ -83,10 +114,6 @@ public class WorkflowWorkNodeDO extends BaseDO {
      * 特殊配置
      */
     private String specialConfig;
-    /**
-     * 排序顺序
-     */
-    private Integer sortOrder;
 
 
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/mysql/workdesign/WorkflowDesignNodeMapper.java

@@ -18,7 +18,6 @@ public interface WorkflowDesignNodeMapper extends BaseMapperX<WorkflowDesignNode
     default PageResult<WorkflowDesignNodeDO> selectPage(WorkflowDesignNodePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<WorkflowDesignNodeDO>()
                 .eqIfPresent(WorkflowDesignNodeDO::getDesignId, reqVO.getDesignId())
-                .eqIfPresent(WorkflowDesignNodeDO::getParentId, reqVO.getParentId())
                 .eqIfPresent(WorkflowDesignNodeDO::getWorkerUserId, reqVO.getWorkerUserId())
                 .eqIfPresent(WorkflowDesignNodeDO::getWorkerGroupId, reqVO.getWorkerGroupId())
                 .eqIfPresent(WorkflowDesignNodeDO::getFormId, reqVO.getFormId())

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/dal/mysql/workdesign/WorkflowWorkNodeMapper.java

@@ -18,20 +18,13 @@ public interface WorkflowWorkNodeMapper extends BaseMapperX<WorkflowWorkNodeDO>
     default PageResult<WorkflowWorkNodeDO> selectPage(WorkflowWorkNodePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<WorkflowWorkNodeDO>()
                 .eqIfPresent(WorkflowWorkNodeDO::getWorkId, reqVO.getWorkId())
-                .eqIfPresent(WorkflowWorkNodeDO::getNodeId, reqVO.getNodeId())
-                .eqIfPresent(WorkflowWorkNodeDO::getParentId, reqVO.getParentId())
-                .eqIfPresent(WorkflowWorkNodeDO::getNodeType, reqVO.getNodeType())
-                .eqIfPresent(WorkflowWorkNodeDO::getTypeId, reqVO.getTypeId())
                 .likeIfPresent(WorkflowWorkNodeDO::getNodeName, reqVO.getNodeName())
                 .eqIfPresent(WorkflowWorkNodeDO::getNodeIcon, reqVO.getNodeIcon())
-                .eqIfPresent(WorkflowWorkNodeDO::getPositionX, reqVO.getPositionX())
-                .eqIfPresent(WorkflowWorkNodeDO::getPositionY, reqVO.getPositionY())
                 .eqIfPresent(WorkflowWorkNodeDO::getFormId, reqVO.getFormId())
                 .eqIfPresent(WorkflowWorkNodeDO::getWorkerUserId, reqVO.getWorkerUserId())
                 .eqIfPresent(WorkflowWorkNodeDO::getWorkerGroupId, reqVO.getWorkerGroupId())
                 .eqIfPresent(WorkflowWorkNodeDO::getNotifyConfig, reqVO.getNotifyConfig())
                 .eqIfPresent(WorkflowWorkNodeDO::getSpecialConfig, reqVO.getSpecialConfig())
-                .eqIfPresent(WorkflowWorkNodeDO::getSortOrder, reqVO.getSortOrder())
                 .betweenIfPresent(WorkflowWorkNodeDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(WorkflowWorkNodeDO::getId));
     }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workdesign/WorkflowWorkNodeService.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iscs.service.workflowworknode;
+package cn.iocoder.yudao.module.iscs.service.workdesign;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodePageReqVO;
@@ -61,4 +61,12 @@ public interface WorkflowWorkNodeService extends IService<WorkflowWorkNodeDO> {
      */
     PageResult<WorkflowWorkNodeDO> getWorkflowWorkNodePage(WorkflowWorkNodePageReqVO pageReqVO);
 
+    /**
+     * 创建作业复制节点信息
+     * @param designId
+     * @param workId
+     * @return
+     */
+    Boolean copyNode(Long designId, Long workId);
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workdesign/WorkflowWorkNodeServiceImpl.java

@@ -1,11 +1,13 @@
-package cn.iocoder.yudao.module.iscs.service.workflowworknode;
+package cn.iocoder.yudao.module.iscs.service.workdesign;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodePageReqVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowworknode.vo.WorkflowWorkNodeSaveReqVO;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.WorkflowDesignNodeDO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.WorkflowWorkNodeDO;
 import cn.iocoder.yudao.module.iscs.dal.mysql.workdesign.WorkflowWorkNodeMapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -20,10 +22,12 @@ import java.util.List;
  */
 @Service
 @Validated
-public class WorkflowWorkNodeServiceImpl extends ServiceImpl<WorkflowWorkNodeMapper, WorkflowWorkNodeDO> implements cn.iocoder.yudao.module.iscs.service.workflowworknode.WorkflowWorkNodeService {
+public class WorkflowWorkNodeServiceImpl extends ServiceImpl<WorkflowWorkNodeMapper, WorkflowWorkNodeDO> implements WorkflowWorkNodeService {
 
     @Resource
     private WorkflowWorkNodeMapper workflowWorkNodeMapper;
+    @Resource
+    private WorkflowDesignNodeService workflowDesignNodeService;
 
     @Override
     public Long createWorkflowWorkNode(WorkflowWorkNodeSaveReqVO createReqVO) {
@@ -66,4 +70,16 @@ public class WorkflowWorkNodeServiceImpl extends ServiceImpl<WorkflowWorkNodeMap
         return workflowWorkNodeMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public Boolean copyNode(Long designId, Long workId) {
+        // 需要copy的数据
+        List<WorkflowDesignNodeDO> designNodeDOList = workflowDesignNodeService.list(Wrappers.<WorkflowDesignNodeDO>lambdaQuery()
+                .eq(WorkflowDesignNodeDO::getDesignId, designId)
+                .orderByAsc(WorkflowDesignNodeDO::getId));
+        // 开始copy数据
+        List<WorkflowWorkNodeDO> workNodeDOList = BeanUtils.toBean(designNodeDOList, WorkflowWorkNodeDO.class);
+        workNodeDOList.forEach(o -> o.setWorkId(workId).setId(null));
+        return saveBatch(workNodeDOList);
+    }
+
 }

yudao-module-iscs/src/main/java/cn/iocoder/yudao/module/iscs/service/workdesign/WorkflowWorkServiceImpl.java

@@ -1,9 +1,13 @@
 package cn.iocoder.yudao.module.iscs.service.workdesign;
 
+import cn.hutool.core.lang.Assert;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowwork.vo.WorkflowWorkPageReqVO;
 import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowwork.vo.WorkflowWorkSaveReqVO;
+import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.WorkflowDesignDO;
 import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.WorkflowWorkDO;
 import cn.iocoder.yudao.module.iscs.dal.mysql.workdesign.WorkflowWorkMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -11,6 +15,7 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -24,17 +29,38 @@ public class WorkflowWorkServiceImpl extends ServiceImpl<WorkflowWorkMapper, Wor
 
     @Resource
     private WorkflowWorkMapper workflowWorkMapper;
+    @Resource
+    private WorkflowDesignService workflowDesignService;
+    @Resource
+    private WorkflowWorkNodeService workflowWorkNodeService;
 
     @Override
     public Long createWorkflowWork(WorkflowWorkSaveReqVO createReqVO) {
+        Assert.notBlank(createReqVO.getName(), "名称不能为空!");
+        Assert.notNull(createReqVO.getDesignId(), "流程设计ID不能为空!");
+        // 根据designId获取设计流程设计数据
+        WorkflowDesignDO workflowDesignDO = workflowDesignService.getById(createReqVO.getDesignId());
+        Assert.notNull(workflowDesignDO, "流程设计数据丢失!");
         // 插入
         WorkflowWorkDO workflowWork = BeanUtils.toBean(createReqVO, WorkflowWorkDO.class);
+        String orderNo = "Work" + System.currentTimeMillis();
+        workflowWork.setOrderNo(orderNo);
+        workflowWork.setDesignName(workflowDesignDO.getName());
+        workflowWork.setDesignContent(workflowDesignDO.getContent());
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+        workflowWork.setInitiatorId(loginUser.getId());
+        workflowWork.setInitiatorName(loginUser.getInfo().get("nickname"));
+        workflowWork.setInitiationTime(LocalDateTime.now());
         workflowWorkMapper.insert(workflowWork);
 
+        // 开始生成节点信息
+        workflowWorkNodeService.copyNode(createReqVO.getDesignId(), workflowWork.getId());
+
         // 返回
         return workflowWork.getId();
     }
 
+
     @Override
     public void updateWorkflowWork(WorkflowWorkSaveReqVO updateReqVO) {
         // 更新