sz-team/supervision-test-repo
17
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

yxk-20260521-审批历史表代码生成

Browse Source
This commit is contained in:
ye1023
2026-05-21 21:11:27 +08:00
parent c56d7a0b0c
commit e503d466d2
6 changed files with 164 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/controller/TaskApprovalOpinionController.java
+110 -110
View File
@@ -38,7 +38,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
/** /**
* @Description: task_approval_opinion * @Description: task_approval_opinion
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2026-05-21 * @Date: 2026-05-21
@@ -49,120 +49,120 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
@RequestMapping("/taskapprovalopinion/taskApprovalOpinion") @RequestMapping("/taskapprovalopinion/taskApprovalOpinion")
@Slf4j @Slf4j
public class TaskApprovalOpinionController extends JeecgController<TaskApprovalOpinion, ITaskApprovalOpinionService> { public class TaskApprovalOpinionController extends JeecgController<TaskApprovalOpinion, ITaskApprovalOpinionService> {
@Autowired @Autowired
private ITaskApprovalOpinionService taskApprovalOpinionService; private ITaskApprovalOpinionService taskApprovalOpinionService;
/** /**
* 分页列表查询 * 分页列表查询
* *
* @param taskApprovalOpinion * @param taskApprovalOpinion
* @param pageNo * @param pageNo
* @param pageSize * @param pageSize
* @param req * @param req
* @return * @return
*/ */
//@AutoLog(value = "task_approval_opinion-分页列表查询") //@AutoLog(value = "task_approval_opinion-分页列表查询")
@Operation(summary="task_approval_opinion-分页列表查询") @Operation(summary="task_approval_opinion-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<TaskApprovalOpinion>> queryPageList(TaskApprovalOpinion taskApprovalOpinion, public Result<IPage<TaskApprovalOpinion>> queryPageList(TaskApprovalOpinion taskApprovalOpinion,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<TaskApprovalOpinion> queryWrapper = QueryGenerator.initQueryWrapper(taskApprovalOpinion, req.getParameterMap()); QueryWrapper<TaskApprovalOpinion> queryWrapper = QueryGenerator.initQueryWrapper(taskApprovalOpinion, req.getParameterMap());
Page<TaskApprovalOpinion> page = new Page<TaskApprovalOpinion>(pageNo, pageSize); Page<TaskApprovalOpinion> page = new Page<TaskApprovalOpinion>(pageNo, pageSize);
IPage<TaskApprovalOpinion> pageList = taskApprovalOpinionService.page(page, queryWrapper); IPage<TaskApprovalOpinion> pageList = taskApprovalOpinionService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
} }
/** /**
* 添加 * 添加
* *
* @param taskApprovalOpinion * @param taskApprovalOpinion
* @return * @return
*/ */
@AutoLog(value = "task_approval_opinion-添加") @AutoLog(value = "task_approval_opinion-添加")
@Operation(summary="task_approval_opinion-添加") @Operation(summary="task_approval_opinion-添加")
@RequiresPermissions("taskapprovalopinion:task_approval_opinion:add") @RequiresPermissions("taskapprovalopinion:task_approval_opinion:add")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<String> add(@RequestBody TaskApprovalOpinion taskApprovalOpinion) { public Result<String> add(@RequestBody TaskApprovalOpinion taskApprovalOpinion) {
if (oConvertUtils.isEmpty(taskApprovalOpinion.getDelFlag())) { if (oConvertUtils.isEmpty(taskApprovalOpinion.getDelFlag())) {
taskApprovalOpinion.setDelFlag("0"); taskApprovalOpinion.setDelFlag("0");
} }
taskApprovalOpinionService.save(taskApprovalOpinion); taskApprovalOpinionService.save(taskApprovalOpinion);
return Result.OK("添加成功！"); 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<String> 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<String> 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<String> 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<TaskApprovalOpinion> 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
* @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<String> 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<String> 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<String> 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<TaskApprovalOpinion> 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") @RequiresPermissions("taskapprovalopinion:task_approval_opinion:exportXls")
@RequestMapping(value = "/exportXls") @RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, TaskApprovalOpinion taskApprovalOpinion) { public ModelAndView exportXls(HttpServletRequest request, TaskApprovalOpinion taskApprovalOpinion) {
@@ -170,12 +170,12 @@ public class TaskApprovalOpinionController extends JeecgController<TaskApprovalO
} }
/** /**
* 通过excel导入数据 * 通过excel导入数据
* *
* @param request * @param request
* @param response * @param response
* @return * @return
*/ */
@RequiresPermissions("taskapprovalopinion:task_approval_opinion:importExcel") @RequiresPermissions("taskapprovalopinion:task_approval_opinion:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST) @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/entity/TaskApprovalOpinion.java
+46 -73
View File
@@ -1,134 +1,107 @@
package org.jeecg.modules.taskapprovalopinion.entity; 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.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableLogic;
import org.jeecg.common.constant.ProvinceCityArea; import com.baomidou.mybatisplus.annotation.TableName;
import org.jeecg.common.util.SpringContextUtils;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; 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 io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; 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 @Data
@TableName("task_approval_opinion") @TableName("task_approval_opinion")
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@Schema(description="task_approval_opinion") @Schema(description = "task_approval_opinion")
public class TaskApprovalOpinion implements Serializable { public class TaskApprovalOpinion implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**主键*/ @TableId(type = IdType.ASSIGN_ID)
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键") @Schema(description = "主键")
private String id; 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; 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; private String taskTaskId;
/**关联业务ID*/
@Excel(name = "关联业务ID", width = 15)
@Schema(description = "关联业务ID") @Schema(description = "关联业务ID")
private String businessId; private String businessId;
/**流程编码*/
@Excel(name = "流程编码", width = 15)
@Schema(description = "流程编码") @Schema(description = "流程编码")
private String flowCode; private String flowCode;
/**流程实例ID*/
@Excel(name = "流程实例ID", width = 15)
@Schema(description = "流程实例ID") @Schema(description = "流程实例ID")
private String processInstId; private String processInstId;
/**Flowable任务ID*/
@Excel(name = "Flowable任务ID", width = 15)
@Schema(description = "Flowable任务ID") @Schema(description = "Flowable任务ID")
private String flowTaskId; private String flowTaskId;
/**流程节点Key*/
@Excel(name = "流程节点Key", width = 15)
@Schema(description = "流程节点Key") @Schema(description = "流程节点Key")
private String taskDefKey; private String taskDefKey;
/**流程节点名称*/
@Excel(name = "流程节点名称", width = 15)
@Schema(description = "流程节点名称") @Schema(description = "流程节点名称")
private String taskName; private String taskName;
/**操作类型：START发起、APPROVE办理、REJECT驳回、CALLBACK取回、INVALID作废、FEEDBACK反馈*/
@Excel(name = "操作类型：START发起、APPROVE办理、REJECT驳回、CALLBACK取回、INVALID作废、FEEDBACK反馈", width = 15) @Schema(description = "操作类型")
@Schema(description = "操作类型：START发起、APPROVE办理、REJECT驳回、CALLBACK取回、INVALID作废、FEEDBACK反馈")
private String actionType; private String actionType;
/**操作结果，如同意、不同意、驳回、发起流程、补充反馈*/
@Excel(name = "操作结果，如同意、不同意、驳回、发起流程、补充反馈", width = 15) @Schema(description = "操作结果")
@Schema(description = "操作结果，如同意、不同意、驳回、发起流程、补充反馈")
private String actionResult; private String actionResult;
/**审批意见或反馈内容*/
@Excel(name = "审批意见或反馈内容", width = 15)
@Schema(description = "审批意见或反馈内容") @Schema(description = "审批意见或反馈内容")
private String opinion; private String opinion;
/**办理人账号*/
@Excel(name = "办理人账号", width = 15)
@Schema(description = "办理人账号") @Schema(description = "办理人账号")
private String opUserId; private String opUserId;
/**办理人姓名*/
@Excel(name = "办理人姓名", width = 15)
@Schema(description = "办理人姓名") @Schema(description = "办理人姓名")
private String opUserName; private String opUserName;
/**办理人部门ID*/
@Excel(name = "办理人部门ID", width = 15)
@Schema(description = "办理人部门ID") @Schema(description = "办理人部门ID")
private String opDeptId; private String opDeptId;
/**办理人部门名称*/
@Excel(name = "办理人部门名称", width = 15)
@Schema(description = "办理人部门名称") @Schema(description = "办理人部门名称")
private String opDeptName; private String opDeptName;
/**办理人部门编码*/
@Excel(name = "办理人部门编码", width = 15)
@Schema(description = "办理人部门编码") @Schema(description = "办理人部门编码")
private 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")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@Schema(description = "办理时间") @Schema(description = "办理时间")
private Date opTime; private Date opTime;
/**删除标识：0正常，1删除*/
@Excel(name = "删除标识：0正常，1删除", width = 15)
@Schema(description = "删除标识：0正常，1删除")
@TableLogic @TableLogic
@Schema(description = "删除状态：0正常，1删除")
private String delFlag; private String delFlag;
/**创建人*/
@Schema(description = "创建人") @Schema(description = "创建人")
private String createBy; private String createBy;
/**创建时间*/
@JsonFormat(timezone = "GMT+8",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") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "创建时间") @Schema(description = "创建日期")
private Date createTime; private Date createTime;
/**更新人*/
@Schema(description = "更新人") @Schema(description = "更新人")
private String updateBy; private String updateBy;
/**更新时间*/
@JsonFormat(timezone = "GMT+8",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") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Schema(description = "更新时间") @Schema(description = "更新日期")
private Date updateTime; private Date updateTime;
/**所属部门编码*/
@Schema(description = "所属部门编码") @Schema(description = "所属部门")
private String sysOrgCode; private String sysOrgCode;
} }
jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/TaskApprovalOpinionMapper.java
+2 -9
View File
@@ -1,17 +1,10 @@
package org.jeecg.modules.taskapprovalopinion.mapper; 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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.taskapprovalopinion.entity.TaskApprovalOpinion;
/** /**
* @Description: task_approval_opinion * 审批意见快照 Mapper。
* @Author: jeecg-boot
* @Date: 2026-05-21
* @Version: V1.0
*/ */
public interface TaskApprovalOpinionMapper extends BaseMapper<TaskApprovalOpinion> { public interface TaskApprovalOpinionMapper extends BaseMapper<TaskApprovalOpinion> {
} }
jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/mapper/xml/TaskApprovalOpinionMapper.xml
-1
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.taskapprovalopinion.mapper.TaskApprovalOpinionMapper"> <mapper namespace="org.jeecg.modules.taskapprovalopinion.mapper.TaskApprovalOpinionMapper">
</mapper> </mapper>
jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/service/ITaskApprovalOpinionService.java
+1 -5
View File
@@ -4,11 +4,7 @@ import org.jeecg.modules.taskapprovalopinion.entity.TaskApprovalOpinion;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**
* @Description: task_approval_opinion * 审批意见快照 Service。
* @Author: jeecg-boot
* @Date: 2026-05-21
* @Version: V1.0
*/ */
public interface ITaskApprovalOpinionService extends IService<TaskApprovalOpinion> { public interface ITaskApprovalOpinionService extends IService<TaskApprovalOpinion> {
} }
jeecg-boot-platform/jeecg-boot-module-bpm-flowable/src/main/java/org/jeecg/modules/taskapprovalopinion/service/impl/TaskApprovalOpinionServiceImpl.java
+2 -7
View File
@@ -1,19 +1,14 @@
package org.jeecg.modules.taskapprovalopinion.service.impl; 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.entity.TaskApprovalOpinion;
import org.jeecg.modules.taskapprovalopinion.mapper.TaskApprovalOpinionMapper; import org.jeecg.modules.taskapprovalopinion.mapper.TaskApprovalOpinionMapper;
import org.jeecg.modules.taskapprovalopinion.service.ITaskApprovalOpinionService; import org.jeecg.modules.taskapprovalopinion.service.ITaskApprovalOpinionService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/** /**
* @Description: task_approval_opinion * 审批意见快照 Service 实现。
* @Author: jeecg-boot
* @Date: 2026-05-21
* @Version: V1.0
*/ */
@Service @Service
public class TaskApprovalOpinionServiceImpl extends ServiceImpl<TaskApprovalOpinionMapper, TaskApprovalOpinion> implements ITaskApprovalOpinionService { public class TaskApprovalOpinionServiceImpl extends ServiceImpl<TaskApprovalOpinionMapper, TaskApprovalOpinion> implements ITaskApprovalOpinionService {
} }