nm-project
/
aiccs-api
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改主体表字段

This commit is contained in:
zhouxy 2025-12-31 10:42:28 +08:00
parent 161832bed6
commit 6ea83dce12
12 changed files with 94 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/chinaweal/aiccs/aiccs/abnormal/controller/EBaseinfoController.java
View File

@ -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;
/**
* <p>
* 前端控制器
@ -1251,4 +1250,11 @@ public class EBaseinfoController extends BaseController {
response.getWriter().write("导出失败：" + e.getMessage());
}
}
@ApiOperation(value = "5.分页查询市场主体基本信息", position = 5)
@PostMapping("/listEBaseinfo")
public RestResult<IPage<EBaseinfo>> listEBaseinfo(@RequestBody BaseQuery<EBaseinfo> query) {
IPage<EBaseinfo> data = eBaseinfoService.listEBaseinfo(query);
return RestResult.ok(data);
}
}

4
src/main/java/com/chinaweal/aiccs/aiccs/abnormal/entity/EBaseinfo.java
View File

@ -578,4 +578,8 @@ public class EBaseinfo extends Model<EBaseinfo> {
return this.pripid;
}
@ApiModelProperty("查询统一社会信用代码/注册码")
@TableField(exist = false)
private String searchUscc;
}

4
src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/EBaseinfoService.java
View File

@ -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<EBaseinfo> {
* @return 企业基本信息列表
*/
List<EBaseinfo> getEBaseinfoListWithPunInfo(String uscc, String entName);
IPage<EBaseinfo> listEBaseinfo(BaseQuery<EBaseinfo> query);
}

44
src/main/java/com/chinaweal/aiccs/aiccs/abnormal/service/impl/EBaseinfoServiceImpl.java
View File

@ -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<EBaseinfoMapper, EBase
public List<EBaseinfo> getEBaseinfoListWithPunInfo(String uscc, String entName) {
return baseMapper.selectEBaseinfoListWithPunInfo(uscc, entName);
}
@Override
public IPage<EBaseinfo> listEBaseinfo(BaseQuery<EBaseinfo> query) {
EBaseinfo entity = query.getEntity(EBaseinfo.class);
Page<EBaseinfo> 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<EBaseinfo> 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<TOrgUnits> 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<TOrgUnits> list = tOrgUnitsService.list(queryWrapper);
// if (list.size() > 0) {
// TOrgUnits tOrgunits = list.get(0);
// record.setLocaladmCn(tOrgunits.getOrgUnitName());
// }
// }
// });
}
return page;
}
}

3
src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/entity/TSSerIllegalList.java
View File

@ -320,7 +320,8 @@ public class TSSerIllegalList extends Model<TSSerIllegalList> {
/**
* 行政处罚id
*/
@TableField("caseId")
// @TableField("caseId")
@TableField(exist = false)
private String caseId;
@Override

8
src/main/java/com/chinaweal/aiccs/aiccs/susnate/entity/EFalPerInfo.java
View File

@ -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;
/**
* 姓名

8
src/main/java/com/chinaweal/aiccs/aiccs/susnate/entity/ENateOperRegDec.java
View File

@ -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;
/**

8
src/main/java/com/chinaweal/aiccs/aiccs/susnate/entity/ESusNateOperReg.java
View File

@ -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;
/**
* 冒名登记时间

4
src/main/java/com/chinaweal/aiccs/aiccs/susnate/service/impl/ESusNateOperRegServiceImpl.java
View File

@ -54,8 +54,8 @@ public class ESusNateOperRegServiceImpl extends ServiceImpl<ESusNateOperRegMappe
if (eSusNateVo.getDstate() == null) {
eSusNateVo.setDstate(dstate);
}
if (eSusNateVo.getPripId() == null) {
eSusNateVo.setPripId("");
if (eSusNateVo.getPripid() == null) {
eSusNateVo.setPripid("");
}
ESusNateOperReg eSusNateOperReg = new ESusNateOperReg();
ENateOperRegDec eNateOperRegDec = new ENateOperRegDec();

28
src/main/java/com/chinaweal/aiccs/aiccs/susnate/vo/ESusNateVo.java
View File

@ -46,25 +46,25 @@ public class ESusNateVo extends SuperEntity implements Serializable {
* 主体身份代码
*/
@ApiModelProperty(value = "主体身份代码")
private String pripId;
private String pripid;
/**
* 企业（机构）名称
*/
@ApiModelProperty(value = "企业（机构）名称")
private String entName;
private String entname;
/**
* 统一社会信用代码(CA91)
*/
@ApiModelProperty(value = "统一社会信用代码(CA91)")
private String uniscId;
private String uniscid;
/**
* 注册号
*/
@ApiModelProperty(value = "注册号")
private String regNo;
private String regno;
/**
* 姓名
@ -107,8 +107,8 @@ public class ESusNateVo extends SuperEntity implements Serializable {
* 作出决定日期
*/
@ApiModelProperty(value = "作出决定日期")
@JsonSerialize(using = LocalDateTimeStringSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
// @JsonSerialize(using = LocalDateTimeStringSerializer.class)
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date judDate;
/**
@ -133,16 +133,16 @@ public class ESusNateVo extends SuperEntity implements Serializable {
* 公告日期
*/
@ApiModelProperty(value = "公告日期")
@JsonSerialize(using = LocalDateTimeStringSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
// @JsonSerialize(using = LocalDateTimeStringSerializer.class)
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date noticeDate;
/**
* 冒名登记时间
*/
@ApiModelProperty(value = "冒名登记时间")
@JsonSerialize(using = LocalDateTimeStringSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
// @JsonSerialize(using = LocalDateTimeStringSerializer.class)
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date regTime;
/**
@ -167,16 +167,16 @@ public class ESusNateVo extends SuperEntity implements Serializable {
* 公告期自
*/
@ApiModelProperty(value = "公告期自")
@JsonSerialize(using = LocalDateTimeStringSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
// @JsonSerialize(using = LocalDateTimeStringSerializer.class)
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date noticeFrom;
/**
* 公告期至
*/
@ApiModelProperty(value = "公告期至")
@JsonSerialize(using = LocalDateTimeStringSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
// @JsonSerialize(using = LocalDateTimeStringSerializer.class)
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date noticeTo;
/**

3
src/main/java/com/chinaweal/aiccs/config/SafetyFilter.java
View File

@ -50,6 +50,7 @@ public class SafetyFilter implements Filter {
wxWhitelist.add("/test/FtyTest");
wxWhitelist.add("/test/hqlcusers");
wxWhitelist.add("/test/revokeCancel");
wxWhitelist.add("/user/captchadl");
urlRefererList.add("http://localhost");
urlRefererList.add("http://127.0.0.1");
@ -95,7 +96,7 @@ public class SafetyFilter implements Filter {
String contextPath = request.getContextPath();
String url = requestUri.substring(contextPath.length());
String referer = request.getHeader("Referer");
if (environment != null && StringUtils.equals(environment.getProperty("spring.profiles.active"), "dev")) {
if (environment != null && StringUtils.equals(environment.getProperty("spring.profiles.active"), "prod129")) {
chain.doFilter(request, response);
return;
}

4
src/main/resources/mybatis/mapper/aiccs/susnate/ESusNateOperRegMapper.xml
View File

@ -4,9 +4,9 @@
<select id="selectESusNateVoList" resultType="com.chinaweal.aiccs.aiccs.susnate.vo.ESusNateVo">
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,