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 57ea5a8..bc2d0a5 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=评审通过,6=已填报,7=复审不通过,8=初审不通过,9=终审不通过,10=初审驳回") private Long status; /** 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 b2c95ab..1c4b70a 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=评审通过,6=已填报,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 4718eb5..c5d1e3f 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=评审通过,6=已填报,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 f581996..b917646 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=评审通过,6=已填报,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 40cb473..171722d 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=评审通过,6=已填报,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 bcfd586..25745fb 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=评审通过,6=已填报,7=复审不通过,8=初审不通过,9=终审不通过,10=初审驳回") + @Excel(name = "审批状态",readConverterExp = "0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,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 68916dc..c9455be 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=评审通过,6=已填报,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 85152d3..21cd9dc 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=评审通过,6=已填报,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 770be9d..bc3efa3 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=评审通过,6=已填报,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 c455561..996aa50 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=评审通过,6=已填报,7=复审不通过,8=初审不通过,9=终审不通过,10=初审驳回") private Long status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsOutQuitProductsUpdateDto.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsOutQuitProductsUpdateDto.java index bea1baf..b63d5dc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsOutQuitProductsUpdateDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/dto/BmsOutQuitProductsUpdateDto.java @@ -20,6 +20,6 @@ public class BmsOutQuitProductsUpdateDto extends BmsOutQuitProducts { private Long declarationRecordsId; - @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,7=复审不通过,8=初审不通过,9=终审不通过,10=初审驳回") + @ApiModelProperty(value = "审批状态:0=待填报,1=初审中,2=复审中,3=终审中,5=评审通过,6=已填报,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 52eaee7..78f3ff4 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=评审通过,6=已填报,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 1b6efb4..131766e 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=评审通过,6=已填报,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 420cf5a..15a3a71 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=评审通过,6=已填报,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 c2a5554..2cfe7f2 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 @@ -96,7 +96,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=评审通过,6=已填报,7=复审不通过,8=初审驳回,9=终审不通过,10=退回修改") private Long status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java index efe96bc..f24fd4e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.jjh.declaration.entity.BmsBigStrongAward; import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; import com.ruoyi.jjh.declaration.entity.BmsFundingDetail; +import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord; import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardUpdateDto; import com.ruoyi.jjh.declaration.entity.dto.BmsFundingDetailAddDto; @@ -45,6 +46,9 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl