From 111305426d4cd3c94a8add23284252a7dc5bc79b Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Fri, 24 May 2024 14:43:05 +0800 Subject: [PATCH] bugfix --- .../ruoyi/jjh/declaration/entity/BmsDeclarationRecords.java | 2 +- .../java/com/ruoyi/jjh/declaration/entity/BmsProcessInfo.java | 4 ++-- .../declaration/entity/dto/BmsBigStrongAwardUpdateDto.java | 2 +- .../jjh/declaration/entity/dto/BmsBrandingAwardUpdateDto.java | 2 +- .../entity/dto/BmsCarrierConstructionAwardUpdateDto.java | 2 +- .../declaration/entity/dto/BmsCreditManagementUpdateDto.java | 2 +- .../jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java | 4 ++-- .../entity/dto/BmsIndustrialInternetAwardUpdateDto.java | 2 +- .../entity/dto/BmsIntegrationIndustriesUpdateDto.java | 2 +- .../entity/dto/BmsLogisticsDevelopmentAwardUpdateDto.java | 2 +- .../entity/dto/BmsManufacturingServicesAwardUpdateDto.java | 2 +- .../entity/dto/BmsPlatformConstructionAwardUpdateDto.java | 2 +- .../entity/dto/BmsProjectSettlementAwardUpdateDto.java | 2 +- .../declaration/entity/dto/BmsSceneOpeningAwardUpdateDto.java | 2 +- .../declaration/entity/vo/BmsDeclarationRecordsQueryVo.java | 2 +- .../mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml | 4 ++-- .../mapper/jjh/declaration/BmsTemplateRecordMapper.xml | 1 + 17 files changed, 20 insertions(+), 19 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsDeclarationRecords.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsDeclarationRecords.java index 7bcd962..57ea5a8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsDeclarationRecords.java +++ b/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; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProcessInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProcessInfo.java index ef0230a..5483168 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProcessInfo.java +++ b/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") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBigStrongAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBigStrongAwardUpdateDto.java index 9104939..b2c95ab 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBigStrongAwardUpdateDto.java +++ b/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; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBrandingAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBrandingAwardUpdateDto.java index 8cf0c3c..4718eb5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsBrandingAwardUpdateDto.java +++ b/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; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCarrierConstructionAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCarrierConstructionAwardUpdateDto.java index d3863b4..f581996 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCarrierConstructionAwardUpdateDto.java +++ b/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; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCreditManagementUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCreditManagementUpdateDto.java index a96336e..40cb473 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsCreditManagementUpdateDto.java +++ b/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; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java index d2e781f..bcfd586 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsDeclarationRecordsDto.java +++ b/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 statusStr; @ApiModelProperty(value = "0=未填报,1=已填报") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIndustrialInternetAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIndustrialInternetAwardUpdateDto.java index de425f1..68916dc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIndustrialInternetAwardUpdateDto.java +++ b/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; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIntegrationIndustriesUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIntegrationIndustriesUpdateDto.java index 84be646..85152d3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsIntegrationIndustriesUpdateDto.java +++ b/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; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsLogisticsDevelopmentAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsLogisticsDevelopmentAwardUpdateDto.java index 7bde269..770be9d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsLogisticsDevelopmentAwardUpdateDto.java +++ b/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; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsManufacturingServicesAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsManufacturingServicesAwardUpdateDto.java index f58e962..c455561 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsManufacturingServicesAwardUpdateDto.java +++ b/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; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsPlatformConstructionAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsPlatformConstructionAwardUpdateDto.java index 3ce7775..52eaee7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsPlatformConstructionAwardUpdateDto.java +++ b/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; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsProjectSettlementAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsProjectSettlementAwardUpdateDto.java index 3c020d4..1b6efb4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsProjectSettlementAwardUpdateDto.java +++ b/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; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsSceneOpeningAwardUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsSceneOpeningAwardUpdateDto.java index 27247f3..420cf5a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsSceneOpeningAwardUpdateDto.java +++ b/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") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java index 791fbc0..f8104b5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/vo/BmsDeclarationRecordsQueryVo.java +++ b/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; } diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml index f74cf88..172f54e 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml @@ -114,7 +114,7 @@ and a.is_deleted = #{isDeleted} - 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