提交增加版本号

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/flow/entity/FlowInfo.java

@@ -93,4 +93,9 @@ public class FlowInfo extends BaseEntity implements Serializable {
      * 科研id
      */
     private Long kyId;
+
+    /**
+     * 版本号
+     */
+    private Integer version = 1;
 }

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/flow/service/impl/FlowInfoServiceImpl.java

@@ -215,7 +215,9 @@ public class FlowInfoServiceImpl extends ServiceImpl<FlowInfoMapper, FlowInfo> i
         //如果是驳回重新提交，修改申请日期和申请人
         if (GeneStatusEnum.REJECTED.getStatus().equals(flowInfo.getStatus())) {
             log.info("流程 id={} 驳回后重新提交，更新申请日期和申请人", flowInfo.getId());
-            updateInfo.setCreateBy(UserUtil.getUserId().toString()).setCreateTime(new Date());
+            updateInfo.setVersion(flowInfo.getVersion() + 1)
+                    .setCreateBy(UserUtil.getUserId().toString())
+                    .setCreateTime(new Date());
         }
         updateInfo.updateById();
 

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/flow/service/impl/NotifyServiceImpl.java

@@ -88,6 +88,10 @@ public class NotifyServiceImpl implements NotifyService {
                 return;
         }
 
+        if (flowInfo.getVersion() > 1) {
+            dingMsg += "（第" + flowInfo.getVersion() + "次申请）";
+        }
+
         //查询是否需要钉钉通知
         String key = String.format("gene.%s.dingding.enable", flowInfo.getStatus());
         if (systemPropertiesService.getBooleanValue(key)) {

jfcloud-gene-biz/src/main/resources/sql/init.sql

@@ -33,7 +33,8 @@ CREATE TABLE flow_info
     update_by            varchar(255) COMMENT '更新人',
     update_time          DATETIME     NULL COMMENT '更新时间',
     tenant_id            bigint COMMENT '租户ID',
-    dept_id              bigint COMMENT '部门ID'
+    dept_id              bigint COMMENT '部门ID',
+    version              int          NOT NULL DEFAULT '1' COMMENT '提交版本号'
 ) COMMENT '流程信息';