From db7a56a7463a3a02e6a7b0a408857fbb33a229b6 Mon Sep 17 00:00:00 2001 From: zhouxy Date: Thu, 26 Feb 2026 20:43:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96=E5=B9=B4?= =?UTF-8?q?=E6=8A=A5=E4=BF=AE=E6=94=B9=E6=8E=88=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AnModifyPermitController.java | 94 +++++++++++++++++-- .../aiceps/annual/entity/AnModifyPermit.java | 35 +++++++ 2 files changed, 123 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/chinaweal/aiccs/aiceps/annual/controller/AnModifyPermitController.java b/src/main/java/com/chinaweal/aiccs/aiceps/annual/controller/AnModifyPermitController.java index e169322..91d27e7 100644 --- a/src/main/java/com/chinaweal/aiccs/aiceps/annual/controller/AnModifyPermitController.java +++ b/src/main/java/com/chinaweal/aiccs/aiceps/annual/controller/AnModifyPermitController.java @@ -1,10 +1,14 @@ package com.chinaweal.aiccs.aiceps.annual.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.chinaweal.aiccs.aiccs.abnormal.entity.EBaseinfo; +import com.chinaweal.aiccs.aiccs.abnormal.service.EBaseinfoService; import com.chinaweal.aiccs.aiceps.annual.entity.AnModifyPermit; import com.chinaweal.aiccs.aiceps.annual.service.AnModifyPermitService; import com.chinaweal.aiccs.common.base.controller.BaseController; import com.chinaweal.aiccs.common.util.StringUtils; +import com.chinaweal.aicorg.model.AICUser; import com.chinaweal.youfool.framework.springboot.mybatis.plus.page.PageRequestDto; import com.chinaweal.youfool.framework.springboot.rest.RestResult; import com.chinaweal.youfool.framework.springboot.rest.ResultCode; @@ -20,6 +24,7 @@ import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import java.io.Serializable; import java.time.LocalDateTime; +import java.util.List; import java.util.Map; /** @@ -34,20 +39,52 @@ import java.util.Map; @RestController @RequestMapping("/anModify") public class AnModifyPermitController extends BaseController { + @Autowired private AnModifyPermitService anModifyPermitService; + @Autowired + private EBaseinfoService eBaseinfoService; + @ApiOperation(value = "1.新增信息 ", position = 1) @ApiOperationSupport(order = 1) @PostMapping("/save") public RestResult savePermit(@RequestBody @Valid AnModifyPermit anModifyPermit, BindingResult bindingResult, HttpServletRequest request) { AssertUtils.isBndingValidit(bindingResult); - anModifyPermit.setCreateId(getLoginUser(request).getPrimaryKey()); - anModifyPermit.setUpdateId(getLoginUser(request).getPrimaryKey()); - anModifyPermit.setCreateTime(LocalDateTime.now()); - anModifyPermit.setUpdateTime(LocalDateTime.now()); - anModifyPermitService.save(anModifyPermit); - return RestResult.ok(anModifyPermit); + AICUser user = getLoginUser(request); + + // 根据uniscid查询企业主体信息 + if (StringUtils.isNotBlank(anModifyPermit.getUniscid())) { + // 先尝试通过统一社会信用代码查询 + List entList = eBaseinfoService.list(new LambdaQueryWrapper() + .eq(EBaseinfo::getUniscid, anModifyPermit.getUniscid())); + + // 如果没找到，再尝试通过注册号查询 + if (entList.isEmpty()) { + entList = eBaseinfoService.list(new LambdaQueryWrapper() + .eq(EBaseinfo::getRegno, anModifyPermit.getUniscid())); + } + + if (!entList.isEmpty()) { + EBaseinfo entBase = entList.get(0); // 取第一个匹配的结果 + // 填充企业信息到anModifyPermit对象中 + anModifyPermit.setRegno(entBase.getRegno()); // 注册号 + anModifyPermit.setRegorg(user.getRegionID()); // 登记机关 + anModifyPermit.setRegorgCn(user.getOrgName()); // 登记机关中文 + anModifyPermit.setPripid(entBase.getPripid()); // 企业主键 + anModifyPermit.setEntname(entBase.getEntname()); // 企业名称 + } else { + return RestResult.error(ResultCode.DATA_NONE, "未找到对应的企业主体信息"); + } + anModifyPermit.setCreateId(getLoginUser(request).getPrimaryKey()); + anModifyPermit.setUpdateId(getLoginUser(request).getPrimaryKey()); + anModifyPermit.setCreateTime(LocalDateTime.now()); + anModifyPermit.setUpdateTime(LocalDateTime.now()); + anModifyPermitService.save(anModifyPermit); + return RestResult.ok(anModifyPermit); + } else { + return RestResult.error(ResultCode.PARAM_IS_BLANK, "统一社会信用代码不能为空"); + } } @ApiOperation(value = "2.删除信息 ", position = 2) @@ -94,7 +131,52 @@ public class AnModifyPermitController extends BaseController { queryWrapper.lambda().eq(AnModifyPermit::getUniscid, uniscid); } }, null); + + // 对查询结果进行处理，补充缺失的entname和regorgcn字段 + if (data != null && data.getRecords() != null && !data.getRecords().isEmpty()) { + for (AnModifyPermit permit : data.getRecords()) { + // 如果entname或regorgcn为空，查询EBaseinfo补充信息 + if (StringUtils.isBlank(permit.getEntname()) || StringUtils.isBlank(permit.getRegorgCn())) { + if (StringUtils.isNotBlank(permit.getUniscid())) { + // 先尝试通过统一社会信用代码查询 + List entList = eBaseinfoService.list(new LambdaQueryWrapper() + .eq(EBaseinfo::getUniscid, permit.getUniscid())); + + // 如果没找到，再尝试通过注册号查询 + if (entList.isEmpty()) { + entList = eBaseinfoService.list(new LambdaQueryWrapper() + .eq(EBaseinfo::getRegno, permit.getUniscid())); + } + + if (!entList.isEmpty()) { + EBaseinfo entBase = entList.get(0); + // 补充缺失的字段 + if (StringUtils.isBlank(permit.getEntname())) { + permit.setEntname(entBase.getEntname()); + } + if (StringUtils.isBlank(permit.getRegorgCn())) { + permit.setRegorgCn(entBase.getRegorgCn()); + } + } + } + } + } + } + return RestResult.ok(data); } + @ApiOperation(value = "检查市场主体是否存在", position = 6) + @GetMapping("/checkEBaseInfo") + public RestResult checkEBaseInfo(@RequestParam @ApiParam("uniscid") Serializable uniscid) { + List list = eBaseinfoService.list(new LambdaQueryWrapper() + .eq(EBaseinfo::getUniscid, uniscid) + .or().eq(EBaseinfo::getRegno, uniscid)); + if(list.isEmpty()){ + return RestResult.error(ResultCode.DATA_NONE,"无法查询到该主体"); + } else { + return RestResult.ok(); + } + } + } diff --git a/src/main/java/com/chinaweal/aiccs/aiceps/annual/entity/AnModifyPermit.java b/src/main/java/com/chinaweal/aiccs/aiceps/annual/entity/AnModifyPermit.java index 6e3b716..51fdba3 100644 --- a/src/main/java/com/chinaweal/aiccs/aiceps/annual/entity/AnModifyPermit.java +++ b/src/main/java/com/chinaweal/aiccs/aiceps/annual/entity/AnModifyPermit.java @@ -47,6 +47,41 @@ public class AnModifyPermit implements Serializable { @TableField("ANCHEYEAR") private String ancheyear; + /** + * 主体名称 + */ + @ApiModelProperty("主体名称") + @TableField("ENTNAME") + private String entname; + + /** + * 操作人的机关码值 + */ + @ApiModelProperty("操作人的机关码值") + @TableField("REGORG") + private String regorg; + + /** + * 操作人的机关中文 + */ + @ApiModelProperty("操作人的机关中文") + @TableField("REGORGCN") + private String regorgCn; + + /** + * 注册号 + */ + @ApiModelProperty("注册号") + @TableField("REGNO") + private String regno; + + /** + * 企业主键 + */ + @ApiModelProperty("企业主键") + @TableField("PRIPID") + private String pripid; + /** * 开始时间 */