吴树波 4 týždňov pred
rodič
commit
9fa1e56d46

+ 9 - 1
fs-service/src/main/java/com/fs/company/domain/CompanyWorkflow.java

@@ -1,9 +1,13 @@
 package com.fs.company.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * AI工作流对象 fs_ai_workflow
  *
@@ -11,10 +15,11 @@ import lombok.Data;
  * @date 2026-01-06
  */
 @Data
-public class CompanyWorkflow extends BaseEntity {
+public class CompanyWorkflow {
     private static final long serialVersionUID = 1L;
 
     /** 工作流ID */
+    @TableId(type = IdType.AUTO)
     private Long workflowId;
 
     /** 工作流名称 */
@@ -49,6 +54,9 @@ public class CompanyWorkflow extends BaseEntity {
 
     private String endNodeKey;
 
+    private Date createTime;
+    private Date updateTime;
+
     public Boolean isStartNode(String nodeKey) {
         return nodeKey.equals(startNodeKey);
     }

+ 3 - 0
fs-service/src/main/java/com/fs/company/domain/CompanyWorkflowEdge.java

@@ -1,5 +1,7 @@
 package com.fs.company.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fs.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -18,6 +20,7 @@ public class CompanyWorkflowEdge implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /** 连线ID */
+    @TableId(type = IdType.AUTO)
     private Long edgeId;
 
     /** 工作流ID */

+ 3 - 0
fs-service/src/main/java/com/fs/company/domain/CompanyWorkflowNode.java

@@ -1,5 +1,7 @@
 package com.fs.company.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
@@ -17,6 +19,7 @@ public class CompanyWorkflowNode  implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /** 节点ID */
+    @TableId(type = IdType.AUTO)
     private Long nodeId;
 
     /** 工作流ID */

+ 3 - 0
fs-service/src/main/java/com/fs/company/domain/CompanyWorkflowNodeType.java

@@ -1,5 +1,7 @@
 package com.fs.company.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
@@ -17,6 +19,7 @@ public class CompanyWorkflowNodeType implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /** 类型ID */
+    @TableId(type = IdType.AUTO)
     private Long typeId;
 
     /** 类型编码 */

+ 5 - 6
fs-service/src/main/java/com/fs/company/mapper/CompanyWorkflowEdgeMapper.java

@@ -15,22 +15,21 @@ import java.util.List;
  * @author fs
  * @date 2026-01-06
  */
-@Mapper
 public interface CompanyWorkflowEdgeMapper  extends BaseMapper<CompanyWorkflowEdge> {
 
     CompanyWorkflowEdge selectCompanyWorkflowEdgeById(Long edgeId);
 
     List<CompanyWorkflowEdge> selectCompanyWorkflowEdgeByWorkflowId(Long workflowId);
 
-    int insertCompanyWorkflowEdge(CompanyWorkflowEdge edge);
+    Integer insertCompanyWorkflowEdge(CompanyWorkflowEdge edge);
 
-    int batchInsertCompanyWorkflowEdge(List<CompanyWorkflowEdge> edges);
+    Integer batchInsertCompanyWorkflowEdge(List<CompanyWorkflowEdge> edges);
 
-    int updateCompanyWorkflowEdge(CompanyWorkflowEdge edge);
+    Integer updateCompanyWorkflowEdge(CompanyWorkflowEdge edge);
 
-    int deleteCompanyWorkflowEdgeById(Long edgeId);
+    Integer deleteCompanyWorkflowEdgeById(Long edgeId);
 
-    int deleteCompanyWorkflowEdgeByWorkflowId(Long workflowId);
+    Integer deleteCompanyWorkflowEdgeByWorkflowId(Long workflowId);
 
     List<CompanyWorkflowEdge> selectListByWorkflowIdAndNodeKey(@Param("workflowId")Long workflowId, @Param("nodeKey")String nodeKey);
 }

+ 10 - 10
fs-service/src/main/java/com/fs/company/mapper/CompanyWorkflowMapper.java

@@ -17,7 +17,6 @@ import java.util.List;
  * @author fs
  * @date 2026-01-06
  */
-@Mapper
 public interface CompanyWorkflowMapper extends BaseMapper<CompanyWorkflow>  {
 
     CompanyWorkflow selectCompanyWorkflowById(Long workflowId);
@@ -29,27 +28,28 @@ public interface CompanyWorkflowMapper extends BaseMapper<CompanyWorkflow>  {
      */
     List<CompanyWorkflow> selectCompanyWorkflowByCompanyUserId(Long companyUserId);
 
-    int insertCompanyWorkflow(CompanyWorkflow fsAiWorkflow);
+    Integer insertCompanyWorkflow(CompanyWorkflow fsAiWorkflow);
 
-    int updateCompanyWorkflow(CompanyWorkflow fsAiWorkflow);
+    Integer updateCompanyWorkflow(CompanyWorkflow fsAiWorkflow);
 
-    int deleteCompanyWorkflowById(Long workflowId);
+    Integer deleteCompanyWorkflowById(Long workflowId);
 
-    int deleteCompanyWorkflowByIds(Long[] workflowIds);
+    Integer deleteCompanyWorkflowByIds(Long[] workflowIds);
 
-    int selectCompanyWorkflowCountByCompanyUserId(Long companyUserId);
+    Integer selectCompanyWorkflowCountByCompanyUserId(Long companyUserId);
 
-    int updateWorkflowBindCompanyUser(@Param("workflowId") Long workflowId, @Param("companyUserId") Long companyUserId);
+    Integer updateWorkflowBindCompanyUser(@Param("workflowId") Long workflowId, @Param("companyUserId") Long companyUserId);
 
     List<CompanyUser> getBindCompanyUserByWorkflowId(Long workflowId);
 
-    int insertCompanyWorkflowCompanyUser(@Param("workflowId")Long workflowId,@Param("companyUserIds") List<Long> companyUserIds);
+    Integer insertCompanyWorkflowCompanyUser(@Param("workflowId")Long workflowId,@Param("companyUserIds") List<Long> companyUserIds);
 
-    int insertAiWorkflowCompanyUserVoice(@Param("workflowId") Long workflowId, @Param("companyUserIds") List<Long> companyUserIds, @Param("fsAiWorkflowNodes") List<CompanyWorkflowNode> fsAiWorkflowNodes);
+    Integer insertAiWorkflowCompanyUserVoice(@Param("workflowId") Long workflowId, @Param("companyUserIds") List<Long> companyUserIds, @Param("fsAiWorkflowNodes") List<CompanyWorkflowNode> fsAiWorkflowNodes);
 
     List<String> selectCompanyWorkflowNodeByWorkflowId(@Param("workflowId") Long workflowId);
 
-    List<Long> selectWorkflowCompanyUserByWfId(@Param("workflowId") Long workflowId);
+    List<Long>
+    selectWorkflowCompanyUserByWfId(@Param("workflowId") Long workflowId);
 
     void deleteAiWorkflowCompanyUserVoice(@Param("workflowId") Long workflowId,@Param("nodeKeyDel") List<String> nodeKeyDel);
 

+ 5 - 6
fs-service/src/main/java/com/fs/company/mapper/CompanyWorkflowNodeMapper.java

@@ -14,7 +14,6 @@ import java.util.List;
  * @author fs
  * @date 2026-01-06
  */
-@Mapper
 public interface CompanyWorkflowNodeMapper extends BaseMapper<CompanyWorkflowNode> {
 
     CompanyWorkflowNode selectCompanyWorkflowNodeById(Long nodeId);
@@ -27,15 +26,15 @@ public interface CompanyWorkflowNodeMapper extends BaseMapper<CompanyWorkflowNod
     List<CompanyWorkflowNode> selectNodesByWorkflowIdAndTypes(@Param("workflowId") Long workflowId,
                                                            @Param("nodeTypes") List<String> nodeTypes);
 
-    int insertCompanyWorkflowNode(CompanyWorkflowNode node);
+    Integer insertCompanyWorkflowNode(CompanyWorkflowNode node);
 
-    int batchInsertCompanyWorkflowNode(List<CompanyWorkflowNode> nodes);
+    Integer batchInsertCompanyWorkflowNode(List<CompanyWorkflowNode> nodes);
 
-    int updateCompanyWorkflowNode(CompanyWorkflowNode node);
+    Integer updateCompanyWorkflowNode(CompanyWorkflowNode node);
 
-    int deleteCompanyWorkflowNodeById(Long nodeId);
+    Integer deleteCompanyWorkflowNodeById(Long nodeId);
 
-    int deleteCompanyWorkflowNodeByWorkflowId(Long workflowId);
+    Integer deleteCompanyWorkflowNodeByWorkflowId(Long workflowId);
 
     CompanyWorkflowNode selectNodeByWorkflowIdAndNodeKey(@Param("workflowId") Long workflowId,
                                                        @Param("nodeKey") String nodeKey);

+ 0 - 1
fs-service/src/main/java/com/fs/company/mapper/CompanyWorkflowNodeTypeMapper.java

@@ -14,7 +14,6 @@ import java.util.List;
  * @author fs
  * @date 2026-01-06
  */
-@Mapper
 public interface CompanyWorkflowNodeTypeMapper extends BaseMapper<CompanyWorkflowNodeType> {
 
     CompanyWorkflowNodeType selectCompanyWorkflowNodeTypeById(Long typeId);