From 6ea83dce12e5471e5c1794bf1de749f8bfaead3e Mon Sep 17 00:00:00 2001 From: zhouxy Date: Wed, 31 Dec 2025 10:42:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BB=E4=BD=93=E8=A1=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EBaseinfoController.java | 10 ++++- .../aiccs/abnormal/entity/EBaseinfo.java | 4 ++ .../abnormal/service/EBaseinfoService.java | 4 ++ .../service/impl/EBaseinfoServiceImpl.java | 44 +++++++++++++++++++ .../entity/TSSerIllegalList.java | 3 +- .../aiccs/susnate/entity/EFalPerInfo.java | 8 ++-- .../aiccs/susnate/entity/ENateOperRegDec.java | 8 ++-- .../aiccs/susnate/entity/ESusNateOperReg.java | 8 ++-- .../impl/ESusNateOperRegServiceImpl.java | 4 +- .../aiccs/aiccs/susnate/vo/ESusNateVo.java | 28 ++++++------ .../chinaweal/aiccs/config/SafetyFilter.java | 3 +- .../aiccs/susnate/ESusNateOperRegMapper.xml | 4 +- 12 files changed, 94 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java index d87796e..1a588ac 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java @@ -1,6 +1,5 @@ package com.chinaweal.aiccs.aiccs.abnormal.controller; - import cn.hutool.core.util.URLUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; @@ -47,6 +46,7 @@ import com.chinaweal.aiccs.org.service.TUsersService; import com.chinaweal.aicorg.model.AICUser; import com.chinaweal.solr.entity.EBaseInfoSolrBean; import com.chinaweal.solr.template.SolrSearchTemplate; +import com.chinaweal.youfool.framework.springboot.base.query.BaseQuery; import com.chinaweal.youfool.framework.springboot.exception.custom.BusinessException; import com.chinaweal.youfool.framework.springboot.mybatis.plus.page.PageRequestDto; import com.chinaweal.youfool.framework.springboot.rest.RestResult; @@ -77,7 +77,6 @@ import java.util.*; import static com.baomidou.mybatisplus.core.toolkit.Wrappers.lambdaQuery; - /** *

* 前端控制器 @@ -1251,4 +1250,11 @@ public class EBaseinfoController extends BaseController { response.getWriter().write("导出失败：" + e.getMessage()); } } + + @ApiOperation(value = "5.分页查询市场主体基本信息", position = 5) + @PostMapping("/listEBaseinfo") + public RestResult> listEBaseinfo(@RequestBody BaseQuery query) { + IPage data = eBaseinfoService.listEBaseinfo(query); + return RestResult.ok(data); + } } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java index 84f70a1..75be46c 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java @@ -578,4 +578,8 @@ public class EBaseinfo extends Model { return this.pripid; } + + @ApiModelProperty("查询统一社会信用代码/注册码") + @TableField(exist = false) + private String searchUscc; } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/EBaseinfoService.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/EBaseinfoService.java index 95ce4b2..b5a7c80 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/EBaseinfoService.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/EBaseinfoService.java @@ -12,6 +12,7 @@ import com.chinaweal.aiccs.aiccs.market.entity.AreaSlice; import com.chinaweal.aiccs.crgs.moveinDetails.entity.EAlterRecoder; import com.chinaweal.aicorg.model.AICUser; import com.chinaweal.solr.entity.EBaseInfoSolrBean; +import com.chinaweal.youfool.framework.springboot.base.query.BaseQuery; import com.chinaweal.youfool.framework.springboot.mybatis.plus.BaseService; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -217,4 +218,7 @@ public interface EBaseinfoService extends BaseService { * @return 企业基本信息列表 */ List getEBaseinfoListWithPunInfo(String uscc, String entName); + + IPage listEBaseinfo(BaseQuery query); + } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java index a3fb4c7..bb573da 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -53,6 +54,7 @@ import com.chinaweal.aicorg.model.AICUser; import com.chinaweal.aicorg.services.OrgUM; import com.chinaweal.solr.entity.EBaseInfoSolrBean; import com.chinaweal.solr.template.SolrSearchTemplate; +import com.chinaweal.youfool.framework.springboot.base.query.BaseQuery; import com.chinaweal.youfool.framework.springboot.exception.custom.BusinessException; import com.chinaweal.youfool.framework.springboot.mybatis.plus.BaseServiceImpl; import com.chinaweal.youfool.framework.springboot.rest.ResultCode; @@ -1594,4 +1596,46 @@ public class EBaseinfoServiceImpl extends BaseServiceImpl getEBaseinfoListWithPunInfo(String uscc, String entName) { return baseMapper.selectEBaseinfoListWithPunInfo(uscc, entName); } + + @Override + public IPage listEBaseinfo(BaseQuery query) { + EBaseinfo entity = query.getEntity(EBaseinfo.class); + Page page = query.getPage(); + + String uniscId = entity.getUniscid(); + String entName = entity.getEntname(); + String searchUscc = entity.getSearchUscc(); + //输入了条件才会查询 + if(com.chinaweal.aiccs.common.util.StringUtils.isNotEmpty(uniscId) + || com.chinaweal.aiccs.common.util.StringUtils.isNotEmpty(entName) + || com.chinaweal.aiccs.common.util.StringUtils.isNotEmpty(searchUscc)){ + LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(); + if(com.chinaweal.aiccs.common.util.StringUtils.isNotEmpty(uniscId)) + lambdaQueryWrapper.eq(EBaseinfo::getUniscid, uniscId); + if(com.chinaweal.aiccs.common.util.StringUtils.isNotEmpty(entName)) + lambdaQueryWrapper.eq(EBaseinfo::getEntname, entName); + page = page(page, lambdaQueryWrapper); + if(com.chinaweal.aiccs.common.util.StringUtils.isNotEmpty(searchUscc)) + lambdaQueryWrapper.eq(EBaseinfo::getUniscid, searchUscc) + .or().eq(EBaseinfo::getRegno, searchUscc); + page = page(page, lambdaQueryWrapper); + +// page.getRecords().forEach(record -> { +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// //查属地机关中文 +// String supervisedeptid = record.getSupervisedeptid(); +// if(com.chinaweal.aiccs.common.util.StringUtils.isNotEmpty(supervisedeptid)){ +// queryWrapper.lambda().eq(TOrgUnits::getOrgNumber, supervisedeptid.length() == 6 ? supervisedeptid + "000" : supervisedeptid) +// .eq(TOrgUnits::getDeleted, '0'); +// List list = tOrgUnitsService.list(queryWrapper); +// if (list.size() > 0) { +// TOrgUnits tOrgunits = list.get(0); +// record.setLocaladmCn(tOrgunits.getOrgUnitName()); +// } +// } +// }); + } + + return page; + } } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/entity/TSSerIllegalList.java b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/entity/TSSerIllegalList.java index 55afdf0..47b0b1d 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/entity/TSSerIllegalList.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/entity/TSSerIllegalList.java @@ -320,7 +320,8 @@ public class TSSerIllegalList extends Model { /** * 行政处罚id */ - @TableField("caseId") +// @TableField("caseId") + @TableField(exist = false) private String caseId; @Override diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/susnate/entity/EFalPerInfo.java b/src/main/java/com/chinaweal/aiccs/aiccs/susnate/entity/EFalPerInfo.java index 2ad1e0a..c1755bb 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/susnate/entity/EFalPerInfo.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/susnate/entity/EFalPerInfo.java @@ -41,28 +41,28 @@ public class EFalPerInfo extends SuperEntity implements Serializable { */ @ApiModelProperty(value = "主体身份代码") @TableField(value = "PRIPID") - private String pripId; + private String pripid; /** * 企业（机构）名称 */ @ApiModelProperty(value = "企业（机构）名称") @TableField(value = "ENTNAME") - private String entName; + private String entname; /** * 统一社会信用代码(CA91) */ @ApiModelProperty(value = "统一社会信用代码(CA91)") @TableField(value = "UNISCID") - private String uniscId; + private String uniscid; /** * 注册号 */ @ApiModelProperty(value = "注册号") @TableField(value = "REGNO") - private String regNo; + private String regno; /** * 姓名 diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/susnate/entity/ENateOperRegDec.java b/src/main/java/com/chinaweal/aiccs/aiccs/susnate/entity/ENateOperRegDec.java index 38d0052..55b55ad 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/susnate/entity/ENateOperRegDec.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/susnate/entity/ENateOperRegDec.java @@ -41,28 +41,28 @@ public class ENateOperRegDec extends SuperEntity implements Serializable { */ @ApiModelProperty(value = "主体身份代码(CA14)") @TableField(value = "PRIPID") - private String pripId; + private String pripid; /** * 市场主体名称 */ @ApiModelProperty(value = "市场主体名称") @TableField(value = "ENTNAME") - private String entName; + private String entname; /** * 统一社会信用代码(CA91) */ @ApiModelProperty(value = "统一社会信用代码(CA91)") @TableField(value = "UNISCID") - private String uniscId; + private String uniscid; /** * 注册号 */ @ApiModelProperty(value = "注册号") @TableField(value = "REGNO") - private String regNo; + private String regno; /** diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/susnate/entity/ESusNateOperReg.java b/src/main/java/com/chinaweal/aiccs/aiccs/susnate/entity/ESusNateOperReg.java index 5ca6627..afb52aa 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/susnate/entity/ESusNateOperReg.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/susnate/entity/ESusNateOperReg.java @@ -41,28 +41,28 @@ public class ESusNateOperReg extends SuperEntity implements Serializable { */ @ApiModelProperty(value = "主体身份代码(CA14)") @TableField(value = "PRIPID") - private String pripId; + private String pripid; /** * 市场主体名称 */ @ApiModelProperty(value = "市场主体名称") @TableField(value = "ENTNAME") - private String entName; + private String entname; /** * 统一社会信用代码(CA91) */ @ApiModelProperty(value = "统一社会信用代码(CA91)") @TableField(value = "UNISCID") - private String uniscId; + private String uniscid; /** * 注册号 */ @ApiModelProperty(value = "注册号") @TableField(value = "REGNO") - private String regNo; + private String regno; /** * 冒名登记时间 diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/susnate/service/impl/ESusNateOperRegServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/susnate/service/impl/ESusNateOperRegServiceImpl.java index 1f74e05..28a12c6 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/susnate/service/impl/ESusNateOperRegServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/susnate/service/impl/ESusNateOperRegServiceImpl.java @@ -54,8 +54,8 @@ public class ESusNateOperRegServiceImpl extends ServiceImpl select - eso.PERSONATEID personateId, eso.REGORG regOrg, eso.REGORG_CN regOrgCn, eso.PRIPID pripId, + eso.PERSONATEID personateId, eso.REGORG regOrg, eso.REGORG_CN regOrgCn, eso.PRIPID pripid, eso.JUDAUTH judAuth, eso.JUDAUTH_CN judAuthCn, eso.HANDLREA handlRea, eso.HANDLREACN handlReaCn, - eso.UNISCID, eso.REGNO regNo, eso.ENTNAME entName, eso.NAME name, eso.TEL tel, + eso.UNISCID uniscid, eso.REGNO regno, eso.ENTNAME entname, eso.NAME name, eso.TEL tel, eso.NOTICEFROM noticeFrom, eso.NOTICETO noticeTo, eso.JUDDATE judDate, eso.REGITEM regItem, eso.REGTIME regTime, eso.HANDLREST handlRest, eso.dstate dstate, efi.FALPERID falperId , efi.NAME resName, efi.CERTYPE cerType, efi.CERNO cerNo,