Просмотр исходного кода

Merge branch 'refs/heads/feature-SaveAgain-lihb-20250813' into dev

LHB 1 месяц назад
Родитель
Сommit
c29fbc9eaf

+ 5 - 0
blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/InformationQueryVO.java

@@ -86,6 +86,11 @@ public class InformationQueryVO extends InformationQuery {
     private Integer waitingUserStatus;
 
 
+    @ApiModelProperty("重刷状态 0-待重刷,1-正在重刷,2-重刷成功,3-重刷失败")
+    private Integer saveAgain;
+
+    @ApiModelProperty("重刷次数:如果次数大于5次 每次都是3,就停止重刷")
+    private Integer saveAgainCount;
 
     public void setWaitingUserList(String waitingUserName, Integer status) {
         if (this.waitingUserList == null) {

+ 4 - 0
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -131,6 +131,8 @@
     <select id="selectInformationQueryPageTwo" resultType="org.springblade.business.entity.InformationQuery">
         SELECT
             query.pdf_trial_url,
+            query.save_again,
+            query.save_again_count,
             query.pdf_trial_url_position,
             query.wbs_id,
             query.id,
@@ -148,6 +150,8 @@
             (
             SELECT
                 iq.pdf_trial_url_position,
+                iq.save_again,
+                iq.save_again_count,
                 iq.pdf_trial_url,
                 iq.sort,
                 iq.id,