diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentController.java b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentController.java index dea296d..6ab9888 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentController.java @@ -1,6 +1,7 @@ package com.chinaweal.aiccs.aiccs.punishment.controller; import cn.hutool.core.util.IdUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaweal.aiccs.aiccs.abnormal.entity.EBaseinfo; @@ -110,9 +111,12 @@ public class TBizRemPunishmentController extends BaseController { public RestResult getTBizRemPunishment(@RequestParam @ApiParam("id") Serializable id) { TBizRemPunishment tBizRemPunishment = iTBizRemPunishmentService.getById(id); TbIlcPunInfoQuery tbIlcPunInfoQuery = tbIlcPunInfoQueryService.findById(tBizRemPunishment.getPunishmentId()); + TSTaskList task = taskListService.getOne(new LambdaQueryWrapper() + .eq(TSTaskList::getBizseqid, tBizRemPunishment.getBizSeq())); return RestResult.ok(new HashMap(){{ put("punishInfo", tBizRemPunishment); put("IlcPunInfo", tbIlcPunInfoQuery); + put("task", task); }}); } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/entity/TBizRemPunishment.java b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/entity/TBizRemPunishment.java index 672709b..5fe2c50 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/entity/TBizRemPunishment.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/entity/TBizRemPunishment.java @@ -123,5 +123,11 @@ public class TBizRemPunishment extends SuperEntity { @TableField(exist = false) String opinion; + /** + * 回退建议 + */ + @TableField("backProposal") + private String backProposal; + } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java index 7e5c452..7b6a149 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java @@ -121,6 +121,12 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl