查询工商登记开业信息
This commit is contained in:
parent
90c2e14fd1
commit
f1bc56ddf9
|
|
@ -17,6 +17,7 @@ import com.kakarote.crm.constant.CrmEnum;
|
|||
import com.kakarote.crm.entity.BO.CrmCustomerPoolBO;
|
||||
import com.kakarote.crm.entity.BO.CrmSearchBO;
|
||||
import com.kakarote.crm.entity.BO.UploadExcelBO;
|
||||
import com.kakarote.crm.entity.DTO.CrmQueryGsdjxxDTO;
|
||||
import com.kakarote.crm.entity.PO.CrmCustomerPool;
|
||||
import com.kakarote.crm.entity.PO.CrmCustomerPoolFieldSort;
|
||||
import com.kakarote.crm.entity.VO.CrmCustomerPoolVO;
|
||||
|
|
@ -24,6 +25,7 @@ import com.kakarote.crm.entity.VO.CrmModelFiledVO;
|
|||
import com.kakarote.crm.service.CrmUploadExcelService;
|
||||
import com.kakarote.crm.service.ICrmCustomerPoolService;
|
||||
import com.kakarote.crm.service.ICrmCustomerService;
|
||||
import com.kakarote.crm.service.ICrmGsdjxxService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
|
@ -33,6 +35,8 @@ import org.springframework.web.multipart.MultipartFile;
|
|||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.IOException;
|
||||
import java.time.LocalDate;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
|
@ -60,9 +64,23 @@ public class CrmCustomerPoolController {
|
|||
@Autowired
|
||||
private CrmUploadExcelService uploadExcelService;
|
||||
|
||||
@Autowired
|
||||
private ICrmGsdjxxService crmGsdjxxService;
|
||||
|
||||
@ApiOperation("查看公海列表页")
|
||||
@PostMapping("/queryPageList")
|
||||
public Result<BasePage<Map<String, Object>>> queryPageList(@RequestBody CrmSearchBO crmSearchBO) {
|
||||
if (crmSearchBO.getPoolId() == 34557) {
|
||||
// 获取当前日期
|
||||
LocalDate currentDate = LocalDate.now();
|
||||
// 定义日期格式
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
||||
// 格式化日期
|
||||
String rq = currentDate.format(formatter);
|
||||
CrmQueryGsdjxxDTO dto = new CrmQueryGsdjxxDTO().setRq(rq);
|
||||
BasePage<Map<String, Object>> mapBasePage = crmGsdjxxService.queryGsdjxxByDate(dto);
|
||||
return Result.ok(mapBasePage);
|
||||
}
|
||||
BasePage<Map<String, Object>> basePage = crmCustomerPoolService.queryPageList(crmSearchBO,false);
|
||||
return Result.ok(basePage);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public class CrmGsdjxxController {
|
|||
return R.ok(crmGsdjxxList);
|
||||
}
|
||||
|
||||
@PostMapping("/queryGsdjxxByDate/{date}")
|
||||
@PostMapping("/queryGsdjxxByDate")
|
||||
@ApiOperation("根据日期查询(默认是当天)")
|
||||
public Result<BasePage<Map<String, Object>>> queryGsdjxxByDate(@RequestBody CrmQueryGsdjxxDTO crmQueryGsdjxxDTO) {
|
||||
BasePage<Map<String, Object>> basePage = iCrmGsdjxxService.queryGsdjxxByDate(crmQueryGsdjxxDTO);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.kakarote.crm.service.impl;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.log.Log;
|
||||
import cn.hutool.log.LogFactory;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
|
|
@ -160,20 +161,34 @@ public class CrmGsdjxxServiceImpl extends BaseServiceImpl<CrmGsdjxxMapper,CrmGsd
|
|||
@Override
|
||||
public BasePage<Map<String, Object>> queryGsdjxxByDate(CrmQueryGsdjxxDTO crmQueryGsdjxxDTO) {
|
||||
|
||||
|
||||
//通过行政区划代码回去
|
||||
List<String> xzqhCjListByCode = xzqhService.getXzqhCjListByCode(crmQueryGsdjxxDTO.getXzqhDm());
|
||||
|
||||
List<String> values = new ArrayList<>();
|
||||
values.add(crmQueryGsdjxxDTO.getRq());
|
||||
|
||||
CrmSearchBO.Search search = new CrmSearchBO.Search();
|
||||
search.setFormType("text");
|
||||
search.setName("website");
|
||||
search.setValues(values);
|
||||
search.setSearchEnum(CrmSearchBO.FieldSearchEnum.IS);
|
||||
|
||||
List<String> xzqhMc = xzqhService.getXzqhCjListByCode(crmQueryGsdjxxDTO.getXzqhDm());
|
||||
List<CrmSearchBO.Search> searchList = new ArrayList<>();
|
||||
searchList.add(search);
|
||||
if (StrUtil.isNotEmpty(crmQueryGsdjxxDTO.getRq())){
|
||||
CrmSearchBO.Search search = new CrmSearchBO.Search();
|
||||
List<String> values = new ArrayList<>();
|
||||
values.add(crmQueryGsdjxxDTO.getRq());
|
||||
search.setFormType("text");
|
||||
search.setName("website");
|
||||
search.setValues(values);
|
||||
search.setSearchEnum(CrmSearchBO.FieldSearchEnum.IS);
|
||||
searchList.add(search);
|
||||
}
|
||||
//fieldZzmdcm
|
||||
if (StrUtil.isNotEmpty(crmQueryGsdjxxDTO.getXzqhDm())){
|
||||
CrmSearchBO.Search search = new CrmSearchBO.Search();
|
||||
List<String> values = new ArrayList<>();
|
||||
values.add(crmQueryGsdjxxDTO.getRq());
|
||||
search.setFormType("text");
|
||||
search.setName("fieldZzmdcm");
|
||||
search.setValues(xzqhMc);
|
||||
search.setSearchEnum(CrmSearchBO.FieldSearchEnum.IS);
|
||||
searchList.add(search);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
CrmSearchBO searchBO = new CrmSearchBO();
|
||||
searchBO.setPoolId(34557);
|
||||
|
|
|
|||
|
|
@ -335,7 +335,7 @@ public class XzqhServiceImpl implements IXzqhService {
|
|||
// 如果查询到当前区域但没有其他数据,只返回当前区域的xzqhCj
|
||||
Xzqh xzqh = currentList.get(0);
|
||||
if (xzqh.getXzqhCj() != null && !xzqh.getXzqhCj().isEmpty()) {
|
||||
resultList.add(xzqh.getXzqhCj());
|
||||
resultList.add(xzqh.getXzqhmc());
|
||||
}
|
||||
return resultList;
|
||||
}
|
||||
|
|
@ -373,7 +373,7 @@ public class XzqhServiceImpl implements IXzqhService {
|
|||
Map<String, List<Xzqh>> parentChildMap, Map<String, Xzqh> codeToXzqhMap) {
|
||||
// 添加当前区域的xzqhCj
|
||||
if (currentXzqh != null && currentXzqh.getXzqhCj() != null && !currentXzqh.getXzqhCj().isEmpty()) {
|
||||
resultList.add(currentXzqh.getXzqhCj());
|
||||
resultList.add(currentXzqh.getXzqhmc());
|
||||
}
|
||||
|
||||
// 递归处理所有子区域
|
||||
|
|
|
|||
Loading…
Reference in New Issue