行政处罚修复添加外网申请的情况
This commit is contained in:
parent
766685c466
commit
b79ebdd2d4
|
|
@ -1,6 +1,7 @@
|
||||||
package com.chinaweal.aiccs.aiccs.punishment.controller;
|
package com.chinaweal.aiccs.aiccs.punishment.controller;
|
||||||
|
|
||||||
import cn.hutool.core.util.IdUtil;
|
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.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.chinaweal.aiccs.aiccs.abnormal.entity.EBaseinfo;
|
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) {
|
public RestResult<?> getTBizRemPunishment(@RequestParam @ApiParam("id") Serializable id) {
|
||||||
TBizRemPunishment tBizRemPunishment = iTBizRemPunishmentService.getById(id);
|
TBizRemPunishment tBizRemPunishment = iTBizRemPunishmentService.getById(id);
|
||||||
TbIlcPunInfoQuery tbIlcPunInfoQuery = tbIlcPunInfoQueryService.findById(tBizRemPunishment.getPunishmentId());
|
TbIlcPunInfoQuery tbIlcPunInfoQuery = tbIlcPunInfoQueryService.findById(tBizRemPunishment.getPunishmentId());
|
||||||
|
TSTaskList task = taskListService.getOne(new LambdaQueryWrapper<TSTaskList>()
|
||||||
|
.eq(TSTaskList::getBizseqid, tBizRemPunishment.getBizSeq()));
|
||||||
return RestResult.ok(new HashMap<String, Object>(){{
|
return RestResult.ok(new HashMap<String, Object>(){{
|
||||||
put("punishInfo", tBizRemPunishment);
|
put("punishInfo", tBizRemPunishment);
|
||||||
put("IlcPunInfo", tbIlcPunInfoQuery);
|
put("IlcPunInfo", tbIlcPunInfoQuery);
|
||||||
|
put("task", task);
|
||||||
}});
|
}});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -123,5 +123,11 @@ public class TBizRemPunishment extends SuperEntity {
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
String opinion;
|
String opinion;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 回退建议
|
||||||
|
*/
|
||||||
|
@TableField("backProposal")
|
||||||
|
private String backProposal;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -121,6 +121,12 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
|
||||||
String nextNodeID = null;
|
String nextNodeID = null;
|
||||||
String status = tBizRemPunishment.getStatus();
|
String status = tBizRemPunishment.getStatus();
|
||||||
|
|
||||||
|
//外网申请的且不受理的情况下,意见值给到回退建议
|
||||||
|
if(StringUtils.equals(tsTaskList.getOrigin(),"1")
|
||||||
|
&& StringUtils.equals(tBizRemPunishment.getStatus(),"3")){
|
||||||
|
tBizRemPunishment.setBackProposal(tBizRemPunishment.getOpinion());
|
||||||
|
}
|
||||||
|
|
||||||
//根据当前环节判断
|
//根据当前环节判断
|
||||||
if(StringUtils.equals(linkType,"1")){ //受理状态,需要提交审批人或直接不予修复结束
|
if(StringUtils.equals(linkType,"1")){ //受理状态,需要提交审批人或直接不予修复结束
|
||||||
if(StringUtils.equals(status,"3")){ //不予修复,直接结束流程
|
if(StringUtils.equals(status,"3")){ //不予修复,直接结束流程
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue