From 40a7c2dc7772c2e128aa4571a99011d6007e54bc Mon Sep 17 00:00:00 2001 From: zhihao <18915542763@163.com> Date: Thu, 21 May 2026 19:13:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?czh-20260521-=E8=AE=A1=E5=88=92=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/tasklist/entity/TaskList.java | 4 ++++ .../tasklist/mapper/xml/TaskListMapper.xml | 18 ++++-------------- .../service/impl/TaskListServiceImpl.java | 15 +++++++++------ 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskList.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskList.java index 9cf95b5..767014f 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskList.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/entity/TaskList.java @@ -84,4 +84,8 @@ public class TaskList implements Serializable { @TableField(exist = false) @Schema(description = "创建时间字符串") private java.lang.String createTimeStr; + + @TableField(exist = false) + @Schema(description = "当前用户权限等级:1=所有者,2=可编辑,3=可阅读") + private java.lang.String myPermission; } diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListMapper.xml index d6aac66..720c930 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/mapper/xml/TaskListMapper.xml @@ -7,17 +7,7 @@ FROM task_list t WHERE t.del_flag = '0' AND ( - -- 条件1：同一部门的人能看到互相创建的清单 - -- 注意：task_list.create_by 存的是 username，所以用 u.username 匹配 - - EXISTS ( - SELECT 1 FROM sys_user u - WHERE u.username = t.create_by - AND u.org_code = #{orgCode} - ) - OR - - -- 条件2：当前用户是所有者（permission=1） + -- 条件1：当前用户是所有者（permission=1） EXISTS ( SELECT 1 FROM task_list_permission p WHERE p.main_id = t.id @@ -25,7 +15,7 @@ AND p.permission = '1' AND p.del_flag = '0' ) - -- 条件3：当前用户是协作者（permission=2/3） + -- 条件2：当前用户是协作者（permission=2/3） OR EXISTS ( SELECT 1 FROM task_list_permission p WHERE p.main_id = t.id @@ -33,7 +23,7 @@ AND p.permission IN ('2', '3') AND p.del_flag = '0' ) - -- 条件4：清单中某任务的负责人/参与人是当前用户 + -- 条件3：清单中某任务的负责人/参与人是当前用户 OR EXISTS ( SELECT 1 FROM task_list_detial d WHERE d.main_id = t.id @@ -44,7 +34,7 @@ ) ) ) - -- 条件5：密级过滤（用户密级数值 > 清单密级数值才能看到） + -- 条件4：密级过滤（用户密级数值 > 清单密级数值才能看到） AND ( t.secret_level IS NULL OR t.secret_level < #{userSecLevel} diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListServiceImpl.java index 0a5d63b..dd90ee2 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/tasklist/service/impl/TaskListServiceImpl.java @@ -197,8 +197,8 @@ public class TaskListServiceImpl extends ServiceImpl i LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String userId = loginUser.getId(); - Integer sortOrder = 1; - taskListFavoriteMapper.shiftSortOrderUpByType(userId, "0", sortOrder); + Integer maxSort = taskListFavoriteService.getMaxSortOrderByType(userId, null, "0"); + Integer sortOrder = maxSort + 1; TaskListFavorite favorite = new TaskListFavorite(); favorite.setMainId(null); @@ -500,7 +500,7 @@ public class TaskListServiceImpl extends ServiceImpl i query.in(TaskList::getId, mainIds); query.and(w -> w.lt(TaskList::getSecretLevel, finalUserSecLevel).or().isNull(TaskList::getSecretLevel)); query.orderByAsc(TaskList::getCreateTime); - return enrichListSummaries(taskListMapper.selectList(query)); + return enrichListSummaries(taskListMapper.selectList(query), userId); } @Override @@ -514,7 +514,7 @@ public class TaskListServiceImpl extends ServiceImpl i String orgCode = loginUser.getOrgCode(); List lists = taskListMapper.selectVisibleLists(userId, userSecLevel, orgCode); - return enrichListSummaries(lists); + return enrichListSummaries(lists, userId); } @Override @@ -541,14 +541,14 @@ public class TaskListServiceImpl extends ServiceImpl i query.in(TaskList::getId, mainIds); query.and(w -> w.lt(TaskList::getSecretLevel, finalUserSecLevel).or().isNull(TaskList::getSecretLevel)); query.orderByAsc(TaskList::getCreateTime); - return enrichListSummaries(taskListMapper.selectList(query)); + return enrichListSummaries(taskListMapper.selectList(query), userId); } private String normalizePid(String pid) { return oConvertUtils.isNotEmpty(pid) ? pid : null; } - private List enrichListSummaries(List lists) { + private List enrichListSummaries(List lists, String currentUserId) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); for (TaskList list : lists) { if (list.getCreateTime() != null) { @@ -564,6 +564,9 @@ public class TaskListServiceImpl extends ServiceImpl i if (ownerUser != null) { list.setOwnerName(ownerUser.getRealname()); } + if (currentUserId != null && currentUserId.equals(owner.getUserId())) { + list.setMyPermission("1"); + } } LambdaQueryWrapper collabQuery = new LambdaQueryWrapper<>(); From 084222719d43fb7ee5a0c599db68b7171ed13989 Mon Sep 17 00:00:00 2001 From: ye1023 <12588209+ye1023@user.noreply.gitee.com> Date: Thu, 21 May 2026 19:54:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?yxk-20260521-=E5=AE=A1=E6=89=B9=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E8=A1=A8=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TaskApprovalOpinionController.java | 185 ++++++++++++++++++ .../entity/TaskApprovalOpinion.java | 134 +++++++++++++ .../mapper/TaskApprovalOpinionMapper.java | 17 ++ .../mapper/xml/TaskApprovalOpinionMapper.xml | 5 + .../service/ITaskApprovalOpinionService.java | 14 ++ .../impl/TaskApprovalOpinionServiceImpl.java | 19 ++ 6 files changed, 374 insertions(+) create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/controller/TaskApprovalOpinionController.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/entity/TaskApprovalOpinion.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/TaskApprovalOpinionMapper.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/xml/TaskApprovalOpinionMapper.xml create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/service/ITaskApprovalOpinionService.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/service/impl/TaskApprovalOpinionServiceImpl.java diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/controller/TaskApprovalOpinionController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/controller/TaskApprovalOpinionController.java new file mode 100644 index 0000000..d518e27 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/controller/TaskApprovalOpinionController.java @@ -0,0 +1,185 @@ +package org.jeecg.modules.demo.taskapprovalopinion.controller; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + /** + * @Description: task_approval_opinion + * @Author: jeecg-boot + * @Date: 2026-05-21 + * @Version: V1.0 + */ +@Tag(name="task_approval_opinion") +@RestController +@RequestMapping("/taskapprovalopinion/taskApprovalOpinion") +@Slf4j +public class TaskApprovalOpinionController extends JeecgController { + @Autowired + private ITaskApprovalOpinionService taskApprovalOpinionService; + + /** + * 分页列表查询 + * + * @param taskApprovalOpinion + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "task_approval_opinion-分页列表查询") + @Operation(summary="task_approval_opinion-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(TaskApprovalOpinion taskApprovalOpinion, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(taskApprovalOpinion, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = taskApprovalOpinionService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param taskApprovalOpinion + * @return + */ + @AutoLog(value = "task_approval_opinion-添加") + @Operation(summary="task_approval_opinion-添加") + @RequiresPermissions("taskapprovalopinion:task_approval_opinion:add") + @PostMapping(value = "/add") + public Result add(@RequestBody TaskApprovalOpinion taskApprovalOpinion) { + if (oConvertUtils.isEmpty(taskApprovalOpinion.getDelFlag())) { + taskApprovalOpinion.setDelFlag("0"); + } + taskApprovalOpinionService.save(taskApprovalOpinion); + + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param taskApprovalOpinion + * @return + */ + @AutoLog(value = "task_approval_opinion-编辑") + @Operation(summary="task_approval_opinion-编辑") + @RequiresPermissions("taskapprovalopinion:task_approval_opinion:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody TaskApprovalOpinion taskApprovalOpinion) { + taskApprovalOpinionService.updateById(taskApprovalOpinion); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "task_approval_opinion-通过id删除") + @Operation(summary="task_approval_opinion-通过id删除") + @RequiresPermissions("taskapprovalopinion:task_approval_opinion:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + taskApprovalOpinionService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "task_approval_opinion-批量删除") + @Operation(summary="task_approval_opinion-批量删除") + @RequiresPermissions("taskapprovalopinion:task_approval_opinion:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.taskApprovalOpinionService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "task_approval_opinion-通过id查询") + @Operation(summary="task_approval_opinion-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + TaskApprovalOpinion taskApprovalOpinion = taskApprovalOpinionService.getById(id); + if(taskApprovalOpinion==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(taskApprovalOpinion); + } + + /** + * 导出excel + * + * @param request + * @param taskApprovalOpinion + */ + @RequiresPermissions("taskapprovalopinion:task_approval_opinion:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, TaskApprovalOpinion taskApprovalOpinion) { + return super.exportXls(request, taskApprovalOpinion, TaskApprovalOpinion.class, "task_approval_opinion"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("taskapprovalopinion:task_approval_opinion:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, TaskApprovalOpinion.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/entity/TaskApprovalOpinion.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/entity/TaskApprovalOpinion.java new file mode 100644 index 0000000..41185c9 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/entity/TaskApprovalOpinion.java @@ -0,0 +1,134 @@ +package org.jeecg.modules.demo.taskapprovalopinion.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import org.jeecg.common.constant.ProvinceCityArea; +import org.jeecg.common.util.SpringContextUtils; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: task_approval_opinion + * @Author: jeecg-boot + * @Date: 2026-05-21 + * @Version: V1.0 + */ +@Data +@TableName("task_approval_opinion") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@Schema(description="task_approval_opinion") +public class TaskApprovalOpinion implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @Schema(description = "主键") + private java.lang.String id; + /**记录类型：PROCESS流程意见、SUPPLEMENT补充反馈、SYSTEM系统记录*/ + @Excel(name = "记录类型：PROCESS流程意见、SUPPLEMENT补充反馈、SYSTEM系统记录", width = 15) + @Schema(description = "记录类型：PROCESS流程意见、SUPPLEMENT补充反馈、SYSTEM系统记录") + private java.lang.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; + /**关联业务ID*/ + @Excel(name = "关联业务ID", width = 15) + @Schema(description = "关联业务ID") + private java.lang.String businessId; + /**流程编码*/ + @Excel(name = "流程编码", width = 15) + @Schema(description = "流程编码") + private java.lang.String flowCode; + /**流程实例ID*/ + @Excel(name = "流程实例ID", width = 15) + @Schema(description = "流程实例ID") + private java.lang.String processInstId; + /**Flowable任务ID*/ + @Excel(name = "Flowable任务ID", width = 15) + @Schema(description = "Flowable任务ID") + private java.lang.String flowTaskId; + /**流程节点Key*/ + @Excel(name = "流程节点Key", width = 15) + @Schema(description = "流程节点Key") + private java.lang.String taskDefKey; + /**流程节点名称*/ + @Excel(name = "流程节点名称", width = 15) + @Schema(description = "流程节点名称") + private java.lang.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; + /**操作结果，如同意、不同意、驳回、发起流程、补充反馈*/ + @Excel(name = "操作结果，如同意、不同意、驳回、发起流程、补充反馈", width = 15) + @Schema(description = "操作结果，如同意、不同意、驳回、发起流程、补充反馈") + private java.lang.String actionResult; + /**审批意见或反馈内容*/ + @Excel(name = "审批意见或反馈内容", width = 15) + @Schema(description = "审批意见或反馈内容") + private java.lang.String opinion; + /**办理人账号*/ + @Excel(name = "办理人账号", width = 15) + @Schema(description = "办理人账号") + private java.lang.String opUserId; + /**办理人姓名*/ + @Excel(name = "办理人姓名", width = 15) + @Schema(description = "办理人姓名") + private java.lang.String opUserName; + /**办理人部门ID*/ + @Excel(name = "办理人部门ID", width = 15) + @Schema(description = "办理人部门ID") + private java.lang.String opDeptId; + /**办理人部门名称*/ + @Excel(name = "办理人部门名称", width = 15) + @Schema(description = "办理人部门名称") + private java.lang.String opDeptName; + /**办理人部门编码*/ + @Excel(name = "办理人部门编码", width = 15) + @Schema(description = "办理人部门编码") + private java.lang.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; + /**删除标识：0正常，1删除*/ + @Excel(name = "删除标识：0正常，1删除", width = 15) + @Schema(description = "删除标识：0正常，1删除") + @TableLogic + private java.lang.String delFlag; + /**创建人*/ + @Schema(description = "创建人") + private java.lang.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; + /**更新人*/ + @Schema(description = "更新人") + private java.lang.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; + /**所属部门编码*/ + @Schema(description = "所属部门编码") + private java.lang.String sysOrgCode; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/TaskApprovalOpinionMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/TaskApprovalOpinionMapper.java new file mode 100644 index 0000000..08fb322 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/TaskApprovalOpinionMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.demo.taskapprovalopinion.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.demo.taskapprovalopinion.entity.TaskApprovalOpinion; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: task_approval_opinion + * @Author: jeecg-boot + * @Date: 2026-05-21 + * @Version: V1.0 + */ +public interface TaskApprovalOpinionMapper extends BaseMapper { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/xml/TaskApprovalOpinionMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/xml/TaskApprovalOpinionMapper.xml new file mode 100644 index 0000000..7a6b4ea --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/xml/TaskApprovalOpinionMapper.xml @@ -0,0 +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-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/service/ITaskApprovalOpinionService.java new file mode 100644 index 0000000..45698f7 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/service/ITaskApprovalOpinionService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.demo.taskapprovalopinion.service; + +import org.jeecg.modules.demo.taskapprovalopinion.entity.TaskApprovalOpinion; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: task_approval_opinion + * @Author: jeecg-boot + * @Date: 2026-05-21 + * @Version: V1.0 + */ +public interface ITaskApprovalOpinionService extends IService { + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/service/impl/TaskApprovalOpinionServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/service/impl/TaskApprovalOpinionServiceImpl.java new file mode 100644 index 0000000..3b417a5 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/taskapprovalopinion/service/impl/TaskApprovalOpinionServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.demo.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.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: task_approval_opinion + * @Author: jeecg-boot + * @Date: 2026-05-21 + * @Version: V1.0 + */ +@Service +public class TaskApprovalOpinionServiceImpl extends ServiceImpl implements ITaskApprovalOpinionService { + +} From c56d7a0b0c86ce2c20db6d133e3f22db74a3087f Mon Sep 17 00:00:00 2001 From: ye1023 <12588209+ye1023@user.noreply.gitee.com> Date: Thu, 21 May 2026 20:10:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?yxk-20260521-=E5=AE=A1=E6=89=B9=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E8=A1=A8=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TaskApprovalOpinionController.java | 6 +-- .../entity/TaskApprovalOpinion.java | 50 +++++++++---------- .../mapper/TaskApprovalOpinionMapper.java | 4 +- .../mapper/xml/TaskApprovalOpinionMapper.xml | 2 +- .../service/ITaskApprovalOpinionService.java | 4 +- .../impl/TaskApprovalOpinionServiceImpl.java | 8 +-- 6 files changed, 37 insertions(+), 37 deletions(-) rename {jeecg-module-system/jeecg-system-biz => jeecg-boot-platform/jeecg-boot-module-bpm-flowable}/src/main/java/org/jeecg/modules/taskapprovalopinion/controller/TaskApprovalOpinionController.java (96%) rename {jeecg-module-system/jeecg-system-biz => jeecg-boot-platform/jeecg-boot-module-bpm-flowable}/src/main/java/org/jeecg/modules/taskapprovalopinion/entity/TaskApprovalOpinion.java (82%) rename {jeecg-module-system/jeecg-system-biz => jeecg-boot-platform/jeecg-boot-module-bpm-flowable}/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/TaskApprovalOpinionMapper.java (70%) rename {jeecg-module-system/jeecg-system-biz => jeecg-boot-platform/jeecg-boot-module-bpm-flowable}/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/xml/TaskApprovalOpinionMapper.xml (61%) rename {jeecg-module-system/jeecg-system-biz => jeecg-boot-platform/jeecg-boot-module-bpm-flowable}/src/main/java/org/jeecg/modules/taskapprovalopinion/service/ITaskApprovalOpinionService.java (65%) rename {jeecg-module-system/jeecg-system-biz => jeecg-boot-platform/jeecg-boot-module-bpm-flowable}/src/main/java/org/jeecg/modules/taskapprovalopinion/service/impl/TaskApprovalOpinionServiceImpl.java (55%) 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; From e503d466d208e4feaf4482fd81fc1112f80b21e3 Mon Sep 17 00:00:00 2001 From: ye1023 <12588209+ye1023@user.noreply.gitee.com> Date: Thu, 21 May 2026 21:11:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?yxk-20260521-=E5=AE=A1=E6=89=B9=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E8=A1=A8=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TaskApprovalOpinionController.java | 224 +++++++++--------- .../entity/TaskApprovalOpinion.java | 119 ++++------ .../mapper/TaskApprovalOpinionMapper.java | 11 +- .../mapper/xml/TaskApprovalOpinionMapper.xml | 3 +- .../service/ITaskApprovalOpinionService.java | 6 +- .../impl/TaskApprovalOpinionServiceImpl.java | 9 +- 6 files changed, 164 insertions(+), 208 deletions(-) diff --git a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/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 index ef3c917..83f5ec3 100644 --- a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/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 @@ -38,7 +38,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.authz.annotation.RequiresPermissions; - /** +/** * @Description: task_approval_opinion * @Author: jeecg-boot * @Date: 2026-05-21 @@ -49,120 +49,120 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; @RequestMapping("/taskapprovalopinion/taskApprovalOpinion") @Slf4j public class TaskApprovalOpinionController extends JeecgController { - @Autowired - private ITaskApprovalOpinionService taskApprovalOpinionService; - - /** - * 分页列表查询 - * - * @param taskApprovalOpinion - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "task_approval_opinion-分页列表查询") - @Operation(summary="task_approval_opinion-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(TaskApprovalOpinion taskApprovalOpinion, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + @Autowired + private ITaskApprovalOpinionService taskApprovalOpinionService; + + /** + * 分页列表查询 + * + * @param taskApprovalOpinion + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "task_approval_opinion-分页列表查询") + @Operation(summary="task_approval_opinion-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(TaskApprovalOpinion taskApprovalOpinion, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(taskApprovalOpinion, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = taskApprovalOpinionService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param taskApprovalOpinion - * @return - */ - @AutoLog(value = "task_approval_opinion-添加") - @Operation(summary="task_approval_opinion-添加") - @RequiresPermissions("taskapprovalopinion:task_approval_opinion:add") - @PostMapping(value = "/add") - public Result add(@RequestBody TaskApprovalOpinion taskApprovalOpinion) { + Page page = new Page(pageNo, pageSize); + IPage pageList = taskApprovalOpinionService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param taskApprovalOpinion + * @return + */ + @AutoLog(value = "task_approval_opinion-添加") + @Operation(summary="task_approval_opinion-添加") + @RequiresPermissions("taskapprovalopinion:task_approval_opinion:add") + @PostMapping(value = "/add") + public Result add(@RequestBody TaskApprovalOpinion taskApprovalOpinion) { if (oConvertUtils.isEmpty(taskApprovalOpinion.getDelFlag())) { taskApprovalOpinion.setDelFlag("0"); } - taskApprovalOpinionService.save(taskApprovalOpinion); + taskApprovalOpinionService.save(taskApprovalOpinion); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param taskApprovalOpinion - * @return - */ - @AutoLog(value = "task_approval_opinion-编辑") - @Operation(summary="task_approval_opinion-编辑") - @RequiresPermissions("taskapprovalopinion:task_approval_opinion:edit") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody TaskApprovalOpinion taskApprovalOpinion) { - taskApprovalOpinionService.updateById(taskApprovalOpinion); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "task_approval_opinion-通过id删除") - @Operation(summary="task_approval_opinion-通过id删除") - @RequiresPermissions("taskapprovalopinion:task_approval_opinion:delete") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - taskApprovalOpinionService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "task_approval_opinion-批量删除") - @Operation(summary="task_approval_opinion-批量删除") - @RequiresPermissions("taskapprovalopinion:task_approval_opinion:deleteBatch") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.taskApprovalOpinionService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "task_approval_opinion-通过id查询") - @Operation(summary="task_approval_opinion-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - TaskApprovalOpinion taskApprovalOpinion = taskApprovalOpinionService.getById(id); - if(taskApprovalOpinion==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(taskApprovalOpinion); - } + return Result.OK("添加成功！"); + } /** - * 导出excel - * - * @param request - * @param taskApprovalOpinion - */ + * 编辑 + * + * @param taskApprovalOpinion + * @return + */ + @AutoLog(value = "task_approval_opinion-编辑") + @Operation(summary="task_approval_opinion-编辑") + @RequiresPermissions("taskapprovalopinion:task_approval_opinion:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody TaskApprovalOpinion taskApprovalOpinion) { + taskApprovalOpinionService.updateById(taskApprovalOpinion); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "task_approval_opinion-通过id删除") + @Operation(summary="task_approval_opinion-通过id删除") + @RequiresPermissions("taskapprovalopinion:task_approval_opinion:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + taskApprovalOpinionService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "task_approval_opinion-批量删除") + @Operation(summary="task_approval_opinion-批量删除") + @RequiresPermissions("taskapprovalopinion:task_approval_opinion:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.taskApprovalOpinionService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "task_approval_opinion-通过id查询") + @Operation(summary="task_approval_opinion-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + TaskApprovalOpinion taskApprovalOpinion = taskApprovalOpinionService.getById(id); + if(taskApprovalOpinion==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(taskApprovalOpinion); + } + + /** + * 导出excel + * + * @param request + * @param taskApprovalOpinion + */ @RequiresPermissions("taskapprovalopinion:task_approval_opinion:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, TaskApprovalOpinion taskApprovalOpinion) { @@ -170,12 +170,12 @@ public class TaskApprovalOpinionController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { diff --git a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/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 index cce3040..9ce5f34 100644 --- a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/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,134 +1,107 @@ package org.jeecg.modules.taskapprovalopinion.entity; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableLogic; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; -import lombok.Data; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; /** - * @Description: task_approval_opinion - * @Author: jeecg-boot - * @Date: 2026-05-21 - * @Version: V1.0 + * 审批意见快照表实体。 */ @Data @TableName("task_approval_opinion") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@Schema(description="task_approval_opinion") +@Schema(description = "task_approval_opinion") public class TaskApprovalOpinion implements Serializable { private static final long serialVersionUID = 1L; - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) + @TableId(type = IdType.ASSIGN_ID) @Schema(description = "主键") private String id; - /**记录类型：PROCESS流程意见、SUPPLEMENT补充反馈、SYSTEM系统记录*/ - @Excel(name = "记录类型：PROCESS流程意见、SUPPLEMENT补充反馈、SYSTEM系统记录", width = 15) - @Schema(description = "记录类型：PROCESS流程意见、SUPPLEMENT补充反馈、SYSTEM系统记录") + + @Schema(description = "记录类型：PROCESS/SUPPLEMENT/SYSTEM") private String recordType; - /**事项任务ID，对应task_task.id*/ - @Excel(name = "事项任务ID，对应task_task.id", width = 15) - @Schema(description = "事项任务ID，对应task_task.id") + + @Schema(description = "事项任务ID，对应 task_task.id") private String taskTaskId; - /**关联业务ID*/ - @Excel(name = "关联业务ID", width = 15) + @Schema(description = "关联业务ID") private String businessId; - /**流程编码*/ - @Excel(name = "流程编码", width = 15) + @Schema(description = "流程编码") private String flowCode; - /**流程实例ID*/ - @Excel(name = "流程实例ID", width = 15) + @Schema(description = "流程实例ID") private String processInstId; - /**Flowable任务ID*/ - @Excel(name = "Flowable任务ID", width = 15) + @Schema(description = "Flowable任务ID") private String flowTaskId; - /**流程节点Key*/ - @Excel(name = "流程节点Key", width = 15) + @Schema(description = "流程节点Key") private String taskDefKey; - /**流程节点名称*/ - @Excel(name = "流程节点名称", width = 15) + @Schema(description = "流程节点名称") 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反馈") + + @Schema(description = "操作类型") private String actionType; - /**操作结果，如同意、不同意、驳回、发起流程、补充反馈*/ - @Excel(name = "操作结果，如同意、不同意、驳回、发起流程、补充反馈", width = 15) - @Schema(description = "操作结果，如同意、不同意、驳回、发起流程、补充反馈") + + @Schema(description = "操作结果") private String actionResult; - /**审批意见或反馈内容*/ - @Excel(name = "审批意见或反馈内容", width = 15) + @Schema(description = "审批意见或反馈内容") private String opinion; - /**办理人账号*/ - @Excel(name = "办理人账号", width = 15) + @Schema(description = "办理人账号") private String opUserId; - /**办理人姓名*/ - @Excel(name = "办理人姓名", width = 15) + @Schema(description = "办理人姓名") private String opUserName; - /**办理人部门ID*/ - @Excel(name = "办理人部门ID", width = 15) + @Schema(description = "办理人部门ID") private String opDeptId; - /**办理人部门名称*/ - @Excel(name = "办理人部门名称", width = 15) + @Schema(description = "办理人部门名称") private String opDeptName; - /**办理人部门编码*/ - @Excel(name = "办理人部门编码", width = 15) + @Schema(description = "办理人部门编码") 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") + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "办理时间") private Date opTime; - /**删除标识：0正常，1删除*/ - @Excel(name = "删除标识：0正常，1删除", width = 15) - @Schema(description = "删除标识：0正常，1删除") + @TableLogic + @Schema(description = "删除状态：0正常，1删除") private String delFlag; - /**创建人*/ + @Schema(description = "创建人") private String createBy; - /**创建时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @Schema(description = "创建时间") + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Schema(description = "创建日期") private Date createTime; - /**更新人*/ + @Schema(description = "更新人") private String updateBy; - /**更新时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @Schema(description = "更新时间") + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Schema(description = "更新日期") private Date updateTime; - /**所属部门编码*/ - @Schema(description = "所属部门编码") + + @Schema(description = "所属部门") private String sysOrgCode; } diff --git a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/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 index 0c3e5a4..c23e680 100644 --- a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/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,17 +1,10 @@ package org.jeecg.modules.taskapprovalopinion.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.taskapprovalopinion.entity.TaskApprovalOpinion; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.taskapprovalopinion.entity.TaskApprovalOpinion; /** - * @Description: task_approval_opinion - * @Author: jeecg-boot - * @Date: 2026-05-21 - * @Version: V1.0 + * 审批意见快照 Mapper。 */ public interface TaskApprovalOpinionMapper extends BaseMapper { - } diff --git a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/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 index 6002f5c..8101995 100644 --- a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/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,4 @@ - - \ No newline at end of file + diff --git a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/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 index 897fa3d..a5eb000 100644 --- a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/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 @@ -4,11 +4,7 @@ import org.jeecg.modules.taskapprovalopinion.entity.TaskApprovalOpinion; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: task_approval_opinion - * @Author: jeecg-boot - * @Date: 2026-05-21 - * @Version: V1.0 + * 审批意见快照 Service。 */ public interface ITaskApprovalOpinionService extends IService { - } diff --git a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/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 index acae5b6..b1499eb 100644 --- a/jeecg-boot-platform/jeecg-boot-module-bpm-flowable/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,19 +1,14 @@ package org.jeecg.modules.taskapprovalopinion.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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; - /** - * @Description: task_approval_opinion - * @Author: jeecg-boot - * @Date: 2026-05-21 - * @Version: V1.0 + * 审批意见快照 Service 实现。 */ @Service public class TaskApprovalOpinionServiceImpl extends ServiceImpl implements ITaskApprovalOpinionService { - }