bugfix

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsDeclarationRecords.java

@@ -103,7 +103,7 @@ public class BmsDeclarationRecords extends BaseInfoEntity {
      */
     @JSONField(serialize = false)
     @ApiModelProperty(value = "审批状态")
-    @Excel(name = "审批状态", readConverterExp = "0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改")
+    @Excel(name = "审批状态", readConverterExp = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
     private Long status;
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProcessInfo.java

@@ -33,9 +33,9 @@ public class BmsProcessInfo extends BaseInfoEntity {
     private Integer approvalType;
 
     /**
-     * 对应审批层级(0=初审,1=复审,2=上级评审)
+     * 对应审批层级(0=初审,1=复审,2=终审)
      */
-    @Excel(name = "对应审批层级(0=初审,1=复审,2=上级评审)")
+    @Excel(name = "对应审批层级(0=初审,1=复审,2=终审)")
     private Integer approvalLevel;
 
     @Excel(name = "审批部门id")

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBigStrongAwardUpdateDto.java

@@ -33,6 +33,6 @@ public class BmsBigStrongAwardUpdateDto extends BmsBigStrongAward implements Ser
     @ApiModelProperty(value = "项目id")
     private Long projectId;
 
-    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改")
+    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
     private Long status;
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBrandingAwardUpdateDto.java

@@ -26,6 +26,6 @@ public class BmsBrandingAwardUpdateDto extends BmsBrandingAward {
     @ApiModelProperty(value = "项目id")
     private Long projectId;
 
-    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改")
+    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
     private Long status;
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCarrierConstructionAwardUpdateDto.java

@@ -23,7 +23,7 @@ public class BmsCarrierConstructionAwardUpdateDto extends BmsCarrierConstruction
     @Excel(name = "项目id")
     private Long projectId;
 
-    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改")
+    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
     private Long status;
 
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCreditManagementUpdateDto.java

@@ -26,7 +26,7 @@ public class BmsCreditManagementUpdateDto extends BmsCreditManagement {
     @ApiModelProperty(value = "项目id")
     private Long projectId;
 
-    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改")
+    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
     private Long status;
 
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java

@@ -49,8 +49,8 @@ public class BmsDeclarationRecordsDto extends BmsDeclarationRecords {
     @ApiModelProperty(value = "模板名称")
     private String templateName;
 
-    @ApiModelProperty(value = "0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改")
-    @Excel(name = "审批状态",readConverterExp = "0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改")
+    @ApiModelProperty(value = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
+    @Excel(name = "审批状态",readConverterExp = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
     private List<Long> statusStr;
 
     @ApiModelProperty(value = "0=未填报,1=已填报")

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIndustrialInternetAwardUpdateDto.java

@@ -27,7 +27,7 @@ public class BmsIndustrialInternetAwardUpdateDto extends BmsIndustrialInternetAw
     @ApiModelProperty(value = "项目id")
     private Long projectId;
 
-    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改")
+    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
     private Long status;
 
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIntegrationIndustriesUpdateDto.java

@@ -26,7 +26,7 @@ public class BmsIntegrationIndustriesUpdateDto extends BmsIntegrationIndustries
     @ApiModelProperty(value = "项目id")
     private Long projectId;
 
-    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改")
+    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
     private Long status;
 
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsLogisticsDevelopmentAwardUpdateDto.java

@@ -25,7 +25,7 @@ public class BmsLogisticsDevelopmentAwardUpdateDto extends BmsLogisticsDevelopme
     @ApiModelProperty(value = "项目id")
     private Long projectId;
 
-    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改")
+    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
     private Long status;
 
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsManufacturingServicesAwardUpdateDto.java

@@ -26,6 +26,6 @@ public class BmsManufacturingServicesAwardUpdateDto extends BmsManufacturingServ
     @ApiModelProperty(value = "项目id")
     private Long projectId;
 
-    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改")
+    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
     private Long status;
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsPlatformConstructionAwardUpdateDto.java

@@ -26,6 +26,6 @@ public class BmsPlatformConstructionAwardUpdateDto extends BmsPlatformConstructi
     @ApiModelProperty(value = "项目id")
     private Long projectId;
 
-    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改")
+    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
     private Long status;
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsProjectSettlementAwardUpdateDto.java

@@ -33,7 +33,7 @@ public class BmsProjectSettlementAwardUpdateDto extends BmsProjectSettlementAwar
     @ApiModelProperty(value = "项目id")
     private Long projectId;
 
-    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改")
+    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
     private Long status;
 
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsSceneOpeningAwardUpdateDto.java

@@ -20,7 +20,7 @@ public class BmsSceneOpeningAwardUpdateDto extends BmsSceneOpeningAward {
     @ApiModelProperty(value = "记录id")
     private Long declarationRecordsId;
 
-    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改")
+    @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过，10=初审驳回")
     private Long status;
 
     @ApiModelProperty(value = "项目id")

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java

@@ -92,7 +92,7 @@ public class BmsDeclarationRecordsQueryVo implements Serializable {
     private Long detailId;
 
     @ApiModelProperty(value = "审批状态")
-    @Excel(name = "审批状态", readConverterExp = "0=待填报,1=初审中,2=复审中,3=上级评审中,5=评审通过,7=复审不通过,8=初审驳回,9=上级评审不通过，10=退回修改")
+    @Excel(name = "审批状态", readConverterExp = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审驳回,9=终审不通过，10=退回修改")
     private Long status;
 
 }

ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml

@@ -114,7 +114,7 @@
             </if>
             <if test="isDeleted != null ">and a.is_deleted = #{isDeleted}</if>
         </where>
-        order by a.create_time desc, e.dict_sort desc
+        order by FIELD(a.status, 0, 1, 2, 3,10,8,7,9,5) , a.create_time desc, e.dict_sort desc
     </select>
 
     <select id="selectBmsDeclarationRecordsById" parameterType="Long" resultMap="BmsDeclarationRecordsResult">
@@ -178,7 +178,7 @@
                 </foreach>
             </if>
         </where>
-        ORDER BY
+        ORDER BY FIELD(a.status, 0, 1, 2, 3,10,8,7,9,5),
         d.approval_time DESC,a.create_time desc
     </select>
     <select id="selectBmsDeclarationRecordsZwList"

ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsTemplateRecordMapper.xml

@@ -54,6 +54,7 @@
             <if test="notes != null  and notes != ''">and notes = #{notes}</if>
             <if test="status != null  and status != ''">and status = #{status}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectBmsTemplateRecordById" parameterType="Long" resultMap="BmsTemplateRecordResult">