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 5927d0fb..4392db19 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 @@ -86,6 +86,26 @@ public class MarketStandardController { return marketStandardService.export(response, lawsMarketStandard, "市场法规清单", "市场法规清单", req); } + + /** + * 删除 + * + * @param map + * @return + */ + @AutoLog(value = "外部标准库-市场法规清单-批量删除") + @ApiOperation(value = "外部标准库-市场法规清单-批量删除", notes = "外部标准库-市场法规清单-批量删除") + @ApiOperationSupport(order = 4) + @PostMapping(value = "/delete") + @RequiresPermissions("marketStandard:delete") + public Result delete(@RequestBody Map map) { + if (!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))) { + return Result.error("请选择数据!"); + } + this.marketStandardService.deleteById(Arrays.asList(map.get("id").split(","))); + return Result.OK("批量删除成功!"); + } + /** * 批量删除 * 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 76c222c1..1322939a 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 @@ -52,15 +52,8 @@ public class MarketStandardDetailController { @ApiOperationSupport(order = 2) @RequiresPermissions("marketStandard:detail") @Translation - public Result detail(@RequestParam("manifestId") String manifestId) { - if(StringUtils.isBlank(manifestId)){ - return Result.error("id不能为空"); - } - LambdaQueryWrapper queryLawsMarketStandardDetail = new LambdaQueryWrapper<>(); - queryLawsMarketStandardDetail.in(LawsMarketStandardDetail::getManifestId, - Arrays.asList(manifestId.split(","))); - List list = lawsMarketStandardDetailService.list(queryLawsMarketStandardDetail); - return Result.OK(list); + public Result list(@RequestParam("manifestId") String manifestId) { + return lawsMarketStandardDetailService.getList(manifestId); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardDetailService.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardDetailService.java index 69485060..17cabc9c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardDetailService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardDetailService.java @@ -1,5 +1,6 @@ package com.jero.modules.laws.marketStandard.service; +import com.jero.common.api.vo.Result; import com.jero.modules.laws.marketStandard.entity.LawsMarketStandardDetail; import com.baomidou.mybatisplus.extension.service.IService; @@ -10,4 +11,10 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ILawsMarketStandardDetailService extends IService { + /** + * 获取清单列表 + * @param manifestId + * @return + */ + Result getList(String manifestId); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java index 4c4df01b..a596617b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java @@ -19,6 +19,12 @@ import java.util.List; */ public interface ILawsMarketStandardService extends IService { + /** + * 删除 + * @param ids + */ + void deleteById(List ids); + /** * 批量删除 * @param ids diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java index fd36979b..f68de8e7 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java @@ -1,11 +1,23 @@ package com.jero.modules.laws.marketStandard.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.api.vo.Result; +import com.jero.modules.laws.marketStandard.entity.LawsMarketStandard; import com.jero.modules.laws.marketStandard.entity.LawsMarketStandardDetail; import com.jero.modules.laws.marketStandard.service.ILawsMarketStandardDetailService; import com.jero.modules.laws.marketStandard.mapper.LawsMarketStandardDetailMapper; +import com.jero.modules.laws.marketStandard.service.ILawsMarketStandardService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + /** * @author ThinkBook * @description 针对表【laws_market_standard_detail】的数据库操作Service实现 @@ -15,6 +27,17 @@ import org.springframework.stereotype.Service; public class LawsMarketStandardDetailServiceImpl extends ServiceImpl implements ILawsMarketStandardDetailService { + @Override + public Result getList(String manifestId) { + if(StringUtils.isBlank(manifestId)){ + return Result.error("id不能为空"); + } + List listIds = Arrays.asList(manifestId.split(",")); + LambdaQueryWrapper queryLawsMarketStandardDetail = new LambdaQueryWrapper<>(); + queryLawsMarketStandardDetail.in(LawsMarketStandardDetail::getManifestId,listIds); + List list = list(queryLawsMarketStandardDetail); + return Result.OK(list); + } } 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 e0b0178e..867ba324 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 @@ -94,7 +94,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl ids) { + LambdaQueryWrapper queryLawsMarketStandard = new LambdaQueryWrapper<>(); +// list() + removeByIds(ids); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(LawsMarketStandardDetail::getManifestId, ids); + lawsMarketStandardDetailService.remove(wrapper); + + } + @Override public void deleteByIds(List ids) { removeByIds(ids);