diff --git a/src/main/java/com/gszc/controller/MiniParkController.java b/src/main/java/com/gszc/controller/MiniParkController.java index 9753e75..a523c20 100644 --- a/src/main/java/com/gszc/controller/MiniParkController.java +++ b/src/main/java/com/gszc/controller/MiniParkController.java @@ -1,6 +1,7 @@ package com.gszc.controller; +import com.alibaba.fastjson.JSONObject; import com.gszc.build.Result; import com.gszc.build.ResultBuilder; import com.gszc.entity.Industry; @@ -48,5 +49,37 @@ public class MiniParkController { return ResultBuilder.withPayload(invoiceCategories).build(); } + @PostMapping("/queryIndustryList") + @ApiOperation(value = "查看行业类型", notes = "查看行业类型") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", required = true, dataType = "String", paramType = "header"), + }) + @ResponseBody + public Result queryIndustryList() { + List industries = parkService.queryIndustryList(); + return ResultBuilder.withPayload(industries).build(); + } + + @PostMapping("/queryInvoiceCategoryList") + @ApiOperation(value = "查看开票类型", notes = "查看开票类型") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", required = true, dataType = "String", paramType = "header"), + }) + @ResponseBody + public Result queryInvoiceCategoryList() { + List invoiceCategories = parkService.queryInvoiceCategoryList(); + return ResultBuilder.withPayload(invoiceCategories).build(); + } + + @PostMapping("/queryParkList") + @ApiOperation(value = "查看park", notes = "查看park") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", required = true, dataType = "String", paramType = "header"), + }) + @ResponseBody + public Result queryParkList() { + List parks = parkService.queryParkList(); + return ResultBuilder.withPayload(parks).build(); + } } diff --git a/src/main/java/com/gszc/entity/Park.java b/src/main/java/com/gszc/entity/Park.java index 096e2ad..0608a3d 100644 --- a/src/main/java/com/gszc/entity/Park.java +++ b/src/main/java/com/gszc/entity/Park.java @@ -75,6 +75,9 @@ public class Park extends Model { @ApiModelProperty(hidden = true) @TableField(exist = false) private JSONArray industry; + @ApiModelProperty(hidden = true) + @TableField(exist = false) + private JSONArray invoiceCategoryList; @Override diff --git a/src/main/java/com/gszc/service/impl/ParkServiceImpl.java b/src/main/java/com/gszc/service/impl/ParkServiceImpl.java index fb5fe02..fb4fdd8 100644 --- a/src/main/java/com/gszc/service/impl/ParkServiceImpl.java +++ b/src/main/java/com/gszc/service/impl/ParkServiceImpl.java @@ -100,11 +100,53 @@ public class ParkServiceImpl extends ServiceImpl implements IP Integer count = parkMapper.selectCount(new EntityWrapper()); List result = parkMapper.selectPage(new Page<>((pageNum - 1) * pageSize, pageSize), new EntityWrapper().eq("1", "1").orderBy("create_date", false)); + for(Park park:result){ + String industryCategory = park.getIndustryCategory(); + String[] split = industryCategory.split(","); + JSONArray jsonArray = new JSONArray(); + for(int i=0;i queryParkList(){ + List result = parkMapper.selectList(new EntityWrapper().eq("1", "1").orderBy("create_date", false)); + for(Park park:result){ + String industryCategory = park.getIndustryCategory(); + String[] split = industryCategory.split(","); + JSONArray jsonArray = new JSONArray(); + for(int i=0;i