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 { - }