diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BPlanEnterpriseController.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BPlanEnterpriseController.java index 5223b2e..474ea14 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BPlanEnterpriseController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BPlanEnterpriseController.java @@ -75,14 +75,27 @@ public class BPlanEnterpriseController extends BaseController { @ApiOperation(value = "查询首页", response = BPlanEnterPriseTreeResponse.class) @GetMapping("/tree") public AjaxResult tree(BPlanEnterprisePageRequest req) { + return success(bPlanEnterpriseService.getShouyeList(req)); - return success(bPlanEnterpriseService.getShouyeList(req)); + } + + + /** + * 首页导出 + */ + @ApiOperation(value = "首页导出") + @GetMapping("/exportpage") + public void exportpage(HttpServletResponse response, BPlanEnterprisePageRequest req) { + List list = bPlanEnterpriseService.getShouyeList(req); + ExcelUtil util = new ExcelUtil(BPlanEnterPriseTreeResponse. class); + util.exportExcel(response, list, "行政区划数据"); } + /** * 通过主键查询单条数据 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BKeyEnterpriseExportResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BKeyEnterpriseExportResponse.java new file mode 100644 index 0000000..f3089cf --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BKeyEnterpriseExportResponse.java @@ -0,0 +1,50 @@ +//package com.ruoyi.programManagement.entity.response; +// +//import com.ruoyi.common.annotation.Excel; +//import io.swagger.annotations.ApiModel; +//import io.swagger.annotations.ApiModelProperty; +//import lombok.Data; +// +//@Data +//@ApiModel("重点企业导出响应类") +//public class BKeyEnterpriseExportResponse { +// +// /** +// * 成功数量 +// */ +// @ApiModelProperty(value = "成功数量") +// private Integer success; +// +// +// +// /** +// * 失败数量 +// */ +// @ApiModelProperty(value = "失败数量") +// private Integer faile; +// +// +// +// /** +// * 企业代码 +// */ +// +// @ApiModelProperty(value = "企业代码") +// private String entCode; +// +// +// /** +// * 年份 +// */ +// +// @ApiModelProperty("年份") +// private String year; +// +// +// /** +// * 企业名称 +// */ +// @ApiModelProperty(value = "企业名称") +// @Excel(name = "企业名称") +// private String enterpriseName; +//} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterPriseTreeResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterPriseTreeResponse.java index 193776c..4cc05bf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterPriseTreeResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterPriseTreeResponse.java @@ -1,5 +1,6 @@ package com.ruoyi.programManagement.entity.response; +import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,6 +15,7 @@ public class BPlanEnterPriseTreeResponse { /** * 执法地区 */ + @Excel(name = "执法地区") @ApiModelProperty(value = "执法地区") private String lawAreas; @@ -21,23 +23,27 @@ public class BPlanEnterPriseTreeResponse { /** * 排序 */ + @ApiModelProperty(value = "排序") private String sort; /** * 执法计划数量 */ + @Excel(name = "执法计划数量") @ApiModelProperty("执法计划数量") private Integer count; /** * 完成执法数量 */ + @Excel(name = "完成执法数量") @ApiModelProperty("完成执法数量") private Integer completed; /** * 百分比 */ + @Excel(name = "百分比") @ApiModelProperty("百分比") private double completionRate; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BKeyEnterpriseMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BKeyEnterpriseMapper.java index b238a1c..9f6c6b5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BKeyEnterpriseMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BKeyEnterpriseMapper.java @@ -44,8 +44,12 @@ public interface BKeyEnterpriseMapper extends BaseMapper { BKeyEnterprise getByentCode(@Param("entCode") String entCode); - - + /** + * 根据企业代码和年份查询数据 + * @param req + * @return + */ + List select(@Param("req") BKeyEnterprise req); // /** // * 根据行政区划代码查询重点企业数量 // * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BKeyEnterpriseServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BKeyEnterpriseServiceImpl.java index c0aa946..2aef386 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BKeyEnterpriseServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BKeyEnterpriseServiceImpl.java @@ -29,11 +29,23 @@ public class BKeyEnterpriseServiceImpl extends ServiceImpl bKeyEnterpriseList) { StringBuilder successMsg = new StringBuilder(); +// List list =new ArrayList<>(); +// Integer faile=0; +// Integer success=0; if (!bKeyEnterpriseList.isEmpty()) { for (BKeyEnterprise bKeyEnterprise : bKeyEnterpriseList) { +// //根据企业信用代码,年份查询是否存在 +// List count = bKeyEnterpriseMapper.select(bKeyEnterprise); +// if (!count.isEmpty()){ +// faile=faile+1; +// list.add() +// }else{ +// +// } baseMapper.bKeyEnterpriseAdd(bKeyEnterprise); } successMsg.append("导入成功"); diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BKeyEnterpriseMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BKeyEnterpriseMapper.xml index 7e6b8de..5706bfa 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/BKeyEnterpriseMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/BKeyEnterpriseMapper.xml @@ -47,4 +47,7 @@ + \ No newline at end of file