diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/controller/TaskApprovalOpinionController.java b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/controller/TaskApprovalOpinionController.java similarity index 96% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/controller/TaskApprovalOpinionController.java rename to jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/controller/TaskApprovalOpinionController.java index d518e27..ef3c917 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/controller/TaskApprovalOpinionController.java +++ b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/controller/TaskApprovalOpinionController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.taskapprovalopinion.controller; +package org.jeecg.modules.taskapprovalopinion.controller; import java.util.Arrays; import java.util.HashMap; @@ -14,8 +14,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.demo.taskapprovalopinion.entity.TaskApprovalOpinion; -import org.jeecg.modules.demo.taskapprovalopinion.service.ITaskApprovalOpinionService; +import org.jeecg.modules.taskapprovalopinion.entity.TaskApprovalOpinion; +import org.jeecg.modules.taskapprovalopinion.service.ITaskApprovalOpinionService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/entity/TaskApprovalOpinion.java b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/entity/TaskApprovalOpinion.java similarity index 82% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/entity/TaskApprovalOpinion.java rename to jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/entity/TaskApprovalOpinion.java index 41185c9..cce3040 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/entity/TaskApprovalOpinion.java +++ b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/entity/TaskApprovalOpinion.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.demo.taskapprovalopinion.entity; +package org.jeecg.modules.taskapprovalopinion.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; @@ -36,99 +36,99 @@ public class TaskApprovalOpinion implements Serializable { /**主键*/ @TableId(type = IdType.ASSIGN_ID) @Schema(description = "主键") - private java.lang.String id; + private String id; /**记录类型：PROCESS流程意见、SUPPLEMENT补充反馈、SYSTEM系统记录*/ @Excel(name = "记录类型：PROCESS流程意见、SUPPLEMENT补充反馈、SYSTEM系统记录", width = 15) @Schema(description = "记录类型：PROCESS流程意见、SUPPLEMENT补充反馈、SYSTEM系统记录") - private java.lang.String recordType; + private String recordType; /**事项任务ID，对应task_task.id*/ @Excel(name = "事项任务ID，对应task_task.id", width = 15) @Schema(description = "事项任务ID，对应task_task.id") - private java.lang.String taskTaskId; + private String taskTaskId; /**关联业务ID*/ @Excel(name = "关联业务ID", width = 15) @Schema(description = "关联业务ID") - private java.lang.String businessId; + private String businessId; /**流程编码*/ @Excel(name = "流程编码", width = 15) @Schema(description = "流程编码") - private java.lang.String flowCode; + private String flowCode; /**流程实例ID*/ @Excel(name = "流程实例ID", width = 15) @Schema(description = "流程实例ID") - private java.lang.String processInstId; + private String processInstId; /**Flowable任务ID*/ @Excel(name = "Flowable任务ID", width = 15) @Schema(description = "Flowable任务ID") - private java.lang.String flowTaskId; + private String flowTaskId; /**流程节点Key*/ @Excel(name = "流程节点Key", width = 15) @Schema(description = "流程节点Key") - private java.lang.String taskDefKey; + private String taskDefKey; /**流程节点名称*/ @Excel(name = "流程节点名称", width = 15) @Schema(description = "流程节点名称") - private java.lang.String taskName; + private String taskName; /**操作类型：START发起、APPROVE办理、REJECT驳回、CALLBACK取回、INVALID作废、FEEDBACK反馈*/ @Excel(name = "操作类型：START发起、APPROVE办理、REJECT驳回、CALLBACK取回、INVALID作废、FEEDBACK反馈", width = 15) @Schema(description = "操作类型：START发起、APPROVE办理、REJECT驳回、CALLBACK取回、INVALID作废、FEEDBACK反馈") - private java.lang.String actionType; + private String actionType; /**操作结果，如同意、不同意、驳回、发起流程、补充反馈*/ @Excel(name = "操作结果，如同意、不同意、驳回、发起流程、补充反馈", width = 15) @Schema(description = "操作结果，如同意、不同意、驳回、发起流程、补充反馈") - private java.lang.String actionResult; + private String actionResult; /**审批意见或反馈内容*/ @Excel(name = "审批意见或反馈内容", width = 15) @Schema(description = "审批意见或反馈内容") - private java.lang.String opinion; + private String opinion; /**办理人账号*/ @Excel(name = "办理人账号", width = 15) @Schema(description = "办理人账号") - private java.lang.String opUserId; + private String opUserId; /**办理人姓名*/ @Excel(name = "办理人姓名", width = 15) @Schema(description = "办理人姓名") - private java.lang.String opUserName; + private String opUserName; /**办理人部门ID*/ @Excel(name = "办理人部门ID", width = 15) @Schema(description = "办理人部门ID") - private java.lang.String opDeptId; + private String opDeptId; /**办理人部门名称*/ @Excel(name = "办理人部门名称", width = 15) @Schema(description = "办理人部门名称") - private java.lang.String opDeptName; + private String opDeptName; /**办理人部门编码*/ @Excel(name = "办理人部门编码", width = 15) @Schema(description = "办理人部门编码") - private java.lang.String opDeptCode; + private String opDeptCode; /**办理时间*/ @Excel(name = "办理时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "办理时间") - private java.util.Date opTime; + private Date opTime; /**删除标识：0正常，1删除*/ @Excel(name = "删除标识：0正常，1删除", width = 15) @Schema(description = "删除标识：0正常，1删除") @TableLogic - private java.lang.String delFlag; + private String delFlag; /**创建人*/ @Schema(description = "创建人") - private java.lang.String createBy; + private String createBy; /**创建时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "创建时间") - private java.util.Date createTime; + private Date createTime; /**更新人*/ @Schema(description = "更新人") - private java.lang.String updateBy; + private String updateBy; /**更新时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "更新时间") - private java.util.Date updateTime; + private Date updateTime; /**所属部门编码*/ @Schema(description = "所属部门编码") - private java.lang.String sysOrgCode; + private String sysOrgCode; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/TaskApprovalOpinionMapper.java b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/TaskApprovalOpinionMapper.java similarity index 70% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/TaskApprovalOpinionMapper.java rename to jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/TaskApprovalOpinionMapper.java index 08fb322..0c3e5a4 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/TaskApprovalOpinionMapper.java +++ b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/TaskApprovalOpinionMapper.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.demo.taskapprovalopinion.mapper; +package org.jeecg.modules.taskapprovalopinion.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.demo.taskapprovalopinion.entity.TaskApprovalOpinion; +import org.jeecg.modules.taskapprovalopinion.entity.TaskApprovalOpinion; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/xml/TaskApprovalOpinionMapper.xml b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/xml/TaskApprovalOpinionMapper.xml similarity index 61% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/xml/TaskApprovalOpinionMapper.xml rename to jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/xml/TaskApprovalOpinionMapper.xml index 7a6b4ea..6002f5c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/xml/TaskApprovalOpinionMapper.xml +++ b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/xml/TaskApprovalOpinionMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/service/ITaskApprovalOpinionService.java b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/service/ITaskApprovalOpinionService.java similarity index 65% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/service/ITaskApprovalOpinionService.java rename to jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/service/ITaskApprovalOpinionService.java index 45698f7..897fa3d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/service/ITaskApprovalOpinionService.java +++ b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/service/ITaskApprovalOpinionService.java @@ -1,6 +1,6 @@ -package org.jeecg.modules.demo.taskapprovalopinion.service; +package org.jeecg.modules.taskapprovalopinion.service; -import org.jeecg.modules.demo.taskapprovalopinion.entity.TaskApprovalOpinion; +import org.jeecg.modules.taskapprovalopinion.entity.TaskApprovalOpinion; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/service/impl/TaskApprovalOpinionServiceImpl.java b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/service/impl/TaskApprovalOpinionServiceImpl.java similarity index 55% rename from jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/service/impl/TaskApprovalOpinionServiceImpl.java rename to jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/service/impl/TaskApprovalOpinionServiceImpl.java index 3b417a5..acae5b6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/service/impl/TaskApprovalOpinionServiceImpl.java +++ b/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/service/impl/TaskApprovalOpinionServiceImpl.java @@ -1,8 +1,8 @@ -package org.jeecg.modules.demo.taskapprovalopinion.service.impl; +package org.jeecg.modules.taskapprovalopinion.service.impl; -import org.jeecg.modules.demo.taskapprovalopinion.entity.TaskApprovalOpinion; -import org.jeecg.modules.demo.taskapprovalopinion.mapper.TaskApprovalOpinionMapper; -import org.jeecg.modules.demo.taskapprovalopinion.service.ITaskApprovalOpinionService; +import org.jeecg.modules.taskapprovalopinion.entity.TaskApprovalOpinion; +import org.jeecg.modules.taskapprovalopinion.mapper.TaskApprovalOpinionMapper; +import org.jeecg.modules.taskapprovalopinion.service.ITaskApprovalOpinionService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;