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 d640a92..29f35a7 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 @@ -98,7 +98,7 @@ public class BPlanEnterpriseController extends BaseController { .sum(); double ptSum = (double) checkEnterpriseCountSum /plannedEnterpriseCountSum; BPlanEnterPriseTreeResponse resultObject = new BPlanEnterPriseTreeResponse(); - resultObject.setInstitutionName("苏州"); + resultObject.setInstitutionName("苏州市"); resultObject.setPlannedEnterpriseCount(plannedEnterpriseCountSum); resultObject.setCheckEnterpriseCount(checkEnterpriseCountSum); resultObject.setPt(ptSum); @@ -208,8 +208,9 @@ public class BPlanEnterpriseController extends BaseController { */ @GetMapping("/getZhifa") @ApiOperation(value = "执法结果-企业详情") - public AjaxResult getZhifa(@Valid checkResultRequest req) { - return success(bPlanEnterpriseService.getZhifa(req)); + public TableDataInfo getZhifa(@Valid checkResultRequest req) { + startPage(); + return getDataTable(bPlanEnterpriseService.getZhifa(req)); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java index 0083cc6..df99226 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java @@ -101,6 +101,7 @@ public class BPlanEnterprise implements Serializable { * 行政区划 */ @ApiModelProperty(value = "行政区划") + @Excel(name = "行政区划") private String district; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/checkResultRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/checkResultRequest.java index 9b295f1..8bb8f57 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/checkResultRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/checkResultRequest.java @@ -29,17 +29,6 @@ public class checkResultRequest { */ @ApiModelProperty(value = "检查状态 1=已检查,2=未检查") private Integer checkStatus; - /** - * size - */ - @ApiModelProperty("size") - private int pageSize; - - /** - * num - */ - @ApiModelProperty("num") - private int pageNum; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/BPlanEnterpriseService.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/BPlanEnterpriseService.java index c8b9e37..7e30bae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/BPlanEnterpriseService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/BPlanEnterpriseService.java @@ -7,6 +7,7 @@ import com.ruoyi.programManagement.entity.request.BPlanEnterprisePageRequest; import com.ruoyi.programManagement.entity.request.PlanMxRequest; import com.ruoyi.programManagement.entity.request.checkResultRequest; import com.ruoyi.programManagement.entity.request.zhifaRequest; +import com.ruoyi.programManagement.entity.response.BPlanEnterpriseZhifaResponse; import com.ruoyi.programManagement.entity.response.zhifaCountResponse; import com.ruoyi.programManagement.entity.response.zhifaPlanResponse; @@ -44,7 +45,7 @@ public interface BPlanEnterpriseService extends IService { * @param req 请求类 * @return */ - Map getZhifa(checkResultRequest req); + ListgetZhifa (checkResultRequest req); /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BPlanEnterpriseServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BPlanEnterpriseServiceImpl.java index 1fd58fc..71c8bba 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BPlanEnterpriseServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BPlanEnterpriseServiceImpl.java @@ -52,14 +52,8 @@ public class BPlanEnterpriseServiceImpl extends ServiceImpl getZhifa(checkResultRequest req) { - List getZhifa = bPlanEnterpriseMapper.getZhifa(req); - PageHelper.startPage(req.getPageNum(), req.getPageSize()); - PageInfo pageInfo = new PageInfo<>(getZhifa); - Map result = new HashMap<>(); - result.put("total", pageInfo.getTotal()); - result.put("list", pageInfo.getList()); - return result; + public List getZhifa(checkResultRequest req) { + return bPlanEnterpriseMapper.getZhifa(req); } @Override diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BAdministrativeMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BAdministrativeMapper.xml index 10cb74b..d3bc04f 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/BAdministrativeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/BAdministrativeMapper.xml @@ -52,16 +52,16 @@