行政处罚修复功能添加审批流程并插入到修复表里

src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentController.java

@@ -144,7 +144,6 @@ public class TBizRemPunishmentController extends BaseController {
     @ApiOperation(value = "7.启动待办", position = 7)
     @PostMapping("/startTask")
     public RestResult<?> startTask(@RequestBody TBizRemPunishment tBizRemPunishment) {
-
         Integer count = iTBizRemPunishmentService.lambdaQuery()
                 .eq(TBizRemPunishment::getPunishmentId, tBizRemPunishment.getPunishmentId()).count();
         if (count > 0) {
@@ -156,9 +155,19 @@ public class TBizRemPunishmentController extends BaseController {
     @ApiOperation(value = "8.提交待办", position = 8)
     @PostMapping("/submitTask")
     public RestResult<?> submitTask(@RequestBody TBizRemPunishment tBizRemPunishment) {
-
         List<TSTaskList> listTask = taskListService.selectByBizSeqID(tBizRemPunishment.getBizSeq());
         AssertUtils.isTrue(!listTask.isEmpty(), ResultCode.DATA_NONE);
+        if(StringUtils.isEmpty(tBizRemPunishment.getOpinion())
+            || (!StringUtils.equals(tBizRemPunishment.getStatus(),"2")
+                && !StringUtils.equals(tBizRemPunishment.getStatus(),"3"))){
+            return RestResult.error(ResultCode.PARAM_IS_BLANK);
+        }
+        if(StringUtils.equals(tBizRemPunishment.getLinkType(),"1")
+                && StringUtils.isEmpty(tBizRemPunishment.getNextPerformerids())){
+            if(StringUtils.equals(tBizRemPunishment.getStatus(),"2")){
+                return RestResult.error(ResultCode.PARAM_IS_BLANK);
+            }
+        }
 
         iTBizRemPunishmentService.submitTask(tBizRemPunishment, listTask.get(0));
         return RestResult.ok();

src/main/java/com/chinaweal/aiccs/aiccs/punishment/entity/CaseCreInformation.java

@@ -0,0 +1,130 @@
+package com.chinaweal.aiccs.aiccs.punishment.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.chinaweal.youfool.framework.springboot.mybatis.plus.SuperEntity;
+import com.chinaweal.youfool.framework.springboot.json.LocalDateTimeStringSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+
+/**
+ * 行政处罚信用修复信息
+ *
+ * @author zhouxy
+ * @since 2026-1-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("CRGS.CASE_CRE_INFORMATION")
+@ApiModel(value="CaseCreInformation对象", description="行政处罚信用修复信息")
+public class CaseCreInformation extends SuperEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "CASECREID", type = IdType.INPUT)
+    private String casecreid;
+
+    /**
+     * 主体身份标识
+     */
+    @ApiModelProperty(value = "主体身份标识")
+    @TableField("PRIPID")
+    private String pripid;
+
+    /**
+     * 企业名称
+     */
+    @ApiModelProperty(value = "企业名称")
+    @TableField("ENTNAME")
+    private String entname;
+
+    /**
+     * 统一社会信用代码
+     */
+    @ApiModelProperty(value = "统一社会信用代码")
+    @TableField("UNISCID")
+    private String uniscid;
+
+    /**
+     * 案件ID
+     */
+    @ApiModelProperty(value = "案件ID")
+    @TableField("CASEID")
+    private String caseid;
+
+    /**
+     * 申请修复日期
+     */
+    @ApiModelProperty(value = "申请修复日期")
+    @TableField("REPAIRDATE")
+    private Date repairdate;
+
+    /**
+     * 修复机关代码
+     */
+    @ApiModelProperty(value = "修复机关代码")
+    @TableField("REPAUTH")
+    private String repauth;
+
+    /**
+     * 修复机关名称
+     */
+    @ApiModelProperty(value = "修复机关名称")
+    @TableField("REPAUTH_CN")
+    private String repauthCn;
+
+    /**
+     * 修复日期
+     */
+    @ApiModelProperty(value = "修复日期")
+    @TableField("REPDATE")
+    private Date repdate;
+
+    /**
+     * 扩展字段来源节点
+     */
+    @ApiModelProperty(value = "扩展字段来源节点")
+    @TableField("S_EXT_FROMNODE")
+    private String sExtFromnode;
+
+    /**
+     * 扩展数据时间
+     */
+    @ApiModelProperty(value = "扩展数据时间")
+    @TableField("S_EXT_DATATIME")
+    @JsonSerialize(using = LocalDateTimeStringSerializer.class)
+    private LocalDateTime sExtDatatime;
+
+    /**
+     * 数据来源
+     */
+    @ApiModelProperty(value = "数据来源")
+    @TableField("DATASOURCE")
+    private String datasource;
+
+    /**
+     * 修复文号
+     */
+    @ApiModelProperty(value = "修复文号")
+    @TableField("REPAIRNO")
+    private String repairno;
+
+    /**
+     * 修复机关统一社会信用代码
+     */
+    @ApiModelProperty(value = "修复机关统一社会信用代码")
+    @TableField("REPAUTH_UNISCID")
+    private String repauthUniscid;
+
+}

src/main/java/com/chinaweal/aiccs/aiccs/punishment/entity/CasePubNbaseinfo.java

@@ -0,0 +1,332 @@
+package com.chinaweal.aiccs.aiccs.punishment.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.chinaweal.youfool.framework.springboot.mybatis.plus.SuperEntity;
+import com.chinaweal.youfool.framework.springboot.json.LocalDateTimeStringSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 行政处罚基本信息
+ *
+ * @author zhouxy
+ * @since 2026-1-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("CRGS.CASE_PUB_NBASEINFO")
+@ApiModel(value="CasePubNbaseinfo对象", description="行政处罚基本信息")
+public class CasePubNbaseinfo extends SuperEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "CASEID", type = IdType.INPUT)
+    private String caseid;
+
+    /**
+     * 案件类型
+     */
+    @ApiModelProperty(value = "案件类型")
+    @TableField("ACTYPE")
+    private String actype;
+
+    /**
+     * 主体身份标识
+     */
+    @ApiModelProperty(value = "主体身份标识")
+    @TableField("PRIPID")
+    private String pripid;
+
+    /**
+     * 企业名称
+     */
+    @ApiModelProperty(value = "企业名称")
+    @TableField("ENTNAME")
+    private String entname;
+
+    /**
+     * 统一社会信用代码
+     */
+    @ApiModelProperty(value = "统一社会信用代码")
+    @TableField("UNISCID")
+    private String uniscid;
+
+    /**
+     * 注册号
+     */
+    @ApiModelProperty(value = "注册号")
+    @TableField("REGNO")
+    private String regno;
+
+    /**
+     * 机构证书代码
+     */
+    @ApiModelProperty(value = "机构证书代码")
+    @TableField("INSCERCODE")
+    private String inscercode;
+
+    /**
+     * 社会组织代码
+     */
+    @ApiModelProperty(value = "社会组织代码")
+    @TableField("SOCORGCODE")
+    private String socorgcode;
+
+    /**
+     * 组织机构代码
+     */
+    @ApiModelProperty(value = "组织机构代码")
+    @TableField("ORGCODE")
+    private String orgcode;
+
+    /**
+     * 税务登记号
+     */
+    @ApiModelProperty(value = "税务登记号")
+    @TableField("TAXID")
+    private String taxid;
+
+    /**
+     * 法定代表人
+     */
+    @ApiModelProperty(value = "法定代表人")
+    @TableField("LEREP")
+    private String lerep;
+
+    /**
+     * 证件类型
+     */
+    @ApiModelProperty(value = "证件类型")
+    @TableField("CERTYPE")
+    private String certype;
+
+    /**
+     * 证件号码
+     */
+    @ApiModelProperty(value = "证件号码")
+    @TableField("CERNO")
+    private String cerNo;
+
+    /**
+     * 姓名
+     */
+    @ApiModelProperty(value = "姓名")
+    @TableField("NAME")
+    private String name;
+
+    /**
+     * 违法当事人证件类型
+     */
+    @ApiModelProperty(value = "违法当事人证件类型")
+    @TableField("AC_CERTYPE")
+    private String acCertype;
+
+    /**
+     * 违法当事人证件号码
+     */
+    @ApiModelProperty(value = "违法当事人证件号码")
+    @TableField("AC_CERNO")
+    private String acCerNo;
+
+    /**
+     * 处罚决定书文号
+     */
+    @ApiModelProperty(value = "处罚决定书文号")
+    @TableField("PENDECNO")
+    private String penDecNo;
+
+    /**
+     * 违法行为类型代码
+     */
+    @ApiModelProperty(value = "违法行为类型代码")
+    @TableField("ILLEGACTTYPECODE")
+    private String illegActTypeCode;
+
+    /**
+     * 违法行为类型
+     */
+    @ApiModelProperty(value = "违法行为类型")
+    @TableField("ILLEGACTTYPE")
+    private String illegActType;
+
+    /**
+     * 主要违法事实
+     */
+    @ApiModelProperty(value = "主要违法事实")
+    @TableField("MAINILLEGFACT")
+    private String mainIllegFact;
+
+    /**
+     * 处罚依据
+     */
+    @ApiModelProperty(value = "处罚依据")
+    @TableField("PENBASIS")
+    private String penBasis;
+
+    /**
+     * 处罚依据中文
+     */
+    @ApiModelProperty(value = "处罚依据中文")
+    @TableField("PENBASIS_CN")
+    private String penBasisCn;
+
+    /**
+     * 处罚种类
+     */
+    @ApiModelProperty(value = "处罚种类")
+    @TableField("PENTYPE")
+    private String penType;
+
+    /**
+     * 处罚种类中文
+     */
+    @ApiModelProperty(value = "处罚种类中文")
+    @TableField("PENTYPE_CN")
+    private String penTypeCn;
+
+    /**
+     * 处罚金额
+     */
+    @ApiModelProperty(value = "处罚金额")
+    @TableField("PENAM")
+    private BigDecimal penam;
+
+    /**
+     * 没收违法所得金额
+     */
+    @ApiModelProperty(value = "没收违法所得金额")
+    @TableField("FORFAM")
+    private BigDecimal forfam;
+
+    /**
+     * 处罚决定日期
+     */
+    @ApiModelProperty(value = "处罚决定日期")
+    @TableField("PENDECISSDATE")
+//    @JsonSerialize(using = LocalDateTimeStringSerializer.class)
+    private Date penDecissDate;
+
+    /**
+     * 处罚期限
+     */
+    @ApiModelProperty(value = "处罚期限")
+    @TableField("PENPERI")
+//    @JsonSerialize(using = LocalDateTimeStringSerializer.class)
+    private Date penPeri;
+
+    /**
+     * 处罚机关
+     */
+    @ApiModelProperty(value = "处罚机关")
+    @TableField("PENAUTH")
+    private String penAuth;
+
+    /**
+     * 处罚机关中文
+     */
+    @ApiModelProperty(value = "处罚机关中文")
+    @TableField("PENAUTH_CN")
+    private String penAuthCn;
+
+    /**
+     * 处罚机关统一社会信用代码
+     */
+    @ApiModelProperty(value = "处罚机关统一社会信用代码")
+    @TableField("PENAUTHUNISCID")
+    private String penAuthUniscid;
+
+    /**
+     * 处罚内容
+     */
+    @ApiModelProperty(value = "处罚内容")
+    @TableField("PENCONTENT")
+    private String penContent;
+
+    /**
+     * 吊销许可证数量
+     */
+    @ApiModelProperty(value = "吊销许可证数量")
+    @TableField("REVLICNUM")
+    private String revLicNum;
+
+    /**
+     * 公示日期
+     */
+    @ApiModelProperty(value = "公示日期")
+    @TableField("PUBLICDATE")
+//    @JsonSerialize(using = LocalDateTimeStringSerializer.class)
+    private Date publicDate;
+
+    /**
+     * 公示截止日期
+     */
+    @ApiModelProperty(value = "公示截止日期")
+    @TableField("PUBDEADLINE")
+//    @JsonSerialize(using = LocalDateTimeStringSerializer.class)
+    private Date pubDeadline;
+
+    /**
+     * 数据部门
+     */
+    @ApiModelProperty(value = "数据部门")
+    @TableField("DATADEPT")
+    private String dataDept;
+
+    /**
+     * 数据部门统一社会信用代码
+     */
+    @ApiModelProperty(value = "数据部门统一社会信用代码")
+    @TableField("DATADEPTUNISCID")
+    private String dataDeptUniscid;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    @TableField("REMARK")
+    private String remark;
+
+//    /**
+//     * 扩展字段来源节点
+//     */
+//    @ApiModelProperty(value = "扩展字段来源节点")
+//    @TableField("S_EXT_FROMNODE")
+//    private String sExtFromnode;
+//
+//    /**
+//     * 扩展数据时间
+//     */
+//    @ApiModelProperty(value = "扩展数据时间")
+//    @TableField("S_EXT_DATATIME")
+//    @JsonSerialize(using = LocalDateTimeStringSerializer.class)
+//    private LocalDateTime sExtDatatime;
+//
+//    /**
+//     * 创建时间
+//     */
+//    @ApiModelProperty(value = "创建时间")
+//    @TableField("CREATETIME")
+//    @JsonSerialize(using = LocalDateTimeStringSerializer.class)
+//    private LocalDateTime createTime;
+
+    /**
+     * 最后更新时间
+     */
+    @ApiModelProperty(value = "最后更新时间")
+    @TableField("LASTUPDATETIME")
+//    @JsonSerialize(using = LocalDateTimeStringSerializer.class)
+    private Date lastUpdateTime;
+
+}

src/main/java/com/chinaweal/aiccs/aiccs/punishment/entity/TBizRemPunishment.java

@@ -71,9 +71,9 @@ public class TBizRemPunishment extends SuperEntity {
     private String status;
 
     /**
-     * 当前环节 1-业务受理 2-业务审核 3-业务审批
+     * 当前环节 1-业务受理 2-业务审批 3-业务结束
      */
-    @ApiModelProperty(value = "当前环节 1-业务受理 2-业务审核 3-业务审批")
+    @ApiModelProperty(value = "当前环节 1-业务受理 2-业务审批 3-业务结束")
     @TableField("linkType")
     private String linkType;
 
@@ -115,4 +115,13 @@ public class TBizRemPunishment extends SuperEntity {
     private String repairOrgCn;
 
 
+    @ApiModelProperty(value = "下一个处理人id")
+    @TableField(exist = false)
+    String nextPerformerids;
+
+    @ApiModelProperty(value = "意见")
+    @TableField(exist = false)
+    String opinion;
+
+
 }

src/main/java/com/chinaweal/aiccs/aiccs/punishment/mapper/CaseCreInformationMapper.java

@@ -0,0 +1,14 @@
+package com.chinaweal.aiccs.aiccs.punishment.mapper;
+
+import com.chinaweal.aiccs.aiccs.punishment.entity.CaseCreInformation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 行政处罚信用修复信息 Mapper 接口
+ *
+ * @author zhouxy
+ * @since 2026-1-20
+ */
+public interface CaseCreInformationMapper extends BaseMapper<CaseCreInformation> {
+
+}

src/main/java/com/chinaweal/aiccs/aiccs/punishment/mapper/CasePubNbaseinfoMapper.java

@@ -0,0 +1,14 @@
+package com.chinaweal.aiccs.aiccs.punishment.mapper;
+
+import com.chinaweal.aiccs.aiccs.punishment.entity.CasePubNbaseinfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 行政处罚基本信息 Mapper 接口
+ *
+ * @author zhouxy
+ * @since 2026-1-20
+ */
+public interface CasePubNbaseinfoMapper extends BaseMapper<CasePubNbaseinfo> {
+
+}

src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/ICaseCreInformationService.java

@@ -0,0 +1,14 @@
+package com.chinaweal.aiccs.aiccs.punishment.service;
+
+import com.chinaweal.aiccs.aiccs.punishment.entity.CaseCreInformation;
+import com.chinaweal.youfool.framework.springboot.mybatis.plus.BaseService;
+
+/**
+ * 行政处罚信用修复信息 服务类
+ *
+ * @author zhouxy
+ * @since 2026-1-20
+ */
+public interface ICaseCreInformationService extends BaseService<CaseCreInformation> {
+
+}

src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/ICasePubNbaseinfoService.java

@@ -0,0 +1,14 @@
+package com.chinaweal.aiccs.aiccs.punishment.service;
+
+import com.chinaweal.aiccs.aiccs.punishment.entity.CasePubNbaseinfo;
+import com.chinaweal.youfool.framework.springboot.mybatis.plus.BaseService;
+
+/**
+ * 行政处罚基本信息 服务类
+ *
+ * @author zhouxy
+ * @since 2026-1-20
+ */
+public interface ICasePubNbaseinfoService extends BaseService<CasePubNbaseinfo> {
+
+}

src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/CaseCreInformationServiceImpl.java

@@ -0,0 +1,18 @@
+package com.chinaweal.aiccs.aiccs.punishment.service.impl;
+
+import com.chinaweal.aiccs.aiccs.punishment.entity.CaseCreInformation;
+import com.chinaweal.aiccs.aiccs.punishment.mapper.CaseCreInformationMapper;
+import com.chinaweal.aiccs.aiccs.punishment.service.ICaseCreInformationService;
+import com.chinaweal.youfool.framework.springboot.mybatis.plus.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 行政处罚信用修复信息 服务实现类
+ *
+ * @author zhouxy
+ * @since 2026-1-20
+ */
+@Service
+public class CaseCreInformationServiceImpl extends BaseServiceImpl<CaseCreInformationMapper, CaseCreInformation> implements ICaseCreInformationService {
+
+}

src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/CasePubNbaseinfoServiceImpl.java

@@ -0,0 +1,18 @@
+package com.chinaweal.aiccs.aiccs.punishment.service.impl;
+
+import com.chinaweal.aiccs.aiccs.punishment.entity.CasePubNbaseinfo;
+import com.chinaweal.aiccs.aiccs.punishment.mapper.CasePubNbaseinfoMapper;
+import com.chinaweal.aiccs.aiccs.punishment.service.ICasePubNbaseinfoService;
+import com.chinaweal.youfool.framework.springboot.mybatis.plus.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 行政处罚基本信息 服务实现类
+ *
+ * @author zhouxy
+ * @since 2026-1-20
+ */
+@Service
+public class CasePubNbaseinfoServiceImpl extends BaseServiceImpl<CasePubNbaseinfoMapper, CasePubNbaseinfo> implements ICasePubNbaseinfoService {
+
+}

src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java

@@ -5,12 +5,17 @@ import com.chinaweal.aiccs.aiccs.abnormal.entity.EBaseinfo;
 import com.chinaweal.aiccs.aiccs.abnormal.service.EBaseinfoService;
 import com.chinaweal.aiccs.aiccs.business.entity.TSTaskList;
 import com.chinaweal.aiccs.aiccs.business.service.TSTaskListService;
+import com.chinaweal.aiccs.aiccs.punishment.entity.CaseCreInformation;
+import com.chinaweal.aiccs.aiccs.punishment.entity.CasePubNbaseinfo;
 import com.chinaweal.aiccs.aiccs.punishment.entity.TBizRemPunishment;
 import com.chinaweal.aiccs.aiccs.punishment.mapper.TBizRemPunishmentMapper;
+import com.chinaweal.aiccs.aiccs.punishment.service.ICaseCreInformationService;
+import com.chinaweal.aiccs.aiccs.punishment.service.ICasePubNbaseinfoService;
 import com.chinaweal.aiccs.aiccs.punishment.service.ITBizRemPunishmentService;
 import com.chinaweal.aiccs.common.constant.BaseDataConstant;
 import com.chinaweal.aiccs.common.util.FlowUtil;
 import com.chinaweal.aiccs.common.util.HandleWorkFlowUtil;
+import com.chinaweal.aiccs.common.util.StringUtils;
 import com.chinaweal.aiccs.crgs.punish.entity.TbIlcPunInfoQuery;
 import com.chinaweal.aiccs.crgs.punish.service.TbIlcPunInfoQueryService;
 import com.chinaweal.aicorg.model.AICUser;
@@ -24,7 +29,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -44,6 +54,10 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
     private TSTaskListService taskListService;
     @Resource
     private TbIlcPunInfoQueryService tbIlcPunInfoQueryService;
+    @Resource
+    private ICaseCreInformationService caseCreInformationService;
+    @Resource
+    private ICasePubNbaseinfoService casePubNbaseinfoService;
 
     @Override
     public TBizRemPunishment saveTBizRemPunishment(TBizRemPunishment tBizRemPunishment) {
@@ -68,7 +82,6 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
 
     @Override
     public Map<String, String> startTask(TBizRemPunishment tBizRemPunishment) {
-
         AICUser loginUser = SSOUtil.getUser();
         Map<String, String> resultMap = new HashMap<>();
         TbIlcPunInfoQuery tbIlcPunInfoQuery = tbIlcPunInfoQueryService.findById(tBizRemPunishment.getPunishmentId());
@@ -103,13 +116,69 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
     @Override
     public void submitTask(TBizRemPunishment tBizRemPunishment, TSTaskList tsTaskList) {
         AICUser loginUser = SSOUtil.getUser();
+        //当前环节
+        String linkType = tBizRemPunishment.getLinkType();
+        String nextNodeID = null;
+        String status = tBizRemPunishment.getStatus();
 
-        tBizRemPunishment.setStatus("2");
+        //根据当前环节判断
+        if(StringUtils.equals(linkType,"1")){   //受理状态，需要提交审批人或直接不予修复结束
+            if(StringUtils.equals(status,"3")){     //不予修复，直接结束流程
+                nextNodeID = "disagreeRemPunish";
+                tBizRemPunishment.setLinkType("3"); //设置下一环节
+            } else {     //准予修复，提交给审批人
+                nextNodeID = "approveRemPunish";
+                tBizRemPunishment.setLinkType("2"); //设置下一环节
+            }
+        } else if(StringUtils.equals(linkType,"2")){    //审批状态，需要结束流程
+            if(StringUtils.equals(status,"3")){     //不予修复
+                nextNodeID = "disagreeRemPunish";
+            } else {     //准予修复
+                nextNodeID = "endRemPunish";
+                //行政处罚信用修复信息插入数据
+                insertCaseCreInformation(tBizRemPunishment);
+            }
+            tBizRemPunishment.setLinkType("3"); //设置下一环节
+        }
+        //修改业务表
         this.updateById(tBizRemPunishment);
 
         // 流程推进
         taskListService.updateWorkFlow(loginUser, null, tsTaskList,
-                "endRemPunish", new String[]{ loginUser.getPrimaryKey() }, new String[]{ loginUser.getName() });
+                nextNodeID, new String[]{ loginUser.getPrimaryKey() }, new String[]{ loginUser.getName() });
+    }
+
+    //行政处罚信用修复信息插入数据
+    private void insertCaseCreInformation(TBizRemPunishment tBizRemPunishment) {
+        CaseCreInformation caseCreInformation = new CaseCreInformation();
+        EBaseinfo eBaseinfo = eBaseInfoService.getOneByPripid(tBizRemPunishment.getPripid());
+        LambdaQueryWrapper<CasePubNbaseinfo> queryWrapper = new LambdaQueryWrapper<CasePubNbaseinfo>()
+                .eq(CasePubNbaseinfo::getPripid, tBizRemPunishment.getPripid())
+                .eq(CasePubNbaseinfo::getActype, "1");
+
+        //查询行政处罚基本信息
+        List<CasePubNbaseinfo> casePubNbaseinfos = casePubNbaseinfoService.list(queryWrapper);
+        CasePubNbaseinfo casePubNbaseinfo = casePubNbaseinfos.get(0);
+
+        caseCreInformation.setCasecreid(IdUtil.simpleUUID())
+                .setPripid(tBizRemPunishment.getPripid())
+                .setEntname(eBaseinfo.getEntname())
+                .setUniscid(eBaseinfo.getUniscid())
+                .setCaseid(casePubNbaseinfo.getCaseid());
+        // 将LocalDateTime转换为Date
+        LocalDateTime localDateTimeRepairDate = tBizRemPunishment.getRepairDate();
+        Date repairDate = Date.from(localDateTimeRepairDate.atZone(ZoneId.systemDefault()).toInstant());
+        LocalDate localDate = tBizRemPunishment.getApplyDate();
+        Date applyDate = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
+        caseCreInformation.setRepairdate(applyDate)
+                .setRepauth(tBizRemPunishment.getRepairOrg())
+                .setRepauthCn(tBizRemPunishment.getRepairOrgCn())
+                .setRepdate(repairDate)
+                .setDatasource("wA")
+                .setRepairno(tBizRemPunishment.getRepairNo());
+
+        //插入数据
+        caseCreInformationService.save(caseCreInformation);
     }
 
 }

src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml

@@ -290,7 +290,7 @@
                         and m.BUSTYPE in ('31','81','82','84','85','86','87','88','89')
                     </if>
                     <if test="customParamMap.type == 'repair'.toString()">
-                        and m.BUSTYPE in ('33','7','12','14')
+                        and m.BUSTYPE in ('33','7','12','14','27')
                         <if test="customParamMap.gzrStartDate != null and customParamMap.gzrStartDate != '' ">
                             and m.deadlineDate between #{customParamMap.gzrStartDate} and #{customParamMap.gzrEndDate}
                         </if>
@@ -419,7 +419,7 @@
         sum(case WHEN m.BUSTYPE in ('51','52','53','54') then 1 else 0 end) as "revokenum",
         sum(case WHEN m.BUSTYPE in ('61','62') then 1 else 0 end) as "punishmentnum",
         sum(case WHEN m.BUSTYPE in ('31','81','82') then 1 else 0 end) as "cancelnum",
-        sum(case WHEN m.BUSTYPE in ('33','7','12','14') then 1 else 0 end) as "repairnum",
+        sum(case WHEN m.BUSTYPE in ('33','7','12','14','27') then 1 else 0 end) as "repairnum",
         sum(case WHEN m.BUSTYPE in ('66') then 1 else 0 end) as "marketnum",
         sum(case WHEN m.BUSTYPE in ('30') then 1 else 0 end) as "gzisnum",
         sum(case WHEN m.BUSTYPE in ('40','41') then 1 else 0 end) as "correctnum"
@@ -1463,12 +1463,10 @@
                 tta.TASKLISTID,
                 tta.BIZSEQID,
                 ROW_NUMBER() OVER (PARTITION BY tta.BIZSEQID ORDER BY tta.TASKLISTID DESC) AS rn
-            FROM
+            FROM tstasklist tta
-                tstasklist tta
+            WHERE tta.BUSSTATUS = '0'
-            WHERE
-                tta.BUSSTATUS = '0'
             <if test="customParamMap.busType == null or customParamMap.busType == '' ">
-                and tta.BUSTYPE in ('33','7','12','14')
+                and tta.BUSTYPE in ('33','7','12','14','27')
             </if>
             <if test="customParamMap.busType != null and customParamMap.busType != '' ">
                 and tta.BUSTYPE = #{customParamMap.busType}

src/main/resources/mybatis/mapper/aiccs/punishment/CaseCreInformationMapper.xml

@@ -0,0 +1,5 @@
+<?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">
+<mapper namespace="com.chinaweal.aiccs.aiccs.punishment.mapper.CaseCreInformationMapper">
+
+</mapper>

src/main/resources/mybatis/mapper/aiccs/punishment/CasePubNbaseinfoMapper.xml

@@ -0,0 +1,5 @@
+<?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">
+<mapper namespace="com.chinaweal.aiccs.aiccs.punishment.mapper.CasePubNbaseinfoMapper">
+
+</mapper>

src/main/resources/workFlow/RemPunishWorkFlowTmp.xml

@@ -2,8 +2,13 @@
 <workflow definedname="RemPunishWorkFlowTmp" description="行政处罚修复">
     <nodes>
         <node id="startAccept" name="经办" description="行政处罚修复经办" start="true"/>
+        <node id="approveRemPunish" name="审批" description="行政处罚修复审核"/>
         <node id="endRemPunish" name="结束流程" description="结束流程" end="true" handle="false"/>
+        <node id="disagreeRemPunish" name="不予修复" description="结束流程" end="true" handle="false"/>
     </nodes>
 
     <sequenceFlow id="startAccept_endRemPunish" name="流程结束" description="经办——结束"/>
-</workflow>
+    <sequenceFlow id="startAccept_approveRemPunish" name="流程审批" description="经办——审批"/>
+    <sequenceFlow id="approveRemPunish_endRemPunish" name="流程结束" description="审批——结束"/>
+    <sequenceFlow id="startAccept_disagreeRemPunish" name="不予修复" description="经办——结束"/>
+</workflow>