xuhy
2025-02-20 67efe2c14617cad2e8367e27cd3f4b45eb749c38
审批流
8个文件已修改
53 ■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessExtInstance.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessInstanceAction.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessModule.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessTemplate.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/StateTaskCenter.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -5,12 +5,14 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.core.env.Environment;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.web.client.RestTemplate;
import springfox.documentation.oas.annotations.EnableOpenApi;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -21,6 +23,8 @@
 * @author ruoyi
 */
@Slf4j
@EnableOpenApi
@EnableCaching
@EnableScheduling//开启定时任务
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
public class RuoYiApplication
ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessExtInstance.java
@@ -7,8 +7,10 @@
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@TableName(value = "state_process_ext_instance")
public class StateProcessExtInstance extends BaseModel {
ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessInstanceAction.java
@@ -8,8 +8,10 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value = "工作流-实例操作记录表")
@TableName(value = "state_process_instance_action")
public class StateProcessInstanceAction extends BaseModel {
ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessModule.java
@@ -7,8 +7,10 @@
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@TableName(value = "state_process_module")
public class StateProcessModule extends BaseModel {
ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessTemplate.java
@@ -8,8 +8,10 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value = "工作流-模版")
@TableName(value = "state_process_template")
public class StateProcessTemplate extends BaseModel {
@@ -38,7 +40,7 @@
    @TableField("status")
    private Integer status;
    @ApiModelProperty(value = "workflow_id")
    @TableField("workflow_id")
    @TableField("work_flow_id")
    private Long workFlowId;
    @ApiModelProperty(value = "workflow流程版本")
    @TableField("workflow_version")
ruoyi-system/src/main/java/com/ruoyi/system/model/StateTaskCenter.java
@@ -8,8 +8,10 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value = "任务")
@TableName(value = "state_task_center" )
public class StateTaskCenter extends BaseModel {
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
@@ -34,6 +34,7 @@
import com.ruoyi.system.vo.ProcessTaskListVO;
import lombok.AllArgsConstructor;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -46,20 +47,30 @@
import java.util.stream.Collectors;
@Service
@AllArgsConstructor
public class StateProcessTemplateServiceImpl extends ServiceImpl<StateProcessTemplateMapper, StateProcessTemplate> implements StateProcessTemplateService {
    private final FlowLongEngine flowLongEngine;
    private final StateProcessInstanceActionService stateProcessInstanceActionService;
    private final StateProcessExtInstanceService stateProcessExtInstanceService;
    private final FlwHisInstanceMapper flwHisInstanceMapper;
    private final FlwTaskActorMapper flwTaskActorMapper;
    private final FlwTaskMapper flwTaskMapper;
    private final StateTaskCenterService stateTaskCenterService;
    private final StateProcessModuleService stateProcessModuleService;
    private final FlwHisTaskMapper flwHisTaskMapper;
    private final FlwHisTaskActorMapper flwHisTaskActorMapper;
    private final ISysUserService sysUserService;
    @Autowired
    private FlowLongEngine flowLongEngine;
    @Autowired
    private StateProcessInstanceActionService stateProcessInstanceActionService;
    @Autowired
    private StateProcessExtInstanceService stateProcessExtInstanceService;
    @Autowired
    private FlwHisInstanceMapper flwHisInstanceMapper;
    @Autowired
    private FlwTaskActorMapper flwTaskActorMapper;
    @Autowired
    private FlwTaskMapper flwTaskMapper;
    @Autowired
    private StateTaskCenterService stateTaskCenterService;
    @Autowired
    private StateProcessModuleService stateProcessModuleService;
    @Autowired
    private FlwHisTaskMapper flwHisTaskMapper;
    @Autowired
    private FlwHisTaskActorMapper flwHisTaskActorMapper;
    @Autowired
    private ISysUserService sysUserService;
    /**
     * 流程模版分页
ruoyi-system/src/main/resources/mapper/system/TCheckAcceptRecordMapper.xml
@@ -82,7 +82,7 @@
    </select>
    <select id="pageListApplet" resultType="com.ruoyi.system.vo.TCheckAcceptRecordVO">
        select
        t1.*,
        t.*,
        c.contract_number,
        h.house_name
        from t_check_accept_record t