完善市场法规库清单导出

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<T> delete(@RequestBody Map<String, String> 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("批量删除成功!");
+    }
+
     /**
      * 批量删除
      *

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) {
+    public Result<?> list(@RequestParam("manifestId") String manifestId) {
-        if(StringUtils.isBlank(manifestId)){
+        return lawsMarketStandardDetailService.getList(manifestId);
-            return Result.error("id不能为空");
-        }
-        LambdaQueryWrapper<LawsMarketStandardDetail> queryLawsMarketStandardDetail = new LambdaQueryWrapper<>();
-        queryLawsMarketStandardDetail.in(LawsMarketStandardDetail::getManifestId,
-                Arrays.asList(manifestId.split(",")));
-        List<LawsMarketStandardDetail> list = lawsMarketStandardDetailService.list(queryLawsMarketStandardDetail);
-        return Result.OK(list);
     }
 
 }

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<LawsMarketStandardDetail> {
 
+    /**
+     * 获取清单列表
+     * @param manifestId
+     * @return
+     */
+    Result<?> getList(String manifestId);
 }

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<LawsMarketStandard> {
 
+    /**
+     * 删除
+     * @param ids
+     */
+    void deleteById(List<String> ids);
+
     /**
      * 批量删除
      * @param ids

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<LawsMarketStandardDetailMapper, LawsMarketStandardDetail>
     implements ILawsMarketStandardDetailService {
 
+    @Override
+    public Result<?> getList(String manifestId) {
+        if(StringUtils.isBlank(manifestId)){
+            return Result.error("id不能为空");
+        }
+        List<String> listIds = Arrays.asList(manifestId.split(","));
+        LambdaQueryWrapper<LawsMarketStandardDetail> queryLawsMarketStandardDetail = new LambdaQueryWrapper<>();
+        queryLawsMarketStandardDetail.in(LawsMarketStandardDetail::getManifestId,listIds);
+        List<LawsMarketStandardDetail> list = list(queryLawsMarketStandardDetail);
+        return Result.OK(list);
+    }
 }
 
 

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java

@@ -94,7 +94,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
     }
 
     @Override
-    public void add(MarketStandardDetailVO marketStandardDetailVO) {
+    public synchronized void add(MarketStandardDetailVO marketStandardDetailVO) {
         LawsMarketStandard manifest = marketStandardDetailVO.getManifest();
         manifest.setManifestStatus(MarketStandardConstants.MANIFEST_STATUS_NOT_PUBLISH);
         // 设置清单编号
@@ -112,6 +112,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
      */
     private String generateManifestNo(String country) {
         // TODO 生成清单编号
+
         return "BZFG" + "01";
     }
 
@@ -190,6 +191,17 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         return mv;
     }
 
+    @Override
+    public void deleteById(List<String> ids) {
+        LambdaQueryWrapper<LawsMarketStandard> queryLawsMarketStandard = new LambdaQueryWrapper<>();
+//        list()
+        removeByIds(ids);
+        LambdaQueryWrapper<LawsMarketStandardDetail> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(LawsMarketStandardDetail::getManifestId, ids);
+        lawsMarketStandardDetailService.remove(wrapper);
+
+    }
+
     @Override
     public void deleteByIds(List<String> ids) {
         removeByIds(ids);