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] =?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 { + +}