提交

jy-flow/src/main/java/com/jy/flow/adapter/AddSignatureAdapter.java

@@ -1,6 +1,6 @@
 package com.jy.flow.adapter;
 
-import com.jy.flow.vo.WarmFlowInteractiveTypeVo;
+import com.jy.flow.model.vo.WarmFlowInteractiveTypeVo;
 import com.jy.framework.satoken.LoginContext;
 import com.warm.flow.core.enums.CooperateType;
 import org.springframework.stereotype.Component;

jy-flow/src/main/java/com/jy/flow/adapter/DeputeAdapter.java

@@ -1,7 +1,7 @@
 package com.jy.flow.adapter;
 
 
-import com.jy.flow.vo.WarmFlowInteractiveTypeVo;
+import com.jy.flow.model.vo.WarmFlowInteractiveTypeVo;
 import com.jy.framework.satoken.LoginContext;
 import com.warm.flow.core.enums.CooperateType;
 import org.springframework.stereotype.Component;

jy-flow/src/main/java/com/jy/flow/adapter/ReductionSignatureAdapter.java

@@ -1,7 +1,7 @@
 package com.jy.flow.adapter;
 
 
-import com.jy.flow.vo.WarmFlowInteractiveTypeVo;
+import com.jy.flow.model.vo.WarmFlowInteractiveTypeVo;
 import com.jy.framework.satoken.LoginContext;
 import com.warm.flow.core.enums.CooperateType;
 import org.springframework.stereotype.Component;

jy-flow/src/main/java/com/jy/flow/adapter/TransferAdapter.java

@@ -1,7 +1,7 @@
 package com.jy.flow.adapter;
 
 
-import com.jy.flow.vo.WarmFlowInteractiveTypeVo;
+import com.jy.flow.model.vo.WarmFlowInteractiveTypeVo;
 import com.jy.framework.satoken.LoginContext;
 import com.warm.flow.core.enums.CooperateType;
 import org.springframework.stereotype.Component;

jy-flow/src/main/java/com/jy/flow/adapter/WarmFlowAdapter.java

@@ -1,6 +1,6 @@
 package com.jy.flow.adapter;
 
-import com.jy.flow.vo.WarmFlowInteractiveTypeVo;
+import com.jy.flow.model.vo.WarmFlowInteractiveTypeVo;
 
 public interface WarmFlowAdapter {
 

jy-flow/src/main/java/com/jy/flow/controller/DefController.java

@@ -1,6 +1,6 @@
 package com.jy.flow.controller;
 
-import com.jy.flow.dto.FlowDefinitionDto;
+import com.jy.flow.model.dto.FlowDefinitionDto;
 import com.warm.flow.core.entity.Definition;
 import com.warm.flow.core.service.DefService;
 import com.warm.flow.core.utils.page.Page;

jy-flow/src/main/java/com/jy/flow/controller/ExecuteController.java

@@ -7,13 +7,13 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jy.flow.adapter.AbstractWarmFlowAdapter;
-import com.jy.flow.dto.FlowHisTaskDto;
-import com.jy.flow.dto.FlowTaskDto;
-import com.jy.flow.dto.WarmFlowHandleDto;
+import com.jy.flow.model.dto.FlowHisTaskDto;
+import com.jy.flow.model.dto.FlowTaskDto;
+import com.jy.flow.model.dto.WarmFlowHandleDto;
+import com.jy.flow.model.vo.FlowTaskVo;
+import com.jy.flow.model.vo.WarmFlowInteractiveTypeVo;
 import com.jy.flow.service.ExecuteService;
 import com.jy.flow.service.HhDefService;
-import com.jy.flow.vo.FlowTaskVo;
-import com.jy.flow.vo.WarmFlowInteractiveTypeVo;
 import com.jy.framework.satoken.LoginContext;
 import com.jy.system.dao.SysDeptDao;
 import com.jy.system.dao.SysRoleDao;

jy-flow/src/main/java/com/jy/flow/mapper/WarmFlowMapper.java

@@ -1,8 +1,8 @@
 package com.jy.flow.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jy.flow.dto.FlowTaskDto;
-import com.jy.flow.vo.FlowTaskVo;
+import com.jy.flow.model.dto.FlowTaskDto;
+import com.jy.flow.model.vo.FlowTaskVo;
 import com.warm.flow.core.entity.HisTask;
 import com.warm.flow.orm.entity.FlowHisTask;
 import com.warm.flow.orm.entity.FlowTask;

jy-flow/src/main/java/com/jy/flow/mapper/xml/WarmFLowMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jy.flow.mapper.WarmFlowMapper">
 
-    <resultMap type="com.jy.flow.vo.FlowTaskVo" id="FlowTaskResult">
+    <resultMap type="com.jy.flow.model.vo.FlowTaskVo" id="FlowTaskResult">
         <result property="id" column="id"/>
         <result property="nodeCode" column="node_code"/>
         <result property="nodeName" column="node_name"/>
@@ -165,13 +165,13 @@
         WHERE
         a.type = 4
         <if test="task.flowName != null and task.flowName != ''">
-          and c.nick_name like concat('%',#{task.flowName}, '%')
+            and c.nick_name like concat('%',#{task.flowName}, '%')
         </if>
         <if test="task.nodeName != null and task.nodeName != ''">
-          and b.node_name like concat('%',#{task.nodeName}, '%')
+            and b.node_name like concat('%',#{task.nodeName}, '%')
         </if>
         <if test="task.nodeType != null">
-          and b.node_type = #{task.nodeType}
+            and b.node_type = #{task.nodeType}
         </if>
         ORDER BY create_time DESC
     </select>

jy-flow/src/main/java/com/jy/flow/dto/FlowDefinitionDto.java → jy-flow/src/main/java/com/jy/flow/model/dto/FlowDefinitionDto.java

@@ -1,4 +1,4 @@
-package com.jy.flow.dto;
+package com.jy.flow.model.dto;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.warm.flow.orm.entity.FlowDefinition;

jy-flow/src/main/java/com/jy/flow/dto/FlowHisTaskDto.java → jy-flow/src/main/java/com/jy/flow/model/dto/FlowHisTaskDto.java

@@ -1,4 +1,4 @@
-package com.jy.flow.dto;
+package com.jy.flow.model.dto;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

jy-flow/src/main/java/com/jy/flow/dto/FlowTaskDto.java → jy-flow/src/main/java/com/jy/flow/model/dto/FlowTaskDto.java

@@ -1,4 +1,4 @@
-package com.jy.flow.dto;
+package com.jy.flow.model.dto;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

jy-flow/src/main/java/com/jy/flow/dto/WarmFlowHandleDto.java → jy-flow/src/main/java/com/jy/flow/model/dto/WarmFlowHandleDto.java

@@ -1,4 +1,4 @@
-package com.jy.flow.dto;
+package com.jy.flow.model.dto;
 
 import lombok.Getter;
 import lombok.Setter;

jy-flow/src/main/java/com/jy/flow/vo/FlowTaskVo.java → jy-flow/src/main/java/com/jy/flow/model/vo/FlowTaskVo.java

@@ -1,4 +1,4 @@
-package com.jy.flow.vo;
+package com.jy.flow.model.vo;
 
 import com.warm.flow.orm.entity.FlowTask;
 import lombok.Getter;

jy-flow/src/main/java/com/jy/flow/vo/WarmFlowInteractiveTypeVo.java → jy-flow/src/main/java/com/jy/flow/model/vo/WarmFlowInteractiveTypeVo.java

@@ -1,4 +1,4 @@
-package com.jy.flow.vo;
+package com.jy.flow.model.vo;
 
 import lombok.Getter;
 import lombok.Setter;

jy-flow/src/main/java/com/jy/flow/service/ExecuteService.java

@@ -1,9 +1,9 @@
 package com.jy.flow.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jy.flow.dto.FlowHisTaskDto;
-import com.jy.flow.dto.FlowTaskDto;
-import com.jy.flow.vo.FlowTaskVo;
+import com.jy.flow.model.dto.FlowHisTaskDto;
+import com.jy.flow.model.dto.FlowTaskDto;
+import com.jy.flow.model.vo.FlowTaskVo;
 import com.warm.flow.orm.entity.FlowHisTask;
 
 public interface ExecuteService {

jy-flow/src/main/java/com/jy/flow/service/HhDefService.java

@@ -1,6 +1,6 @@
 package com.jy.flow.service;
 
-import com.jy.flow.vo.WarmFlowInteractiveTypeVo;
+import com.jy.flow.model.vo.WarmFlowInteractiveTypeVo;
 
 public interface HhDefService {
 

jy-flow/src/main/java/com/jy/flow/service/impl/ExecuteServiceImpl.java

@@ -1,11 +1,11 @@
 package com.jy.flow.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jy.flow.dto.FlowHisTaskDto;
-import com.jy.flow.dto.FlowTaskDto;
 import com.jy.flow.mapper.WarmFlowMapper;
+import com.jy.flow.model.dto.FlowHisTaskDto;
+import com.jy.flow.model.dto.FlowTaskDto;
+import com.jy.flow.model.vo.FlowTaskVo;
 import com.jy.flow.service.ExecuteService;
-import com.jy.flow.vo.FlowTaskVo;
 import com.warm.flow.orm.entity.FlowHisTask;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;

jy-flow/src/main/java/com/jy/flow/service/impl/HhDefServiceImpl.java

@@ -2,8 +2,8 @@ package com.jy.flow.service.impl;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.jy.flow.adapter.WarmFlowAdapter;
+import com.jy.flow.model.vo.WarmFlowInteractiveTypeVo;
 import com.jy.flow.service.HhDefService;
-import com.jy.flow.vo.WarmFlowInteractiveTypeVo;
 import jakarta.annotation.PostConstruct;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;