feat: Approval detail

Author: song-cc-rock

backend/crm/src/main/java/cn/cordys/common/constants/FormKey.java

@@ -1,9 +1,11 @@
 package cn.cordys.common.constants;
 
 import lombok.Getter;
+import org.apache.commons.lang3.Strings;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -79,4 +81,17 @@ public enum FormKey {
 	public static List<String> allKeys() {
 		return Arrays.stream(FormKey.values()).map(FormKey::getKey).collect(Collectors.toList());
 	}
+
+	public static FormKey ofKey(String key) {
+		for (FormKey formKey : FormKey.values()) {
+			if (Strings.CI.equals(formKey.getKey(), key)) {
+				return formKey;
+			}
+		}
+		return null;
+	}
+
+	public boolean hasSnapshot() {
+		return Strings.CI.equalsAny(this.key, CONTRACT.getKey(), INVOICE.getKey(), QUOTATION.getKey());
+	}
 }

backend/crm/src/main/java/cn/cordys/crm/approval/aspect/HitApprovalAspect.java

@@ -75,7 +75,7 @@ public void handleHitApproval(JoinPoint joinPoint, Object retValue) {
 
 			if (hit) {
 				// 命中审批流, 修改业务资源审批状态为待提审
-				approvalResourceService.updateApprovalStatus(annotation.formKey(), resourceId, ApprovalStatus.PENDING.name());
+				approvalResourceService.updateResourceApprovalStatus(annotation.formKey(), resourceId, ApprovalStatus.PENDING.name());
 			}
 		} catch (Exception e) {
 			log.error("审批流执行时机匹配失败，error:{}", e.getMessage(), e);

backend/crm/src/main/java/cn/cordys/crm/approval/domain/ApprovalRecord.java

@@ -18,6 +18,9 @@ public class ApprovalRecord extends BaseModel {
 	@Schema(description = "任务ID")
 	private String taskId;
 
+	@Schema(description = "节点轮次")
+	private Integer nodeRound;
+
 	@Schema(description = "节点ID")
 	private String nodeId;
 

backend/crm/src/main/java/cn/cordys/crm/approval/domain/ApprovalTask.java

@@ -15,6 +15,9 @@ public class ApprovalTask extends BaseModel {
 	@Schema(description = "节点ID")
 	private String nodeId;
 
+	@Schema(description = "节点轮次")
+	private Integer nodeRound;
+
 	@Schema(description = "审批实例ID")
 	private String instanceId;
 

backend/crm/src/main/java/cn/cordys/crm/approval/dto/ApprovalInstanceDetail.java

@@ -14,16 +14,16 @@ public class ApprovalInstanceDetail {
 	@Schema(description = "提交人ID")
 	private String submitterId;
 
+	@Schema(description = "提交人头像")
+	private String submitAvatar;
+
 	@Schema(description = "提交人")
 	private String submitter;
 
 	@Schema(description = "提交时间")
 	private Long submitTime;
 
-	@Schema(description = "审批结果")
-	private  String result;
-
-	@Schema(description = "审批实例状态")
+	@Schema(description = "审批状态")
 	private String approvalStatus;
 
 	@Schema(description = "当前节点ID")

backend/crm/src/main/java/cn/cordys/crm/approval/dto/ApprovalRecordNode.java

@@ -17,6 +17,9 @@ public class ApprovalRecordNode {
 	@Schema(description = "节点ID")
 	private String nodeId;
 
+	@Schema(description = "节点轮次")
+	private Integer nodeRound;
+
 	@Schema(description = "审批状态")
 	private String approvalStatus;
 

backend/crm/src/main/java/cn/cordys/crm/approval/dto/ApprovalTaskNode.java

@@ -43,5 +43,5 @@ public class ApprovalTaskNode {
 	private Long approvalTime;
 
 	@Schema(description = "是否加签任务")
-	private boolean isAddSign;
+	private boolean sign;
 }

backend/crm/src/main/java/cn/cordys/crm/approval/dto/ResourceSnapshotApprovalParam.java

@@ -0,0 +1,12 @@
+package cn.cordys.crm.approval.dto;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class ResourceSnapshotApprovalParam {
+
+	private String resourceId;
+	private String approvalStatus;
+}

backend/crm/src/main/java/cn/cordys/crm/approval/mapper/ExtApprovalInstanceMapper.java

@@ -22,4 +22,14 @@ void updateApprovalStatus(@Param("sourceTable") String sourceTable, @Param("id")
 	String selectBusinessName(@Param("sourceTable") String sourceTable, @Param("id") String id);
 
 	String getResourceOwner(@Param("sourceTable")String sourceTable, @Param("id")String id);
+
+	/**
+	 * 获取节点下一个执行轮次
+	 * 从 approval_task 和 approval_record 中一起获取，取最大轮次 +1
+	 *
+	 * @param instanceId 审批实例ID
+	 * @param nodeId     节点ID
+	 * @return 下一个轮次
+	 */
+	Integer getNextNodeRound(@Param("instanceId") String instanceId, @Param("nodeId") String nodeId);
 }

backend/crm/src/main/java/cn/cordys/crm/approval/mapper/ExtApprovalInstanceMapper.xml

@@ -15,4 +15,11 @@
     <select id="getResourceOwner" resultType="java.lang.String">
         select owner from ${sourceTable} where id = #{id}
     </select>
+
+    <select id="getNextNodeRound" resultType="java.lang.Integer">
+        SELECT IFNULL(GREATEST(
+            (SELECT MAX(node_round) FROM approval_task WHERE instance_id = #{instanceId} AND node_id = #{nodeId}),
+            (SELECT MAX(node_round) FROM approval_record WHERE instance_id = #{instanceId} AND node_id = #{nodeId})
+        ), 0) + 1
+    </select>
 </mapper>