询价单接口

srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleInterfaceSyncController.java

@@ -3,18 +3,16 @@ package org.jeecg.modules.saleCode.controller;
 import java.io.UnsupportedEncodingException;
 import java.io.IOException;
 import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
-import java.util.HashMap;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
+import org.jeecg.modules.baseCode.entity.BaseProductArchive;
 import org.jeecg.modules.saleCode.entity.*;
+import org.jeecg.modules.saleCode.mapper.SaleInterfaceSyncMapper;
 import org.jeecg.modules.saleCode.service.ISaleInquiryFormService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -48,405 +46,425 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 
 
- /**
+/**
  * @Description: 询价单-接口同步表
  * @Author: jeecg-boot
- * @Date:   2025-04-17
+ * @Date: 2025-04-17
  * @Version: V1.0
  */
-@Api(tags="询价单-接口同步表")
+@Api(tags = "询价单-接口同步表")
 @RestController
 @RequestMapping("/saleCode/saleInterfaceSync")
 @Slf4j
 public class SaleInterfaceSyncController {
-	@Autowired
-	private ISaleInterfaceSyncService saleInterfaceSyncService;
-	@Autowired
-	private ISaleInterfaceItemService saleInterfaceItemService;
-	 @Autowired
-	 private ISaleInquiryFormService saleInquiryFormService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param saleInterfaceSync
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "询价单-接口同步表-分页列表查询")
-	@ApiOperation(value="询价单-接口同步表-分页列表查询", notes="询价单-接口同步表-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<SaleInterfaceSync>> queryPageList(SaleInterfaceSync saleInterfaceSync,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
+    @Autowired
+    private ISaleInterfaceSyncService saleInterfaceSyncService;
+    @Autowired
+    private ISaleInterfaceItemService saleInterfaceItemService;
+    @Autowired
+    private ISaleInquiryFormService saleInquiryFormService;
+    @Autowired
+    private SaleInterfaceSyncMapper saleInterfaceSyncMapper;
+
+    /**
+     * 分页列表查询
+     *
+     * @param saleInterfaceSync
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "询价单-接口同步表-分页列表查询")
+    @ApiOperation(value = "询价单-接口同步表-分页列表查询", notes = "询价单-接口同步表-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<SaleInterfaceSync>> queryPageList(SaleInterfaceSync saleInterfaceSync,
+                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                          HttpServletRequest req) {
         QueryWrapper<SaleInterfaceSync> queryWrapper = QueryGenerator.initQueryWrapper(saleInterfaceSync, req.getParameterMap());
-		Page<SaleInterfaceSync> page = new Page<SaleInterfaceSync>(pageNo, pageSize);
-		IPage<SaleInterfaceSync> pageList = saleInterfaceSyncService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-
-	/**
-	 * 同步接口数据（获取网络数据）
-	 *
-	 * @param saleInterfaceSync
-	 * @return
-	 */
-	//@AutoLog(value = "询价单-接口同步表-同步接口数据")（获取网络数据）
-	@ApiOperation(value="询价单-接口同步表-获取网络数据", notes="询价单-接口同步表-获取网络数据")
-	@GetMapping(value = "/listSync")
-	public Result<String> listSync(SaleInterfaceSync saleInterfaceSync) throws Exception {
-
-		return this.saleInterfaceSyncService.getSyncData(saleInterfaceSync);
-	}
-
-	 /**
-	  *  同步订单 至 询价单
-	  *
-	  * @param ids
-	  * @return
-	  */
-	 @AutoLog(value = "询价单-接口同步表-同步订单至询价单")
-	 @ApiOperation(value="询价单-接口同步表-同步订单至询价单", notes="询价单-接口同步表-同步订单至询价单")
-	 @GetMapping(value = "/actionSyncOrder")
-	 public Result<String> actionSyncOrder(@RequestParam(name="ids",required=true) String ids) {
-		 return this.saleInterfaceSyncService.actionSyncOrder(Arrays.asList(ids.split(",")));
-
-	 }
-
-
-	 /**
-	  * 关闭
-	  *
-	  * @param ids
-	  * @return
-	  */
-	 @AutoLog(value = "接口同步表-关闭")
-	 @ApiOperation(value = "接口同步表-关闭", notes = "接口同步表-关闭")
-	 @GetMapping(value = "/submitClose")
-	 public Result<String> submitClose(@RequestParam(name = "ids", required = true) String ids,
-									   @RequestParam(name = "closeInfo", required = true) String closeInfo) {
-
-		 QueryWrapper<SaleInterfaceSync> queryWrapper = new QueryWrapper<>();
-		 queryWrapper.in("id", Arrays.asList(ids.split(",")));
-
-		 List<SaleInterfaceSync> list = saleInterfaceSyncService.list(queryWrapper);
-		 if (list.size() == 0) {
-			 return Result.error("数据为空！");
-		 }
-
-		 StringBuffer sb = new StringBuffer();
-		 for (SaleInterfaceSync o : list) {
-			 // 1-已关闭,0-未关闭
-			 Integer close = o.getClose();
-			 String code = o.getReferenceNumber();
-
-			 if (close != null && close.equals(1)) {
-				 sb.append("编号" + code).append("已关闭，请勿再次关闭；");
-				 continue;
-			 }
-		 }
-
-		 if (StringUtils.isNotBlank(sb.toString())) {
-
-			 return Result.error(sb.toString());
-		 }
-
-		 SaleInterfaceSync ent = new SaleInterfaceSync();
-		 ent.setClose(1);
-		 ent.setCloseInfo(closeInfo);
-		 saleInterfaceSyncService.update(ent, queryWrapper);
-
-		 return Result.OK("关闭成功！");
-	 }
-
-
-	 /**
-	  * 批量提交
-	  *
-	  * @param ids
-	  * @return
-	  */
-	 @AutoLog(value = "接口同步表-批量提交")
-	 @ApiOperation(value = "接口同步表-批量提交", notes = "接口同步表-批量提交")
-	 @GetMapping(value = "/submitBatch")
-	 public Result<String> submitBatch(@RequestParam(name = "ids", required = true) String ids) {
-
-		 QueryWrapper<SaleInterfaceSync> queryWrapper = new QueryWrapper<>();
-		 queryWrapper.in("id", Arrays.asList(ids.split(",")));
-
-		 List<SaleInterfaceSync> list = saleInterfaceSyncService.list(queryWrapper);
-		 if (list.size() == 0) {
-			 return Result.error("数据为空！");
-		 }
-
-		 StringBuffer sb = new StringBuffer();
-		 for (SaleInterfaceSync o : list) {
-			 // 1-已提交,0-未提交
-			 Integer submit = o.getSubmit();
-			 // 1-已关闭,0-未关闭
-			 Integer close = o.getClose();
-			 String code = o.getReferenceNumber();
-
-			 if (close != null && close.equals(1)) {
-				 sb.append("编号" + code).append("已关闭，无法提交；");
-				 continue;
-			 }
-			 if (submit != null && submit.equals(1)) {
-				 sb.append("编号" + code).append("已提交，请勿再次提交；");
-				 continue;
-			 }
-		 }
-
-		 if (StringUtils.isNotBlank(sb.toString())) {
-
-			 return Result.error(sb.toString());
-		 }
-
-		 SaleInterfaceSync ent = new SaleInterfaceSync();
-		 ent.setSubmit(1);
-		 saleInterfaceSyncService.update(ent, queryWrapper);
-
-		 return Result.OK("提交成功！");
-	 }
-
-	 /**
-	  * 批量取消提交
-	  *
-	  * @param ids
-	  * @return
-	  */
-	 @AutoLog(value = "接口同步表-批量取消提交")
-	 @ApiOperation(value = "接口同步表-批量取消提交", notes = "接口同步表-批量取消提交")
-	 @GetMapping(value = "/returnSubmitBatch")
-	 public Result<String> returnSubmitBatch(@RequestParam(name = "ids", required = true) String ids) {
-
-		 QueryWrapper<SaleInterfaceSync> queryWrapper = new QueryWrapper<>();
-		 queryWrapper.in("id", Arrays.asList(ids.split(",")));
-
-		 List<SaleInterfaceSync> list = saleInterfaceSyncService.list(queryWrapper);
-		 if (list.size() == 0) {
-			 return Result.error("数据为空！");
-		 }
-
-		 StringBuffer sb = new StringBuffer();
-		 for (SaleInterfaceSync o : list) {
-			 //提交(1-是 ，0-否)
-			 Integer submit = o.getSubmit();
-			 String code = o.getReferenceNumber();
-			 String syncCode = o.getSyncCode();
-
-			 if (submit == null || submit.equals(0)) {
-				 sb.append("单号" + code).append("已取消提交，请勿再次取消提交；");
-				 continue;
-			 }
-
-			 QueryWrapper<SaleInquiryForm> querySaleOrder = new QueryWrapper();
-			 querySaleOrder.eq("bill_code", syncCode);
-			 querySaleOrder.eq("del_flag", "0");
-
-			 List<SaleInquiryForm> listSaleOrder = saleInquiryFormService.list(querySaleOrder);
-			 if(listSaleOrder.size() > 0){
-
-				 sb.append("单号" + code).append("已被销售询价单使用，请先删除销售询价单"+syncCode+"；");
-				 continue;
-			 }
-		 }
-		 if (StringUtils.isNotBlank(sb.toString())) {
-
-			 return Result.error(sb.toString());
-		 }
-
-		 SaleInterfaceSync ent = new SaleInterfaceSync();
-		 ent.setSubmit(0);
-		 ent.setSync(0);
-		 saleInterfaceSyncService.update(ent, queryWrapper);
-
-		 return Result.OK("取消提交成功！");
-	 }
-
-	 /**
-	 *   添加
-	 *
-	 * @param saleInterfaceSyncPage
-	 * @return
-	 */
-	@AutoLog(value = "询价单-接口同步表-添加")
-	@ApiOperation(value="询价单-接口同步表-添加", notes="询价单-接口同步表-添加")
+        Page<SaleInterfaceSync> page = new Page<SaleInterfaceSync>(pageNo, pageSize);
+        IPage<SaleInterfaceSync> pageList = saleInterfaceSyncService.page(page, queryWrapper);
+
+        // 所有客户
+        List<String> idList = pageList.getRecords().stream()
+                .filter(Objects::nonNull)
+                .map(SaleInterfaceSync::getBuyerName)
+                .filter(id -> id != null && !id.isEmpty())
+                .collect(Collectors.toList());
+
+        List<SaleInterfaceSync> list = saleInterfaceSyncMapper.selectDeptName(null,idList);
+        for(SaleInterfaceSync o:pageList.getRecords()){
+            String buyerName = o.getBuyerName();
+            SaleInterfaceSync findProduct = list.stream().filter(e -> e.getCusName().equals(buyerName)).findFirst().orElse(null);
+            if(findProduct!=null){
+
+                o.setDeptNames(findProduct.getDeptNames());
+            }
+
+        }
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 同步接口数据（获取网络数据）
+     *
+     * @param saleInterfaceSync
+     * @return
+     */
+    //@AutoLog(value = "询价单-接口同步表-同步接口数据")（获取网络数据）
+    @ApiOperation(value = "询价单-接口同步表-获取网络数据", notes = "询价单-接口同步表-获取网络数据")
+    @GetMapping(value = "/listSync")
+    public Result<String> listSync(SaleInterfaceSync saleInterfaceSync) throws Exception {
+
+        return this.saleInterfaceSyncService.getSyncData(saleInterfaceSync);
+    }
+
+    /**
+     * 同步订单 至 询价单
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "询价单-接口同步表-同步订单至询价单")
+    @ApiOperation(value = "询价单-接口同步表-同步订单至询价单", notes = "询价单-接口同步表-同步订单至询价单")
+    @GetMapping(value = "/actionSyncOrder")
+    public Result<String> actionSyncOrder(@RequestParam(name = "ids", required = true) String ids) {
+        return this.saleInterfaceSyncService.actionSyncOrder(Arrays.asList(ids.split(",")));
+
+    }
+
+
+    /**
+     * 关闭
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "接口同步表-关闭")
+    @ApiOperation(value = "接口同步表-关闭", notes = "接口同步表-关闭")
+    @GetMapping(value = "/submitClose")
+    public Result<String> submitClose(@RequestParam(name = "ids", required = true) String ids,
+                                      @RequestParam(name = "closeInfo", required = true) String closeInfo) {
+
+        QueryWrapper<SaleInterfaceSync> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("id", Arrays.asList(ids.split(",")));
+
+        List<SaleInterfaceSync> list = saleInterfaceSyncService.list(queryWrapper);
+        if (list.size() == 0) {
+            return Result.error("数据为空！");
+        }
+
+        StringBuffer sb = new StringBuffer();
+        for (SaleInterfaceSync o : list) {
+            // 1-已关闭,0-未关闭
+            Integer close = o.getClose();
+            String code = o.getReferenceNumber();
+
+            if (close != null && close.equals(1)) {
+                sb.append("编号" + code).append("已关闭，请勿再次关闭；");
+                continue;
+            }
+        }
+
+        if (StringUtils.isNotBlank(sb.toString())) {
+
+            return Result.error(sb.toString());
+        }
+
+        SaleInterfaceSync ent = new SaleInterfaceSync();
+        ent.setClose(1);
+        ent.setCloseInfo(closeInfo);
+        saleInterfaceSyncService.update(ent, queryWrapper);
+
+        return Result.OK("关闭成功！");
+    }
+
+
+    /**
+     * 批量提交
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "接口同步表-批量提交")
+    @ApiOperation(value = "接口同步表-批量提交", notes = "接口同步表-批量提交")
+    @GetMapping(value = "/submitBatch")
+    public Result<String> submitBatch(@RequestParam(name = "ids", required = true) String ids) {
+
+        QueryWrapper<SaleInterfaceSync> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("id", Arrays.asList(ids.split(",")));
+
+        List<SaleInterfaceSync> list = saleInterfaceSyncService.list(queryWrapper);
+        if (list.size() == 0) {
+            return Result.error("数据为空！");
+        }
+
+        StringBuffer sb = new StringBuffer();
+        for (SaleInterfaceSync o : list) {
+            // 1-已提交,0-未提交
+            Integer submit = o.getSubmit();
+            // 1-已关闭,0-未关闭
+            Integer close = o.getClose();
+            String code = o.getReferenceNumber();
+
+            if (close != null && close.equals(1)) {
+                sb.append("编号" + code).append("已关闭，无法提交；");
+                continue;
+            }
+            if (submit != null && submit.equals(1)) {
+                sb.append("编号" + code).append("已提交，请勿再次提交；");
+                continue;
+            }
+        }
+
+        if (StringUtils.isNotBlank(sb.toString())) {
+
+            return Result.error(sb.toString());
+        }
+
+        SaleInterfaceSync ent = new SaleInterfaceSync();
+        ent.setSubmit(1);
+        saleInterfaceSyncService.update(ent, queryWrapper);
+
+        return Result.OK("提交成功！");
+    }
+
+    /**
+     * 批量取消提交
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "接口同步表-批量取消提交")
+    @ApiOperation(value = "接口同步表-批量取消提交", notes = "接口同步表-批量取消提交")
+    @GetMapping(value = "/returnSubmitBatch")
+    public Result<String> returnSubmitBatch(@RequestParam(name = "ids", required = true) String ids) {
+
+        QueryWrapper<SaleInterfaceSync> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("id", Arrays.asList(ids.split(",")));
+
+        List<SaleInterfaceSync> list = saleInterfaceSyncService.list(queryWrapper);
+        if (list.size() == 0) {
+            return Result.error("数据为空！");
+        }
+
+        StringBuffer sb = new StringBuffer();
+        for (SaleInterfaceSync o : list) {
+            //提交(1-是 ，0-否)
+            Integer submit = o.getSubmit();
+            String code = o.getReferenceNumber();
+            String syncCode = o.getSyncCode();
+
+            if (submit == null || submit.equals(0)) {
+                sb.append("单号" + code).append("已取消提交，请勿再次取消提交；");
+                continue;
+            }
+
+            QueryWrapper<SaleInquiryForm> querySaleOrder = new QueryWrapper();
+            querySaleOrder.eq("bill_code", syncCode);
+            querySaleOrder.eq("del_flag", "0");
+
+            List<SaleInquiryForm> listSaleOrder = saleInquiryFormService.list(querySaleOrder);
+            if (listSaleOrder.size() > 0) {
+
+                sb.append("单号" + code).append("已被销售询价单使用，请先删除销售询价单" + syncCode + "；");
+                continue;
+            }
+        }
+        if (StringUtils.isNotBlank(sb.toString())) {
+
+            return Result.error(sb.toString());
+        }
+
+        SaleInterfaceSync ent = new SaleInterfaceSync();
+        ent.setSubmit(0);
+        ent.setSync(0);
+        saleInterfaceSyncService.update(ent, queryWrapper);
+
+        return Result.OK("取消提交成功！");
+    }
+
+    /**
+     * 添加
+     *
+     * @param saleInterfaceSyncPage
+     * @return
+     */
+    @AutoLog(value = "询价单-接口同步表-添加")
+    @ApiOperation(value = "询价单-接口同步表-添加", notes = "询价单-接口同步表-添加")
     @RequiresPermissions("saleCode:sale_interface_sync:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody SaleInterfaceSyncPage saleInterfaceSyncPage) {
-		SaleInterfaceSync saleInterfaceSync = new SaleInterfaceSync();
-		BeanUtils.copyProperties(saleInterfaceSyncPage, saleInterfaceSync);
-		saleInterfaceSyncService.saveMain(saleInterfaceSync, saleInterfaceSyncPage.getSaleInterfaceItemList());
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param saleInterfaceSyncPage
-	 * @return
-	 */
-	@AutoLog(value = "询价单-接口同步表-编辑")
-	@ApiOperation(value="询价单-接口同步表-编辑", notes="询价单-接口同步表-编辑")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody SaleInterfaceSyncPage saleInterfaceSyncPage) {
+        SaleInterfaceSync saleInterfaceSync = new SaleInterfaceSync();
+        BeanUtils.copyProperties(saleInterfaceSyncPage, saleInterfaceSync);
+        saleInterfaceSyncService.saveMain(saleInterfaceSync, saleInterfaceSyncPage.getSaleInterfaceItemList());
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param saleInterfaceSyncPage
+     * @return
+     */
+    @AutoLog(value = "询价单-接口同步表-编辑")
+    @ApiOperation(value = "询价单-接口同步表-编辑", notes = "询价单-接口同步表-编辑")
     @RequiresPermissions("saleCode:sale_interface_sync:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody SaleInterfaceSyncPage saleInterfaceSyncPage) {
-		SaleInterfaceSync saleInterfaceSync = new SaleInterfaceSync();
-		BeanUtils.copyProperties(saleInterfaceSyncPage, saleInterfaceSync);
-		SaleInterfaceSync saleInterfaceSyncEntity = saleInterfaceSyncService.getById(saleInterfaceSync.getId());
-		if(saleInterfaceSyncEntity==null) {
-			return Result.error("未找到对应数据");
-		}
-		saleInterfaceSyncService.updateMain(saleInterfaceSync, saleInterfaceSyncPage.getSaleInterfaceItemList());
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "询价单-接口同步表-通过id删除")
-	@ApiOperation(value="询价单-接口同步表-通过id删除", notes="询价单-接口同步表-通过id删除")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody SaleInterfaceSyncPage saleInterfaceSyncPage) {
+        SaleInterfaceSync saleInterfaceSync = new SaleInterfaceSync();
+        BeanUtils.copyProperties(saleInterfaceSyncPage, saleInterfaceSync);
+        SaleInterfaceSync saleInterfaceSyncEntity = saleInterfaceSyncService.getById(saleInterfaceSync.getId());
+        if (saleInterfaceSyncEntity == null) {
+            return Result.error("未找到对应数据");
+        }
+        saleInterfaceSyncService.updateMain(saleInterfaceSync, saleInterfaceSyncPage.getSaleInterfaceItemList());
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "询价单-接口同步表-通过id删除")
+    @ApiOperation(value = "询价单-接口同步表-通过id删除", notes = "询价单-接口同步表-通过id删除")
     @RequiresPermissions("saleCode:sale_interface_sync:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		saleInterfaceSyncService.delMain(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "询价单-接口同步表-批量删除")
-	@ApiOperation(value="询价单-接口同步表-批量删除", notes="询价单-接口同步表-批量删除")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        saleInterfaceSyncService.delMain(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "询价单-接口同步表-批量删除")
+    @ApiOperation(value = "询价单-接口同步表-批量删除", notes = "询价单-接口同步表-批量删除")
     @RequiresPermissions("saleCode:sale_interface_sync:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.saleInterfaceSyncService.delBatchMain(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功！");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "询价单-接口同步表-通过id查询")
-	@ApiOperation(value="询价单-接口同步表-通过id查询", notes="询价单-接口同步表-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<SaleInterfaceSync> queryById(@RequestParam(name="id",required=true) String id) {
-		SaleInterfaceSync saleInterfaceSync = saleInterfaceSyncService.getById(id);
-		if(saleInterfaceSync==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(saleInterfaceSync);
-
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "询价单-接口同步-子表通过主表ID查询")
-	@ApiOperation(value="询价单-接口同步-子表主表ID查询", notes="询价单-接口同步-子表-通主表ID查询")
-	@GetMapping(value = "/querySaleInterfaceItemByMainId")
-	public Result<List<SaleInterfaceItem>> querySaleInterfaceItemListByMainId(@RequestParam(name="id",required=true) String id) {
-		List<SaleInterfaceItem> saleInterfaceItemList = saleInterfaceItemService.selectByMainId(id);
-		return Result.OK(saleInterfaceItemList);
-	}
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.saleInterfaceSyncService.delBatchMain(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功！");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "询价单-接口同步表-通过id查询")
+    @ApiOperation(value = "询价单-接口同步表-通过id查询", notes = "询价单-接口同步表-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<SaleInterfaceSync> queryById(@RequestParam(name = "id", required = true) String id) {
+        SaleInterfaceSync saleInterfaceSync = saleInterfaceSyncService.getById(id);
+        if (saleInterfaceSync == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(saleInterfaceSync);
+
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "询价单-接口同步-子表通过主表ID查询")
+    @ApiOperation(value = "询价单-接口同步-子表主表ID查询", notes = "询价单-接口同步-子表-通主表ID查询")
+    @GetMapping(value = "/querySaleInterfaceItemByMainId")
+    public Result<List<SaleInterfaceItem>> querySaleInterfaceItemListByMainId(@RequestParam(name = "id", required = true) String id) {
+        List<SaleInterfaceItem> saleInterfaceItemList = saleInterfaceItemService.selectByMainId(id);
+        return Result.OK(saleInterfaceItemList);
+    }
 
     /**
-    * 导出excel
-    *
-    * @param request
-    * @param saleInterfaceSync
-    */
+     * 导出excel
+     *
+     * @param request
+     * @param saleInterfaceSync
+     */
     @RequiresPermissions("saleCode:sale_interface_sync:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, SaleInterfaceSync saleInterfaceSync) {
-      // Step.1 组装查询条件查询数据
-      QueryWrapper<SaleInterfaceSync> queryWrapper = QueryGenerator.initQueryWrapper(saleInterfaceSync, request.getParameterMap());
-      LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
-      //配置选中数据查询条件
-      String selections = request.getParameter("selections");
-      if(oConvertUtils.isNotEmpty(selections)) {
-         List<String> selectionList = Arrays.asList(selections.split(","));
-         queryWrapper.in("id",selectionList);
-      }
-      //Step.2 获取导出数据
-      List<SaleInterfaceSync> saleInterfaceSyncList = saleInterfaceSyncService.list(queryWrapper);
-
-      // Step.3 组装pageList
-      List<SaleInterfaceSyncPage> pageList = new ArrayList<SaleInterfaceSyncPage>();
-      for (SaleInterfaceSync main : saleInterfaceSyncList) {
-          SaleInterfaceSyncPage vo = new SaleInterfaceSyncPage();
-          BeanUtils.copyProperties(main, vo);
-          List<SaleInterfaceItem> saleInterfaceItemList = saleInterfaceItemService.selectByMainId(main.getId());
-          vo.setSaleInterfaceItemList(saleInterfaceItemList);
-          pageList.add(vo);
-      }
-
-      // Step.4 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      mv.addObject(NormalExcelConstants.FILE_NAME, "询价单-接口同步表列表");
-      mv.addObject(NormalExcelConstants.CLASS, SaleInterfaceSyncPage.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("询价单-接口同步表数据", "导出人:"+sysUser.getRealname(), "询价单-接口同步表"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
+        // Step.1 组装查询条件查询数据
+        QueryWrapper<SaleInterfaceSync> queryWrapper = QueryGenerator.initQueryWrapper(saleInterfaceSync, request.getParameterMap());
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+        //配置选中数据查询条件
+        String selections = request.getParameter("selections");
+        if (oConvertUtils.isNotEmpty(selections)) {
+            List<String> selectionList = Arrays.asList(selections.split(","));
+            queryWrapper.in("id", selectionList);
+        }
+        //Step.2 获取导出数据
+        List<SaleInterfaceSync> saleInterfaceSyncList = saleInterfaceSyncService.list(queryWrapper);
+
+        // Step.3 组装pageList
+        List<SaleInterfaceSyncPage> pageList = new ArrayList<SaleInterfaceSyncPage>();
+        for (SaleInterfaceSync main : saleInterfaceSyncList) {
+            SaleInterfaceSyncPage vo = new SaleInterfaceSyncPage();
+            BeanUtils.copyProperties(main, vo);
+            List<SaleInterfaceItem> saleInterfaceItemList = saleInterfaceItemService.selectByMainId(main.getId());
+            vo.setSaleInterfaceItemList(saleInterfaceItemList);
+            pageList.add(vo);
+        }
+
+        // Step.4 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        mv.addObject(NormalExcelConstants.FILE_NAME, "询价单-接口同步表列表");
+        mv.addObject(NormalExcelConstants.CLASS, SaleInterfaceSyncPage.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("询价单-接口同步表数据", "导出人:" + sysUser.getRealname(), "询价单-接口同步表"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
     }
 
     /**
-    * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
     @RequiresPermissions("saleCode:sale_interface_sync:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          // 获取上传文件对象
-          MultipartFile file = entity.getValue();
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<SaleInterfaceSyncPage> list = ExcelImportUtil.importExcel(file.getInputStream(), SaleInterfaceSyncPage.class, params);
-              for (SaleInterfaceSyncPage page : list) {
-                  SaleInterfaceSync po = new SaleInterfaceSync();
-                  BeanUtils.copyProperties(page, po);
-                  saleInterfaceSyncService.saveMain(po, page.getSaleInterfaceItemList());
-              }
-              return Result.OK("文件导入成功！数据行数:" + list.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.OK("文件导入失败！");
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            // 获取上传文件对象
+            MultipartFile file = entity.getValue();
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<SaleInterfaceSyncPage> list = ExcelImportUtil.importExcel(file.getInputStream(), SaleInterfaceSyncPage.class, params);
+                for (SaleInterfaceSyncPage page : list) {
+                    SaleInterfaceSync po = new SaleInterfaceSync();
+                    BeanUtils.copyProperties(page, po);
+                    saleInterfaceSyncService.saveMain(po, page.getSaleInterfaceItemList());
+                }
+                return Result.OK("文件导入成功！数据行数:" + list.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.OK("文件导入失败！");
     }
 
 }

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleInterfaceSync.java

@@ -3,10 +3,8 @@ package org.jeecg.modules.saleCode.entity;
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
 import org.jeecg.common.constant.ProvinceCityArea;
 import org.jeecg.common.util.SpringContextUtils;
 import lombok.Data;
@@ -216,4 +214,14 @@ public class SaleInterfaceSync implements Serializable {
 	@Excel(name = "exported", width = 15)
     @ApiModelProperty(value = "exported")
     private String exported;
+
+	//临时字段
+	@TableField(exist = false)
+	private String cusCode;
+    @TableField(exist = false)
+	private String cusName;
+    @TableField(exist = false)
+	private String deptCode;
+    @TableField(exist = false)
+	private String deptNames;
 }

srm-module-code/src/main/java/org/jeecg/modules/saleCode/mapper/SaleInterfaceSyncMapper.java

@@ -14,4 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SaleInterfaceSyncMapper extends BaseMapper<SaleInterfaceSync> {
 
+    public List<SaleInterfaceSync>selectDeptName(@Param("cusCodeList") List<String> cusCodeList,
+                                                 @Param("cusNameList") List<String> cusNameList);
 }

srm-module-code/src/main/java/org/jeecg/modules/saleCode/mapper/xml/SaleInterfaceSyncMapper.xml

@@ -1,5 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.saleCode.mapper.SaleInterfaceSyncMapper">
+    <select id="selectDeptName" parameterType="java.lang.String" resultType="org.jeecg.modules.saleCode.entity.SaleInterfaceSync">
+
+        SELECT
+            sdi.cus_code,
+            sdi.cus_name,
+            sdi.dept_code,
+            (SELECT GROUP_CONCAT(d.depart_name SEPARATOR ',')
+             FROM sys_depart d
+             WHERE FIND_IN_SET(d.org_code, REPLACE(sdi.dept_code, ' ', '')) > 0) AS dept_names
+        FROM sale_dept_interface sdi
+        where 1=1
+        <if test="cusCodeList !=null and cusCodeList.size()>0">
+            and sdi.cus_code IN (
+            <foreach item="cusCode" collection="cusCodeList" separator=",">
+                #{cusCode}
+            </foreach>
+            )
+        </if>
+        <if test="cusNameList != null and cusNameList.size()>0">
+            and cus_name IN (
+            <foreach item="cusName" collection="cusNameList" separator=",">
+                #{cusName}
+            </foreach>
+            )
+        </if>
+    </select>
+
 
 </mapper>

srm-module-code/src/main/java/org/jeecg/modules/saleCode/util/HttpUtils.java

@@ -130,7 +130,7 @@ public class HttpUtils {
     public static void main(String[] args) throws Exception {
 //        String token = getAccessToken();
 //        System.out.println("======="+token);
-        String ACCESS_TOKEN="rc9DierDRsIUt7ZeDuG9VWF7bRlJ2eFp";
+        String ACCESS_TOKEN="vRUXIHnwl4rIuspHzVFrSO0PUPMoEaAy";
         JsonNode jsonNode = getDateListByUrl(ACCESS_TOKEN);
 ////        ObjectMapper mapper = new ObjectMapper();
 //////