Merge branch 'cpq-dev' of wangfan/adweb3-server into master

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/api/controller/OpenAPIController.java

@@ -69,9 +69,9 @@ public class OpenAPIController {
 
         if (CollectionUtils.isNotEmpty(adwebSites)) {
             QueryWrapper<AdwebProduct> adwebProductQueryWrapper = new QueryWrapper<>();
-            adwebSiteQueryWrapper.eq("site_code", adwebSites.get(0).getCode());
-            List<AdwebProduct> adwebProducts =
-                    adwebProductService.getBaseMapper().selectList(adwebProductQueryWrapper);
+            adwebProductQueryWrapper.eq("site_code", adwebSites.get(0).getCode());
+            adwebProductQueryWrapper.ne("action_type", "delete");
+            List<AdwebProduct> adwebProducts = adwebProductService.list(adwebProductQueryWrapper);
 
             return Result.ok(adwebProducts.stream().map(ProductInfoVO::fromAdwebProduct).toList());
         } else {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/controller/AdwebEnquiryController.java

@@ -662,6 +662,22 @@ public class AdwebEnquiryController extends JeecgController<AdwebEnquiry, IAdweb
         return Result.OK("批量复原成功!");
     }
 
+    /**
+     * 批量删除
+     *
+     * @param id 删除的询盘
+     * @return
+     */
+    @GetMapping(value = "/delBatch")
+    public Result<?> delBatch(@RequestParam("id") String id) {
+
+        UpdateWrapper<AdwebEnquiry> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", id.split(","));
+        updateWrapper.set("status", 0);
+        this.adwebEnquiryService.update(updateWrapper);
+        return Result.OK("批量删除成功!");
+    }
+
     @GetMapping("/getWastedEnquiry")
     public Result<List<EnquiryListDto>> getWastedEnquiry(EnquiryListSearchDto enquiryListSearchDto) {