添加补证日期字段

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgCertificateReplenishDto.java

@@ -55,6 +55,9 @@ public class JgCertificateReplenishDto extends BaseDto {
     @ApiModelProperty(value = "使用单位名称")
     private String useUnitName;
 
+    @ApiModelProperty("补证日期")
+    private Date reissueDate;
+
     @ApiModelProperty(value = "接收机构代码")
     private String receiveOrgCode;
 
@@ -88,9 +91,6 @@ public class JgCertificateReplenishDto extends BaseDto {
     @ApiModelProperty(value = "流程实例id")
     private String instanceId;
 
-    @ApiModelProperty(value = "当前流程节点名称")
-    private String taskName;
-
     @ApiModelProperty(value = "下步执行角色/人id")
     private String nextExecuteIds;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationManageDto.java

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * @author system_generator
  * @date 2024-07-03
@@ -122,4 +124,7 @@ public class JgUseRegistrationManageDto extends BaseDto {
     @ApiModelProperty(value = "是否超设计使用年限（0-否，1-是）")
     private String isOverDesign;
 
+    @ApiModelProperty("补证日期")
+    private Date reissueDate;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgCertificateReplenish.java

@@ -160,12 +160,6 @@ public class JgCertificateReplenish extends BaseEntity {
     private String instanceId;
 
     /**
-     * 当前流程节点名称
-     */
-    @TableField("task_name")
-    private String taskName;
-
-    /**
      * 下步执行角色/人id
      */
     @TableField("next_execute_ids")
@@ -187,9 +181,17 @@ public class JgCertificateReplenish extends BaseEntity {
      * 受理完成日期
      */
     @TableField("accept_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date acceptDate;
 
     /**
+     * 补证日期
+     */
+    @TableField("reissue_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date reissueDate;
+
+    /**
      * 作废时间
      */
     @TableField("cancel_date")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistrationManage.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.*;
 import lombok.experimental.Accessors;
@@ -213,4 +214,12 @@ public class JgUseRegistrationManage extends BaseEntity {
      */
     @TableField("is_over_design")
     private String isOverDesign;
+
+
+    /**
+     * 补证日期
+     */
+    @TableField("reissue_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date reissueDate;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgCertificateReplenishServiceImpl.java

@@ -235,16 +235,6 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
         return commonService.updateTaskModel(params);
     }
 
-    private void buildRoleList(List<ProcessTaskDTO> processTasks, List<String> roleListNext, List<String> roleListAll) {
-        processTasks.forEach(p -> {
-            p.getNextCandidateGroups().values().forEach(e -> {
-                roleListNext.addAll(e);
-                roleListAll.addAll(e);
-            });
-            roleListAll.addAll(p.getCandidateGroups());
-        });
-    }
-
     public Object updateNotsubmit(JSONObject jsonObject) {
         JgCertificateReplenish certRep = this.buildUpdateCertRep(jsonObject, FlowStatusEnum.TO_BE_SUBMITTED);
         certRep.setApplicationFormFileUrl(Objects.toString(this.getCertReplenishFormUrl(jsonObject, certRep.getApplyNo()).get(APPLICATION_FORM_FILE_URL)));
@@ -506,7 +496,6 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
             certRep.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
             certRep.setPromoter("");
             certRep.setNextTaskId(null);
-            certRep.setAcceptDate(new Date());
             // 上个代办改为已办
             this.updateLastTodo(certRep, FlowStatusEnum.TO_BE_FINISHED);
         } else {
@@ -520,11 +509,24 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
             // 创建新的代办
             this.createNewTodo(certRep, workflowResultDto, taskV2Model, FlowStatusEnum.TO_BE_PROCESSED);
         }
-        // 创建历史数据
-        // this.saveOrUpdateHisDataBatch(jsonObj, certRep.getSequenceNbr().toString());
+        certRep.setNextTaskId("");
+        certRep.setAcceptDate(new Date());
+        certRep.setReissueDate(new Date());
+        this.updateManageWithPass(certRep);
+        this.saveManageRecord(certRep);
         return this.updateById(certRep) ? certRep : null;
     }
 
+    public void saveManageRecord(JgCertificateReplenish certRep) {
+        // todo
+    }
+
+    public void updateManageWithPass(JgCertificateReplenish certRep) {
+        registrationManageService.update(new LambdaUpdateWrapper<JgUseRegistrationManage>()
+                .eq(JgUseRegistrationManage::getUseRegistrationCode, certRep.getUseRegistrationCode())
+                .set(JgUseRegistrationManage::getReissueDate, certRep.getReissueDate()));
+    }
+
     /**
      * 上个代办改为已办
      *