diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java index dbc9c976..5927d0fb 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java @@ -82,8 +82,8 @@ public class MarketStandardController { @ApiOperationSupport(order = 3) @RequiresPermissions("marketStandard:export") @GetMapping(value = "/exportXls", produces = "application/zip") - public ModelAndView exportXls(HttpServletResponse response, LawsMarketStandard LawsMarketStandard, HttpServletRequest req) { - return marketStandardService.export(response, LawsMarketStandard, "市场法规清单", "市场法规清单", req); + public ModelAndView exportXls(HttpServletResponse response, LawsMarketStandard lawsMarketStandard, HttpServletRequest req) { + return marketStandardService.export(response, lawsMarketStandard, "市场法规清单", "市场法规清单", req); } /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java index def365a2..76c222c1 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java @@ -1,14 +1,17 @@ package com.jero.modules.laws.marketStandard.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.aspect.annotation.Translation; import com.jero.common.util.MessageUtils; import com.jero.modules.laws.marketStandard.entity.LawsMarketStandard; import com.jero.modules.laws.marketStandard.entity.LawsMarketStandardDetail; import com.jero.modules.laws.marketStandard.entity.MarketStandardDetailVO; +import com.jero.modules.laws.marketStandard.service.ILawsMarketStandardDetailService; import com.jero.modules.laws.marketStandard.service.ILawsMarketStandardService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -35,101 +38,28 @@ import java.util.Map; public class MarketStandardDetailController { @Resource - private ILawsMarketStandardService marketStandardService; - + private ILawsMarketStandardDetailService lawsMarketStandardDetailService; /** - * 查看 + * 市场法规清单详情列表 * - * @param marketStandardDetail + * @param manifestId * @return */ - @AutoLog(value = "外部标准库-市场法规清单-查看") - @ApiOperation(value = "外部标准库-市场法规清单-查看", notes = "外部标准库-市场法规清单-查看") - @GetMapping(value = "/detail") + @AutoLog(value = "外部标准库-市场法规清单详情列表") + @ApiOperation(value = "外部标准库-市场法规清单详情列表", notes = "外部标准库-市场法规清单详情列表") + @GetMapping(value = "/list") @ApiOperationSupport(order = 2) @RequiresPermissions("marketStandard:detail") - public Result detail(LawsMarketStandardDetail marketStandardDetail) { - MarketStandardDetailVO result = marketStandardService.detail(marketStandardDetail); - return Result.OK(result); - } - - /** - * 导出excel - */ - @AutoLog(value = "外部标准库-市场法规清单-导出") - @ApiOperation(value = "外部标准库-市场法规清单-导出", notes = "外部标准库-市场法规清单-导出") - @ApiOperationSupport(order = 3) - @RequiresPermissions("marketStandard:export") - @GetMapping(value = "/exportXls", produces = "application/zip") - public void exportXls(HttpServletResponse response, LawsMarketStandard LawsMarketStandard, HttpServletRequest req) { - marketStandardService.export(response, LawsMarketStandard, "市场法规清单", "市场法规清单", req); - } - - /** - * 批量删除 - * - * @param map - * @return - */ - @AutoLog(value = "外部标准库-市场法规清单-批量删除") - @ApiOperation(value = "外部标准库-市场法规清单-批量删除", notes = "外部标准库-市场法规清单-批量删除") - @ApiOperationSupport(order = 4) - @PostMapping(value = "/deleteBatch") - @RequiresPermissions("marketStandard:deleteBatch") - public Result deleteBatch(@RequestBody Map map) { - if (!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))) { - return Result.error("请选择数据!"); + @Translation + public Result detail(@RequestParam("manifestId") String manifestId) { + if(StringUtils.isBlank(manifestId)){ + return Result.error("id不能为空"); } - this.marketStandardService.deleteByIds(Arrays.asList(map.get("ids").split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 新增 - * - * @param marketStandardDetailVO - * @return - */ - @AutoLog(value = "外部标准库-市场法规清单-新增") - @ApiOperation(value = "外部标准库-市场法规清单-新增", notes = "外部标准库-市场法规清单-新增") - @ApiOperationSupport(order = 5) - @PostMapping(value = "/add") - @RequiresPermissions("marketStandard:add") - public Result add(@RequestBody MarketStandardDetailVO marketStandardDetailVO) { - this.marketStandardService.add(marketStandardDetailVO); - return Result.OK("新增成功!"); - } - - /** - * 编辑 - * - * @param marketStandardDetailVO - * @return - */ - @AutoLog(value = "外部标准库-市场法规清单-编辑") - @ApiOperation(value = "外部标准库-市场法规清单-编辑", notes = "外部标准库-市场法规清单-编辑") - @ApiOperationSupport(order = 6) - @PostMapping(value = "/edit") - @RequiresPermissions("marketStandard:edit") - public Result edit(@RequestBody MarketStandardDetailVO marketStandardDetailVO) { - this.marketStandardService.edit(marketStandardDetailVO); - return Result.OK("修改成功!"); - } - - /** - * 导入 - * - * @param file - * @return - */ - @AutoLog(value = "外部标准库-市场法规清单-导入") - @ApiOperation(value = "外部标准库-市场法规清单-导入", notes = "外部标准库-市场法规清单-导入") - @ApiOperationSupport(order = 7) - @PostMapping(value = "/importExcel") - @RequiresPermissions("marketStandard:importExcel") - public Result importExcel(@RequestParam("file") @ApiParam("文件") MultipartFile file) { - List list = marketStandardService.importExcel(file); + LambdaQueryWrapper queryLawsMarketStandardDetail = new LambdaQueryWrapper<>(); + queryLawsMarketStandardDetail.in(LawsMarketStandardDetail::getManifestId, + Arrays.asList(manifestId.split(","))); + List list = lawsMarketStandardDetailService.list(queryLawsMarketStandardDetail); return Result.OK(list); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java index 11ae5527..af892d1a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java @@ -119,6 +119,7 @@ public class LawsMarketStandardDetail implements Serializable { @Excel(name = "注册日期", width = 15) @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "注册日期") + // todo 类型改成varchar private String registrationDate; /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java index f9630687..e0b0178e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java @@ -229,14 +229,14 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.like(StringUtils.isNotBlank(marketStandardDetail.getStandardNumber()), - LawsMarketStandardDetail::getStandardNumber, marketStandardDetail.getStandardNumber()); - wrapper.like(StringUtils.isNotBlank(marketStandardDetail.getStandardName()), - LawsMarketStandardDetail::getStandardName, marketStandardDetail.getStandardName()); - wrapper.in(LawsMarketStandardDetail::getManifestId, idList); - List pageData = lawsMarketStandardDetailService.list(wrapper); - result.setLists(pageData); +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); +// wrapper.like(StringUtils.isNotBlank(marketStandardDetail.getStandardNumber()), +// LawsMarketStandardDetail::getStandardNumber, marketStandardDetail.getStandardNumber()); +// wrapper.like(StringUtils.isNotBlank(marketStandardDetail.getStandardName()), +// LawsMarketStandardDetail::getStandardName, marketStandardDetail.getStandardName()); +// wrapper.in(LawsMarketStandardDetail::getManifestId, idList); +// List pageData = lawsMarketStandardDetailService.list(wrapper); +// result.setLists(pageData); // 如果不是合并查看列表页面 if (idList.size() > 1) {