From fef7a377ba371553d5751d3138c39c6035515200 Mon Sep 17 00:00:00 2001 From: dhy1725534722 <1725534722@qq.com> Date: Tue, 30 Apr 2024 15:07:16 +0800 Subject: [PATCH] =?UTF-8?q?11=E4=B8=AA=E6=A8=A1=E6=9D=BF=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BmsBigStrongAwardController.java | 15 +++++++++++++++ .../controller/BmsBrandingAwardController.java | 15 +++++++++++++++ .../BmsCarrierConstructionAwardController.java | 14 ++++++++++++++ .../BmsCreditManagementController.java | 16 ++++++++++++++++ .../BmsDeclarationRecordsController.java | 2 +- .../BmsIntegrationIndustriesController.java | 14 ++++++++++++++ .../BmsLogisticsDevelopmentAwardController.java | 14 ++++++++++++++ .../BmsManufacturingServicesAwardController.java | 15 ++++++++++++++- .../BmsPlatformConstructionAwardController.java | 15 +++++++++++++++ .../BmsProjectSettlementAwardController.java | 15 +++++++++++++++ .../BmsSceneOpeningAwardController.java | 15 +++++++++++++++ .../declaration/entity/BmsBigStrongAward.java | 15 +++++++++++++-- .../jjh/declaration/entity/BmsBrandingAward.java | 8 ++++++++ .../entity/BmsCarrierConstructionAward.java | 13 ++++++++++++- .../declaration/entity/BmsCreditManagement.java | 8 ++++++++ .../entity/BmsIntegrationIndustries.java | 15 +++++++++++++++ .../entity/BmsLogisticsDevelopmentAward.java | 9 +++++++++ .../entity/BmsManufacturingServicesAward.java | 9 +++++++++ .../entity/BmsPlatformConstructionAward.java | 7 +++++++ .../entity/BmsProjectSettlementAward.java | 12 +++++++++++- .../declaration/entity/BmsSceneOpeningAward.java | 8 ++++++++ 21 files changed, 248 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsBigStrongAwardController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsBigStrongAwardController.java index 810f599..6897c94 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsBigStrongAwardController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsBigStrongAwardController.java @@ -7,9 +7,12 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.jjh.declaration.entity.BmsBigStrongAward; +import com.ruoyi.jjh.declaration.entity.BmsProjectSettlementAward; import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsBigStrongAwardUpdateDto; import com.ruoyi.jjh.declaration.service.IBmsBigStrongAwardService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -30,6 +33,7 @@ import java.util.List; * @date 2023-08-25 */ @RestController +@Api(tags = "做大做强奖") @RequestMapping("/system/bigStrongAward") public class BmsBigStrongAwardController extends BaseController { @Autowired @@ -87,6 +91,17 @@ public class BmsBigStrongAwardController extends BaseController { return toAjax(bmsBigStrongAwardService.updateBmsBigStrongAward(bmsBigStrongAwardUpdateDto)); } + /** + * 修改做大做强奖（只做修改，不做逻辑） + */ + @ApiOperation(value = "修改做大做强奖（只做修改，不做逻辑）") +// @RequiresPermissions("system:industrialInternetAward:edit") + @Log(title = "修改做大做强奖（只做修改，不做逻辑）", businessType = BusinessType.UPDATE) + @PutMapping("/update") + public AjaxResult update(@RequestBody BmsBigStrongAward bmsBigStrongAward) { + return toAjax(bmsBigStrongAwardService.updateById(bmsBigStrongAward)); + } + /** * 删除做大做强奖详情 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsBrandingAwardController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsBrandingAwardController.java index 3809554..c7f1dea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsBrandingAwardController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsBrandingAwardController.java @@ -7,9 +7,12 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.jjh.declaration.entity.BmsBrandingAward; +import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward; import com.ruoyi.jjh.declaration.entity.dto.BmsBrandingAwardAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsBrandingAwardUpdateDto; import com.ruoyi.jjh.declaration.service.IBmsBrandingAwardService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -29,6 +32,7 @@ import java.util.List; * @author farben * @date 2023-08-25 */ +@Api(tags = "品牌打造奖补") @RestController @RequestMapping("/system/brandingAward") public class BmsBrandingAwardController extends BaseController { @@ -87,6 +91,17 @@ public class BmsBrandingAwardController extends BaseController { return toAjax(bmsBrandingAwardService.updateBmsBrandingAward(bmsBrandingAwardUpdateDto)); } + /** + * 修改品牌打造奖补（只做修改，不做逻辑） + */ + @ApiOperation(value = "修改品牌打造奖补（只做修改，不做逻辑）") +// @RequiresPermissions("system:industrialInternetAward:edit") + @Log(title = "修改品牌打造奖补（只做修改，不做逻辑）", businessType = BusinessType.UPDATE) + @PutMapping("/update") + public AjaxResult update(@RequestBody BmsBrandingAward bmsBrandingAward) { + return toAjax(bmsBrandingAwardService.updateById(bmsBrandingAward)); + } + /** * 删除品牌打造奖补 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsCarrierConstructionAwardController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsCarrierConstructionAwardController.java index 54dc989..4337816 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsCarrierConstructionAwardController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsCarrierConstructionAwardController.java @@ -7,9 +7,12 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.jjh.declaration.entity.BmsCarrierConstructionAward; +import com.ruoyi.jjh.declaration.entity.BmsProjectSettlementAward; import com.ruoyi.jjh.declaration.entity.dto.BmsCarrierConstructionAwardAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsCarrierConstructionAwardUpdateDto; import com.ruoyi.jjh.declaration.service.IBmsCarrierConstructionAwardService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -29,6 +32,7 @@ import java.util.List; * @author farben * @date 2023-08-25 */ +@Api(tags = "载体建设奖补") @RestController @RequestMapping("/system/carrierConstructionAward") public class BmsCarrierConstructionAwardController extends BaseController { @@ -87,6 +91,16 @@ public class BmsCarrierConstructionAwardController extends BaseController { return toAjax(bmsCarrierConstructionAwardService.updateBmsCarrierConstructionAward(bmsCarrierConstructionAwardUpdateDto)); } + /** + * 修改载体建设奖补（只做修改，不做逻辑） + */ + @ApiOperation(value = "修改载体建设奖补（只做修改，不做逻辑）") +// @RequiresPermissions("system:industrialInternetAward:edit") + @Log(title = "修改载体建设奖补（只做修改，不做逻辑）", businessType = BusinessType.UPDATE) + @PutMapping("/update") + public AjaxResult update(@RequestBody BmsCarrierConstructionAward bmsCarrierConstructionAward) { + return toAjax(bmsCarrierConstructionAwardService.updateById(bmsCarrierConstructionAward)); + } /** * 删除载体建设奖补 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsCreditManagementController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsCreditManagementController.java index 6afb720..0ba16b6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsCreditManagementController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsCreditManagementController.java @@ -7,9 +7,13 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.jjh.declaration.entity.BmsCreditManagement; +import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward; import com.ruoyi.jjh.declaration.entity.dto.BmsCreditManagementAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsCreditManagementUpdateDto; import com.ruoyi.jjh.declaration.service.IBmsCreditManagementService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -29,6 +33,7 @@ import java.util.List; * @author farben * @date 2023-09-04 */ +@Api(tags = "信用管理奖补") @RestController @RequestMapping("/system/creditManagement") public class BmsCreditManagementController extends BaseController { @@ -87,6 +92,17 @@ public class BmsCreditManagementController extends BaseController { return toAjax(bmsCreditManagementService.updateBmsCreditManagement(bmsCreditManagementUpdateDto)); } + /** + * 修改信用管理奖补（只做修改，不做逻辑） + */ + @ApiOperation(value = "修改信用管理奖补（只做修改，不做逻辑）") +// @RequiresPermissions("system:industrialInternetAward:edit") + @Log(title = "修改信用管理奖补（只做修改，不做逻辑）", businessType = BusinessType.UPDATE) + @PutMapping("/update") + public AjaxResult update(@RequestBody BmsCreditManagement bmsCreditManagement) { + return toAjax(bmsCreditManagementService.updateById(bmsCreditManagement)); + } + /** * 删除信用管理奖补 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java index db8c7dc..c7fd479 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java @@ -32,7 +32,7 @@ import java.util.List; */ @RestController @RequestMapping("/system/declarationRecords") -@Api("在线申报记录") +@Api(tags = "在线申报记录") public class BmsDeclarationRecordsController extends BaseController { @Autowired private IBmsDeclarationRecordsService bmsDeclarationRecordsService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsIntegrationIndustriesController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsIntegrationIndustriesController.java index 37fae16..6baa1da 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsIntegrationIndustriesController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsIntegrationIndustriesController.java @@ -7,9 +7,12 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.jjh.declaration.entity.BmsIntegrationIndustries; +import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward; import com.ruoyi.jjh.declaration.entity.dto.BmsIntegrationIndustriesAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsIntegrationIndustriesUpdateDto; import com.ruoyi.jjh.declaration.service.IBmsIntegrationIndustriesService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -29,6 +32,7 @@ import java.util.List; * @author farben * @date 2023-09-04 */ +@Api(tags = "两业融合奖补") @RestController @RequestMapping("/system/integrationIndustries") public class BmsIntegrationIndustriesController extends BaseController { @@ -87,6 +91,16 @@ public class BmsIntegrationIndustriesController extends BaseController { return toAjax(bmsIntegrationIndustriesService.updateBmsIntegrationIndustries(bmsIntegrationIndustriesUpdateDto)); } + /** + * 修改两业融合奖补（只做修改，不做逻辑） + */ + @ApiOperation(value = "修改两业融合奖补（只做修改，不做逻辑）") +// @RequiresPermissions("system:industrialInternetAward:edit") + @Log(title = "修改两业融合奖补（只做修改，不做逻辑）", businessType = BusinessType.UPDATE) + @PutMapping("/update") + public AjaxResult update(@RequestBody BmsIntegrationIndustries bmsIntegrationIndustries) { + return toAjax(bmsIntegrationIndustriesService.updateById(bmsIntegrationIndustries)); + } /** * 删除两业融合奖补 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsLogisticsDevelopmentAwardController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsLogisticsDevelopmentAwardController.java index c4254a1..37e1a87 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsLogisticsDevelopmentAwardController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsLogisticsDevelopmentAwardController.java @@ -7,9 +7,12 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.jjh.declaration.entity.BmsLogisticsDevelopmentAward; +import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward; import com.ruoyi.jjh.declaration.entity.dto.BmsLogisticsDevelopmentAwardAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsLogisticsDevelopmentAwardUpdateDto; import com.ruoyi.jjh.declaration.service.IBmsLogisticsDevelopmentAwardService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -29,6 +32,7 @@ import java.util.List; * @author farben * @date 2023-08-25 */ +@Api(tags = "物流发展奖补") @RestController @RequestMapping("/system/logisticsDevelopmentAward") public class BmsLogisticsDevelopmentAwardController extends BaseController { @@ -87,6 +91,16 @@ public class BmsLogisticsDevelopmentAwardController extends BaseController { return toAjax(bmsLogisticsDevelopmentAwardService.updateBmsLogisticsDevelopmentAward(bmsLogisticsDevelopmentAwardUpdateDto)); } + /** + * 修改物流发展奖补（只做修改，不做逻辑） + */ + @ApiOperation(value = "修改物流发展奖补（只做修改，不做逻辑）") +// @RequiresPermissions("system:industrialInternetAward:edit") + @Log(title = "修改物流发展奖补（只做修改，不做逻辑）", businessType = BusinessType.UPDATE) + @PutMapping("/update") + public AjaxResult update(@RequestBody BmsLogisticsDevelopmentAward bmsLogisticsDevelopmentAward) { + return toAjax(bmsLogisticsDevelopmentAwardService.updateById(bmsLogisticsDevelopmentAward)); + } /** * 删除物流发展奖补 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsManufacturingServicesAwardController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsManufacturingServicesAwardController.java index fdb58e7..c336feb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsManufacturingServicesAwardController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsManufacturingServicesAwardController.java @@ -7,9 +7,12 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.jjh.declaration.entity.BmsManufacturingServicesAward; +import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward; import com.ruoyi.jjh.declaration.entity.dto.BmsManufacturingServicesAwardAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsManufacturingServicesAwardUpdateDto; import com.ruoyi.jjh.declaration.service.IBmsManufacturingServicesAwardService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -29,6 +32,7 @@ import java.util.List; * @author farben * @date 2023-08-25 */ +@Api(tags = "制造服务业有效投入奖补") @RestController @RequestMapping("/system/manufacturingServicesAward") public class BmsManufacturingServicesAwardController extends BaseController { @@ -86,7 +90,16 @@ public class BmsManufacturingServicesAwardController extends BaseController { public AjaxResult edit(@RequestBody BmsManufacturingServicesAwardUpdateDto bmsManufacturingServicesAwardUpdateDto) { return toAjax(bmsManufacturingServicesAwardService.updateBmsManufacturingServicesAward(bmsManufacturingServicesAwardUpdateDto)); } - + /** + * 修改制造服务业有效投入奖补（只做修改，不做逻辑） + */ + @ApiOperation(value = "修改制造服务业有效投入奖补（只做修改，不做逻辑）") +// @RequiresPermissions("system:industrialInternetAward:edit") + @Log(title = "修改制造服务业有效投入奖补（只做修改，不做逻辑）", businessType = BusinessType.UPDATE) + @PutMapping("/update") + public AjaxResult update(@RequestBody BmsManufacturingServicesAward bmsManufacturingServicesAward) { + return toAjax(bmsManufacturingServicesAwardService.updateById(bmsManufacturingServicesAward)); + } /** * 删除制造服务业有效投入奖补 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsPlatformConstructionAwardController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsPlatformConstructionAwardController.java index 0c201a0..3efeb84 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsPlatformConstructionAwardController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsPlatformConstructionAwardController.java @@ -6,10 +6,13 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsCarrierConstructionAward; import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward; import com.ruoyi.jjh.declaration.entity.dto.BmsPlatformConstructionAwardAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsPlatformConstructionAwardUpdateDto; import com.ruoyi.jjh.declaration.service.IBmsPlatformConstructionAwardService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -29,6 +32,7 @@ import java.util.List; * @author farben * @date 2023-08-25 */ +@Api(tags = "平台建设奖补") @RestController @RequestMapping("/system/platformConstructionAward") public class BmsPlatformConstructionAwardController extends BaseController { @@ -87,6 +91,17 @@ public class BmsPlatformConstructionAwardController extends BaseController { return toAjax(bmsPlatformConstructionAwardService.updateBmsPlatformConstructionAward(bmsPlatformConstructionAwardUpdateDto)); } + /** + * 修改平台建设奖补（只做修改，不做逻辑） + */ + @ApiOperation(value = "修改平台建设奖补（只做修改，不做逻辑）") +// @RequiresPermissions("system:industrialInternetAward:edit") + @Log(title = "修改平台建设奖补（只做修改，不做逻辑）", businessType = BusinessType.UPDATE) + @PutMapping("/update") + public AjaxResult update(@RequestBody BmsPlatformConstructionAward bmsPlatformConstructionAward) { + return toAjax(bmsPlatformConstructionAwardService.updateById(bmsPlatformConstructionAward)); + } + /** * 删除平台建设奖补 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsProjectSettlementAwardController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsProjectSettlementAwardController.java index 73b13df..bd523b7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsProjectSettlementAwardController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsProjectSettlementAwardController.java @@ -6,10 +6,13 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsIndustrialInternetAward; import com.ruoyi.jjh.declaration.entity.BmsProjectSettlementAward; import com.ruoyi.jjh.declaration.entity.dto.BmsProjectSettlementAwardAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsProjectSettlementAwardUpdateDto; import com.ruoyi.jjh.declaration.service.IBmsProjectSettlementAwardService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -29,6 +32,7 @@ import java.util.List; * @author farben * @date 2023-08-25 */ +@Api(tags = "项目落户奖补") @RestController @RequestMapping("/system/projectSettlementAward") public class BmsProjectSettlementAwardController extends BaseController { @@ -87,6 +91,17 @@ public class BmsProjectSettlementAwardController extends BaseController { return toAjax(bmsProjectSettlementAwardService.updateBmsProjectSettlementAward(bmsProjectSettlementAwardUpdateDto)); } + /** + * 修改项目落户奖补（只做修改，不做逻辑） + */ + @ApiOperation(value = "修改项目落户奖补（只做修改，不做逻辑）") +// @RequiresPermissions("system:industrialInternetAward:edit") + @Log(title = "修改项目落户奖补（只做修改，不做逻辑）", businessType = BusinessType.UPDATE) + @PutMapping("/update") + public AjaxResult update(@RequestBody BmsProjectSettlementAward bmsProjectSettlementAward) { + return toAjax(bmsProjectSettlementAwardService.updateById(bmsProjectSettlementAward)); + } + /** * 删除项目落户奖补 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsSceneOpeningAwardController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsSceneOpeningAwardController.java index 7ff3583..3539364 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsSceneOpeningAwardController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsSceneOpeningAwardController.java @@ -6,10 +6,13 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jjh.declaration.entity.BmsPlatformConstructionAward; import com.ruoyi.jjh.declaration.entity.BmsSceneOpeningAward; import com.ruoyi.jjh.declaration.entity.dto.BmsSceneOpeningAwardAddDto; import com.ruoyi.jjh.declaration.entity.dto.BmsSceneOpeningAwardUpdateDto; import com.ruoyi.jjh.declaration.service.IBmsSceneOpeningAwardService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -29,6 +32,7 @@ import java.util.List; * @author farben * @date 2023-08-25 */ +@Api(tags = "场景开放奖补") @RestController @RequestMapping("/system/sceneOpeningAward") public class BmsSceneOpeningAwardController extends BaseController { @@ -87,6 +91,17 @@ public class BmsSceneOpeningAwardController extends BaseController { return toAjax(bmsSceneOpeningAwardService.updateBmsSceneOpeningAward(bmsSceneOpeningAwardUpdateDto)); } + /** + * 修改场景开放奖补（只做修改，不做逻辑） + */ + @ApiOperation(value = "修改场景开放奖补（只做修改，不做逻辑）") +// @RequiresPermissions("system:industrialInternetAward:edit") + @Log(title = "修改场景开放奖补（只做修改，不做逻辑）", businessType = BusinessType.UPDATE) + @PutMapping("/update") + public AjaxResult update(@RequestBody BmsSceneOpeningAward bmsSceneOpeningAward) { + return toAjax(bmsSceneOpeningAwardService.updateById(bmsSceneOpeningAward)); + } + /** * 删除场景开放奖补 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsBigStrongAward.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsBigStrongAward.java index 4f2bbe3..40ecb54 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsBigStrongAward.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsBigStrongAward.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -17,6 +19,7 @@ import java.util.Date; * @author farben * @date 2023-08-25 */ +@ApiModel("做大做强奖详情对象") public class BmsBigStrongAward extends BaseInfoEntity { private static final long serialVersionUID = 1L; @@ -30,6 +33,7 @@ public class BmsBigStrongAward extends BaseInfoEntity { /** * 企业id */ + @ApiModelProperty("企业id") @Excel(name = "企业id") @JSONField(serialize = false) private Long enterpriseId; @@ -37,11 +41,15 @@ public class BmsBigStrongAward extends BaseInfoEntity { /** * 是否获得园区其他经营奖励 */ - - @Excel(name = "是否获得园区其他经营奖励，0：是，1：否", readConverterExp = "0=是,1=否") + @ApiModelProperty("是否获得园区其他经营奖励，0：是，1：否") + @Excel(name = "是否获得园区其他经营奖励", readConverterExp = "0=是,1=否") @JSONField(name = "是否获得园区其他经营奖励") private int isGainRewards; + /** + * 园区其他经营奖励 + */ + @ApiModelProperty("园区其他经营奖励") @JSONField(name = "园区其他经营奖励") @Excel(name = "奖励说明") private String rewardDescription; @@ -49,6 +57,7 @@ public class BmsBigStrongAward extends BaseInfoEntity { /** * 成立时间 */ + @ApiModelProperty("成立时间 yyyy-MM-dd") @JSONField(name = "申报成立时间") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "成立时间", width = 30, dateFormat = "yyyy-MM-dd") @@ -57,6 +66,7 @@ public class BmsBigStrongAward extends BaseInfoEntity { /** * 企业近3年发展情况及未来发展计划 */ + @ApiModelProperty("企业近3年发展情况及未来发展计划") @JSONField(serialize = false) @Excel(name = "企业近3年发展情况及未来发展计划") private String developmentPlan; @@ -64,6 +74,7 @@ public class BmsBigStrongAward extends BaseInfoEntity { /** * 是否删除：0，未删除；1，已删除 */ + @ApiModelProperty("是否删除：0，未删除；1，已删除") @JSONField(serialize = false) @Excel(name = "是否删除：0，未删除；1，已删除") private Long isDeleted; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsBrandingAward.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsBrandingAward.java index 1a8976e..bc2cac8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsBrandingAward.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsBrandingAward.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.ruoyi.common.annotation.Excel; import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -14,6 +16,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author farben * @date 2023-08-25 */ +@ApiModel("品牌打造奖补对象") public class BmsBrandingAward extends BaseInfoEntity { private static final long serialVersionUID = 1L; @@ -27,6 +30,7 @@ public class BmsBrandingAward extends BaseInfoEntity { /** * 企业id */ + @ApiModelProperty("企业id") @JSONField(serialize = false) @Excel(name = "企业id") private Long enterpriseId; @@ -34,6 +38,7 @@ public class BmsBrandingAward extends BaseInfoEntity { /** * 所获荣誉/所举办活动 */ + @ApiModelProperty("所获荣誉/所举办活动") @JSONField(name="所获荣誉/所举办活动") @Excel(name = "所获荣誉/所举办活动") private String honorsReceived; @@ -41,6 +46,7 @@ public class BmsBrandingAward extends BaseInfoEntity { /** * 所属等级 */ + @ApiModelProperty("所属等级") @JSONField(name="所属等级") @Excel(name = "所属等级") private Long level; @@ -48,6 +54,7 @@ public class BmsBrandingAward extends BaseInfoEntity { /** * 证明材料 */ + @ApiModelProperty("证明材料") @JSONField(serialize = false) @Excel(name = "证明材料") private String evidence; @@ -55,6 +62,7 @@ public class BmsBrandingAward extends BaseInfoEntity { /** * 是否删除：0，未删除；1，已删除 */ + @ApiModelProperty("是否删除：0，未删除；1，已删除") @JSONField(serialize = false) @Excel(name = "是否删除：0，未删除；1，已删除") private Long isDeleted; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsCarrierConstructionAward.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsCarrierConstructionAward.java index e23fd34..659e7af 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsCarrierConstructionAward.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsCarrierConstructionAward.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.ruoyi.common.annotation.Excel; import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,7 +16,7 @@ import lombok.EqualsAndHashCode; * @author farben * @date 2023-08-25 */ - +@ApiModel("载体建设奖补对象") @Data @EqualsAndHashCode(callSuper = true) public class BmsCarrierConstructionAward extends BaseInfoEntity { @@ -26,46 +28,55 @@ public class BmsCarrierConstructionAward extends BaseInfoEntity { private Long id; /** 企业id */ + @ApiModelProperty("企业id") @JSONField(serialize = false) @Excel(name = "企业id") private Long enterpriseId; /** 项目名称 */ + @ApiModelProperty("项目名称") @JSONField(name = "项目名称") @Excel(name = "项目名称") private String projectName; /** 文体企业数量占比 */ + @ApiModelProperty("文体企业数量占比") @JSONField(name = "文体企业数量占比") @Excel(name = "文体企业数量占比") private String quantityProportion; /** 文体企业营收占比 */ + @ApiModelProperty("文体企业营收占比") @JSONField(name = "文体企业营收占比") @Excel(name = "文体企业营收占比") private String revenueProportion; /** 文体企业从业人员占比 */ + @ApiModelProperty("文体企业从业人员占比") @JSONField(name = "文体企业从业人员占比") @Excel(name = "文体企业从业人员占比") private String personnelProportion; /** 相关佐证材料 */ + @ApiModelProperty("相关佐证材料") @JSONField(serialize = false) @Excel(name = "相关佐证材料") private String supportingMaterials; /** 项目工商登记许可 */ + @ApiModelProperty("项目工商登记许可") @JSONField(serialize = false) @Excel(name = "项目工商登记许可") private String businessLicense; /** 消防验收报告 */ + @ApiModelProperty("消防验收报告") @JSONField(serialize = false) @Excel(name = "消防验收报告") private String fireReport; /** 是否删除：0，未删除；1，已删除 */ + @ApiModelProperty("是否删除：0，未删除；1，已删除") @JSONField(serialize = false) @Excel(name = "是否删除：0，未删除；1，已删除") private Long isDeleted; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsCreditManagement.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsCreditManagement.java index f7cf231..0defed3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsCreditManagement.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsCreditManagement.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel; import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -14,6 +16,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author farben * @date 2023-09-04 */ +@ApiModel("信用管理奖补对象") public class BmsCreditManagement extends BaseInfoEntity { private static final long serialVersionUID = 1L; @@ -22,22 +25,27 @@ public class BmsCreditManagement extends BaseInfoEntity { private Long id; /** 企业id */ + @ApiModelProperty("企业id") @Excel(name = "企业id") private Long enterpriseId; /** 项目方案（包括项目基本情况介绍、项目投资情况以及实施进展、项目目标及取得的主要成效） */ + @ApiModelProperty("项目方案（包括项目基本情况介绍、项目投资情况以及实施进展、项目目标及取得的主要成效）") @Excel(name = "项目方案", readConverterExp = "包=括项目基本情况介绍、项目投资情况以及实施进展、项目目标及取得的主要成效") private String projectPlan; /** 资金使用说明（项目未完成的需提供，内容主要包括项目计划投资额，投资明细，目前已完成投资情况和后续投入计划等） */ + @ApiModelProperty("资金使用说明（项目未完成的需提供，内容主要包括项目计划投资额，投资明细，目前已完成投资情况和后续投入计划等）") @Excel(name = "资金使用说明", readConverterExp = "项=目未完成的需提供，内容主要包括项目计划投资额，投资明细，目前已完成投资情况和后续投入计划等") private String usesFunds; /** 项目专项审计报告（项目已完成的需提供） */ + @ApiModelProperty("项目专项审计报告（项目已完成的需提供）") @Excel(name = "项目专项审计报告", readConverterExp = "项=目已完成的需提供") private String auditReport; /** 是否删除：0，未删除；1，已删除 */ + @ApiModelProperty("是否删除：0，未删除；1，已删除") @Excel(name = "是否删除：0，未删除；1，已删除") private Long isDeleted; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsIntegrationIndustries.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsIntegrationIndustries.java index b1c4a58..621af68 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsIntegrationIndustries.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsIntegrationIndustries.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.ruoyi.common.annotation.Excel; import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,6 +16,7 @@ import lombok.EqualsAndHashCode; * @author farben * @date 2023-09-04 */ +@ApiModel("两业融合奖补对象") @Data @EqualsAndHashCode(callSuper = true) public class BmsIntegrationIndustries extends BaseInfoEntity { @@ -29,10 +32,12 @@ public class BmsIntegrationIndustries extends BaseInfoEntity { /** * 企业id */ + @ApiModelProperty("企业id") @JSONField(serialize = false) @Excel(name = "企业id") private Long enterpriseId; + @ApiModelProperty("申报类型") @JSONField(name = "申报类型") @Excel(name = "申报类型", readConverterExp = "1=两业融合示范企业,2=制造业企业设立财务独立核算的制造服务业职能部门,3=制造业企业剥离服务业务成立独立的法人") private Integer declarationType; @@ -40,6 +45,7 @@ public class BmsIntegrationIndustries extends BaseInfoEntity { /** * 证明材料 */ + @ApiModelProperty("证明材料") @JSONField(serialize = false) @Excel(name = "证明材料") private String evidence; @@ -47,6 +53,7 @@ public class BmsIntegrationIndustries extends BaseInfoEntity { /** * 营业执照 */ + @ApiModelProperty("营业执照") @JSONField(serialize = false) @Excel(name = "营业执照") private String businessLicense; @@ -54,6 +61,7 @@ public class BmsIntegrationIndustries extends BaseInfoEntity { /** * 完税证明 */ + @ApiModelProperty("完税证明") @JSONField(serialize = false) @Excel(name = "完税证明") private String taxPaymentCertificate; @@ -61,6 +69,7 @@ public class BmsIntegrationIndustries extends BaseInfoEntity { /** * 审计报告 */ + @ApiModelProperty("审计报告") @JSONField(serialize = false) @Excel(name = "审计报告") private String auditReport; @@ -68,6 +77,7 @@ public class BmsIntegrationIndustries extends BaseInfoEntity { /** * 股权架构图 */ + @ApiModelProperty("股权架构图") @JSONField(serialize = false) @Excel(name = "股权架构图") private String equityStructureChart; @@ -75,6 +85,7 @@ public class BmsIntegrationIndustries extends BaseInfoEntity { /** * 项目申报报告（含企业基本情况和项目基本情况） */ + @ApiModelProperty("项目申报报告（含企业基本情况和项目基本情况）") @JSONField(serialize = false) @Excel(name = "项目申报报告", readConverterExp = "含=企业基本情况和项目基本情况") private String declarationReport; @@ -82,6 +93,7 @@ public class BmsIntegrationIndustries extends BaseInfoEntity { /** * 独立核算相关证明 */ + @ApiModelProperty("独立核算相关证明") @JSONField(serialize = false) @Excel(name = "独立核算相关证明") private String independentAccounting; @@ -89,6 +101,7 @@ public class BmsIntegrationIndustries extends BaseInfoEntity { /** * 验资报告 */ + @ApiModelProperty("验资报告") @JSONField(serialize = false) @Excel(name = "验资报告") private String capitalVerificationReport; @@ -96,6 +109,7 @@ public class BmsIntegrationIndustries extends BaseInfoEntity { /** * 证明材料 */ + @ApiModelProperty("证明材料") @JSONField(serialize = false) @Excel(name = "证明材料") private String otherEvidence; @@ -103,6 +117,7 @@ public class BmsIntegrationIndustries extends BaseInfoEntity { /** * 是否删除：0，未删除；1，已删除 */ + @ApiModelProperty("是否删除：0，未删除；1，已删除") @JSONField(serialize = false) @Excel(name = "是否删除：0，未删除；1，已删除") private Long isDeleted; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsLogisticsDevelopmentAward.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsLogisticsDevelopmentAward.java index b7eb472..5cc6673 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsLogisticsDevelopmentAward.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsLogisticsDevelopmentAward.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.ruoyi.common.annotation.Excel; import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -13,6 +15,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author farben * @date 2023-08-25 */ +@ApiModel("物流发展奖补对象") public class BmsLogisticsDevelopmentAward extends BaseInfoEntity { private static final long serialVersionUID = 1L; @@ -25,36 +28,42 @@ public class BmsLogisticsDevelopmentAward extends BaseInfoEntity { /** * 企业id */ + @ApiModelProperty("企业id") @Excel(name = "企业id") private Long enterpriseId; /** * 荣誉证明文件 */ + @ApiModelProperty("荣誉证明文件") @Excel(name = "荣誉证明文件") private String honorCertificate; /** * 平台名称 */ + @ApiModelProperty("平台名称") @Excel(name = "平台名称") private String platformName; /** * 企业投资项目备案通知书或核准批复文件 */ + @ApiModelProperty("企业投资项目备案通知书或核准批复文件") @Excel(name = "企业投资项目备案通知书或核准批复文件") private String filingNotice; /** * 会计师事务所出具的企业财务报表审计报告 */ + @ApiModelProperty("会计师事务所出具的企业财务报表审计报告") @Excel(name = "会计师事务所出具的企业财务报表审计报告") private String auditReport; /** * 是否删除：0，未删除；1，已删除 */ + @ApiModelProperty("是否删除：0，未删除；1，已删除") @Excel(name = "是否删除：0，未删除；1，已删除") private Long isDeleted; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsManufacturingServicesAward.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsManufacturingServicesAward.java index c3a70f2..bdf95a8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsManufacturingServicesAward.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsManufacturingServicesAward.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.ruoyi.common.annotation.Excel; import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -14,6 +16,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author farben * @date 2023-08-25 */ +@ApiModel("制造服务业有效投入奖补对象") public class BmsManufacturingServicesAward extends BaseInfoEntity { private static final long serialVersionUID = 1L; @@ -27,6 +30,7 @@ public class BmsManufacturingServicesAward extends BaseInfoEntity { /** * 企业id */ + @ApiModelProperty("企业id") @JSONField(serialize = false) @Excel(name = "企业id") private Long enterpriseId; @@ -34,6 +38,7 @@ public class BmsManufacturingServicesAward extends BaseInfoEntity { /** * 企业投资项目备案通知书或核准批复文件 */ + @ApiModelProperty("企业投资项目备案通知书或核准批复文件") @JSONField(serialize = false) @Excel(name = "企业投资项目备案通知书或核准批复文件") private String filingNotice; @@ -41,6 +46,7 @@ public class BmsManufacturingServicesAward extends BaseInfoEntity { /** * 购置设备发票清单及发票扫描件 */ + @ApiModelProperty("购置设备发票清单及发票扫描件") @JSONField(serialize = false) @Excel(name = "购置设备发票清单及发票扫描件") private String invoice; @@ -48,6 +54,7 @@ public class BmsManufacturingServicesAward extends BaseInfoEntity { /** * 会计师事务所出具的企业申报项目购置设备情况的专项审计报告 */ + @ApiModelProperty("会计师事务所出具的企业申报项目购置设备情况的专项审计报告") @JSONField(serialize = false) @Excel(name = "会计师事务所出具的企业申报项目购置设备情况的专项审计报告") private String auditReport; @@ -55,6 +62,7 @@ public class BmsManufacturingServicesAward extends BaseInfoEntity { /** * 会计师事务所出具的企业财务报表审计报告 */ + @ApiModelProperty("会计师事务所出具的企业财务报表审计报告") @JSONField(serialize = false) @Excel(name = "会计师事务所出具的企业财务报表审计报告") private String financialStatements; @@ -62,6 +70,7 @@ public class BmsManufacturingServicesAward extends BaseInfoEntity { /** * 是否删除：0，未删除；1，已删除 */ + @ApiModelProperty("是否删除：0，未删除；1，已删除") @JSONField(serialize = false) @Excel(name = "是否删除：0，未删除；1，已删除") private Long isDeleted; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsPlatformConstructionAward.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsPlatformConstructionAward.java index 23a8096..0644c4e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsPlatformConstructionAward.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsPlatformConstructionAward.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.ruoyi.common.annotation.Excel; import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -14,6 +16,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author farben * @date 2023-08-25 */ +@ApiModel("平台建设奖补对象") public class BmsPlatformConstructionAward extends BaseInfoEntity { private static final long serialVersionUID = 1L; @@ -27,6 +30,7 @@ public class BmsPlatformConstructionAward extends BaseInfoEntity { /** * 企业id */ + @ApiModelProperty("企业id") @JSONField(serialize = false) @Excel(name = "企业id") private Long enterpriseId; @@ -34,6 +38,7 @@ public class BmsPlatformConstructionAward extends BaseInfoEntity { /** * 平台（项目）名称 */ + @ApiModelProperty("平台（项目）名称") @JSONField(name = "平台（项目）名称") @Excel(name = "平台（项目）名称") private String platformName; @@ -41,6 +46,7 @@ public class BmsPlatformConstructionAward extends BaseInfoEntity { /** * 合作协议 */ + @ApiModelProperty("合作协议") @JSONField(serialize = false) @Excel(name = "合作协议") private String agreement; @@ -48,6 +54,7 @@ public class BmsPlatformConstructionAward extends BaseInfoEntity { /** * 是否删除：0，未删除；1，已删除 */ + @ApiModelProperty("是否删除：0，未删除；1，已删除") @JSONField(serialize = false) @Excel(name = "是否删除：0，未删除；1，已删除") private Long isDeleted; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProjectSettlementAward.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProjectSettlementAward.java index 7d41b24..6198696 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProjectSettlementAward.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsProjectSettlementAward.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -21,6 +23,7 @@ import java.util.Date; */ @Data @EqualsAndHashCode(callSuper = true) +@ApiModel("项目落户奖补对象") public class BmsProjectSettlementAward extends BaseInfoEntity { private static final long serialVersionUID = 1L; @@ -35,6 +38,7 @@ public class BmsProjectSettlementAward extends BaseInfoEntity { /** * 企业id */ + @ApiModelProperty("企业id") @JSONField(serialize = false) @Excel(name = "企业id") private Long enterpriseId; @@ -42,6 +46,7 @@ public class BmsProjectSettlementAward extends BaseInfoEntity { /** * 申报单位成立时间 */ + @ApiModelProperty("申报单位成立时间") @JSONField(name= "申报单位成立时间") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "申报单位成立时间", width = 30, dateFormat = "yyyy-MM-dd") @@ -50,6 +55,7 @@ public class BmsProjectSettlementAward extends BaseInfoEntity { /** * 截至目前员工人数 */ + @ApiModelProperty("截至目前员工人数") @JSONField(name= "截至目前员工人数") @Excel(name = "截至目前员工人数") private Long employeeNum; @@ -57,14 +63,15 @@ public class BmsProjectSettlementAward extends BaseInfoEntity { /** * 招商协议 */ + @ApiModelProperty("招商协议") @JSONField(serialize = false) - @Excel(name = "招商协议") private String agreement; /** * 验资报告 */ + @ApiModelProperty("验资报告") @JSONField(serialize = false) @Excel(name = "验资报告") private String report; @@ -72,6 +79,7 @@ public class BmsProjectSettlementAward extends BaseInfoEntity { /** * 营业执照 */ + @ApiModelProperty("营业执照") @JSONField(serialize = false) @Excel(name = "营业执照") private String businessLicense; @@ -79,6 +87,7 @@ public class BmsProjectSettlementAward extends BaseInfoEntity { /** * 其他材料 */ + @ApiModelProperty("其他材料") @JSONField(serialize = false) @Excel(name = "其他材料") private String otherMaterials; @@ -86,6 +95,7 @@ public class BmsProjectSettlementAward extends BaseInfoEntity { /** * 是否删除：0，未删除；1，已删除 */ + @ApiModelProperty("是否删除：0，未删除；1，已删除") @JSONField(serialize = false) @Excel(name = "是否删除：0，未删除；1，已删除") private Long isDeleted; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsSceneOpeningAward.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsSceneOpeningAward.java index c11b862..9236203 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsSceneOpeningAward.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsSceneOpeningAward.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.ruoyi.common.annotation.Excel; import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -16,6 +18,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author farben * @date 2023-08-25 */ +@ApiModel("场景开放奖补对象") @Data @EqualsAndHashCode(callSuper = true) public class BmsSceneOpeningAward extends BaseInfoEntity { @@ -31,6 +34,7 @@ public class BmsSceneOpeningAward extends BaseInfoEntity { /** * 企业id */ + @ApiModelProperty("企业id") @JSONField(serialize = false) @Excel(name = "企业id") private Long enterpriseId; @@ -38,6 +42,7 @@ public class BmsSceneOpeningAward extends BaseInfoEntity { /** * 项目名称 */ + @ApiModelProperty("项目名称") @JSONField(name = "项目名称") @Excel(name = "项目名称") private String projectName; @@ -45,6 +50,7 @@ public class BmsSceneOpeningAward extends BaseInfoEntity { /** * 所属类型 */ + @ApiModelProperty("所属类型") @JSONField(name = "所属类型") @Excel(name = "所属类型") private Long type; @@ -52,6 +58,7 @@ public class BmsSceneOpeningAward extends BaseInfoEntity { /** * 公示、发文证明、专家评分表 */ + @ApiModelProperty("公示、发文证明、专家评分表") @JSONField(serialize = false) @Excel(name = "公示、发文证明、专家评分表") private String material; @@ -59,6 +66,7 @@ public class BmsSceneOpeningAward extends BaseInfoEntity { /** * 是否删除：0，未删除；1，已删除 */ + @ApiModelProperty("是否删除：0，未删除；1，已删除") @JSONField(serialize = false) @Excel(name = "是否删除：0，未删除；1，已删除") private Long isDeleted;