From 5fd87bbb1cc717ca3bcd6c36589f59b0d798eb1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Mon, 2 Mar 2026 14:47:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(credit):=20=E6=9B=B4=E6=96=B0=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E4=BF=A1=E7=94=A8=E6=A8=A1=E5=9D=97=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=92=8C=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改 application-ysb2.yml 配置文件注释从生产环境改为服务器配置 - 更新 CreditCourtAnnouncement 实体中 plaintiffAppellant 字段描述为原告/上诉人 - 调整 CreditCourtAnnouncementImportParam 中 Excel 注解字段名称和别名配置 - 在 CreditNearbyCompanyController 中添加多个公司信息字段映射包括纳税人识别号、注册号等 - 扩展 CreditNearbyCompanyImportParam 类增加数十个公司相关字段和 Schema 注解 - 移除无用的日志文件 websoft-modules.log.2026-02-24.0.gz --- .../CreditNearbyCompanyController.java | 20 +++ .../entity/CreditCourtAnnouncement.java | 2 +- .../CreditCourtAnnouncementImportParam.java | 6 +- .../param/CreditNearbyCompanyImportParam.java | 117 +++++++++++++----- src/main/resources/application-ysb2.yml | 2 +- websoft-modules.log.2026-02-24.0.gz | Bin 3926 -> 0 bytes 6 files changed, 114 insertions(+), 33 deletions(-) delete mode 100644 websoft-modules.log.2026-02-24.0.gz diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditNearbyCompanyController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditNearbyCompanyController.java index 3144860..ff0a427 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditNearbyCompanyController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditNearbyCompanyController.java @@ -427,7 +427,27 @@ public class CreditNearbyCompanyController extends BaseController { entity.setProvince(param.getProvince()); entity.setCity(param.getCity()); entity.setRegion(param.getRegion()); + entity.setTaxpayerCode(param.getTaxpayerCode()); + entity.setRegistrationNumber(param.getRegistrationNumber()); + entity.setOrganizationalCode(param.getOrganizationalCode()); + entity.setNumberOfInsuredPersons(param.getNumberOfInsuredPersons()); + entity.setAnnualReport(param.getAnnualReport()); entity.setDomain(param.getDomain()); + entity.setBusinessTerm(param.getBusinessTerm()); + entity.setNationalStandardIndustryCategories(param.getNationalStandardIndustryCategories()); + entity.setNationalStandardIndustryCategories2(param.getNationalStandardIndustryCategories2()); + entity.setNationalStandardIndustryCategories3(param.getNationalStandardIndustryCategories3()); + entity.setNationalStandardIndustryCategories4(param.getNationalStandardIndustryCategories4()); + entity.setFormerName(param.getFormerName()); + entity.setEnglishName(param.getEnglishName()); + entity.setMailingAddress(param.getMailingAddress()); + entity.setMailingEmail(param.getMailingEmail()); + entity.setTel(param.getTel()); + entity.setNationalStandardIndustryCategories5(param.getNationalStandardIndustryCategories5()); + entity.setNationalStandardIndustryCategories6(param.getNationalStandardIndustryCategories6()); + entity.setNationalStandardIndustryCategories7(param.getNationalStandardIndustryCategories7()); + entity.setNationalStandardIndustryCategories8(param.getNationalStandardIndustryCategories8()); + entity.setType(param.getType()); entity.setInstitutionType(param.getInstitutionType()); entity.setCompanySize(param.getCompanySize()); entity.setRegistrationAuthority(param.getRegistrationAuthority()); diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditCourtAnnouncement.java b/src/main/java/com/gxwebsoft/credit/entity/CreditCourtAnnouncement.java index 1f42e78..98ca4d9 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditCourtAnnouncement.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditCourtAnnouncement.java @@ -42,7 +42,7 @@ public class CreditCourtAnnouncement implements Serializable { @Schema(description = "公告类型") private String dataType; - @Schema(description = "公告人") + @Schema(description = "原告/上诉人") private String plaintiffAppellant; @Schema(description = "刊登日期") diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditCourtAnnouncementImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditCourtAnnouncementImportParam.java index 6580b95..42362b9 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditCourtAnnouncementImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditCourtAnnouncementImportParam.java @@ -31,10 +31,10 @@ public class CreditCourtAnnouncementImportParam implements Serializable { @Excel(name = "数据类型") private String dataType2; - @Excel(name = "公告人") + @Excel(name = "原告/上诉人") private String plaintiffAppellant; - @Excel(name = "原告/上诉人") + @Excel(name = "原告/上诉人2") private String plaintiffAppellant2; @Excel(name = "被告/被上诉人") @@ -47,7 +47,7 @@ public class CreditCourtAnnouncementImportParam implements Serializable { private String involvedAmount2; @Excel(name = "法院") - @ExcelHeaderAlias({"公告人","执行法院","法院"}) + @ExcelHeaderAlias({"公告人","执行法院"}) private String courtName; @Excel(name = "数据状态") diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditNearbyCompanyImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditNearbyCompanyImportParam.java index e592f93..7165259 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditNearbyCompanyImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditNearbyCompanyImportParam.java @@ -1,6 +1,7 @@ package com.gxwebsoft.credit.param; import cn.afterturn.easypoi.excel.annotation.Excel; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -51,42 +52,102 @@ public class CreditNearbyCompanyImportParam implements Serializable { @Excel(name = "所属区县") private String region; + @Excel(name = "纳税人识别号") + private String taxpayerCode; + + @Schema(name = "注册号") + private String registrationNumber; + + @Schema(name = "组织机构代码") + private String organizationalCode; + + @Schema(name = "参保人数") + private String numberOfInsuredPersons; + + @Schema(name = "参保人数所属年报") + private String annualReport; + + @Schema(name = "营业期限") + private String businessTerm; + + @Schema(name = "国标行业门类") + private String nationalStandardIndustryCategories; + + @Schema(name = "国标行业大类") + private String nationalStandardIndustryCategories2; + + @Schema(name = "国标行业中类") + private String nationalStandardIndustryCategories3; + + @Schema(name = "国标行业小类") + private String nationalStandardIndustryCategories4; + + @Schema(name = "曾用名") + private String formerName; + + @Schema(name = "英文名") + private String englishName; + @Excel(name = "官网网址") private String domain; - @Excel(name = "企业（机构）类型") + @Schema(name = "通信地址") + private String mailingAddress; + + @Schema(name = "通信地址邮箱") + private String mailingEmail; + + @Schema(name = "电话") + private String tel; + + @Schema(name = "企查查行业门类") + private String nationalStandardIndustryCategories5; + + @Schema(name = "企查查行业大类") + private String nationalStandardIndustryCategories6; + + @Schema(name = "企查查行业中类") + private String nationalStandardIndustryCategories7; + + @Schema(name = "企查查行业小类") + private String nationalStandardIndustryCategories8; + + @Schema(name = "类型") + private Integer type; + + @Schema(name = "登记机关") + private String registrationAuthority; + + @Schema(name = "纳税人资质") + private String taxpayerQualification; + + @Schema(name = "最新年报年份") + private String latestAnnualReportYear; + + @Schema(name = "最新年报营业收入") + private String latestAnnualReportOnOperatingRevenue; + + @Schema(name = "企查分") + private String enterpriseScoreCheck; + + @Schema(name = "信用等级") + private String creditRating; + + @Schema(name = "科创分") + private String cechnologyScore; + + @Schema(name = "科创等级") + private String cechnologyLevel; + + @Schema(name = "是否小微企业") + private String smallEnterprise; + + @Schema(name = "企业（机构）类型") private String institutionType; @Excel(name = "企业规模") private String companySize; - @Excel(name = "登记机关") - private String registrationAuthority; - - @Excel(name = "纳税人资质") - private String taxpayerQualification; - - @Excel(name = "最新年报年份") - private String latestAnnualReportYear; - - @Excel(name = "最新年报营业收入") - private String latestAnnualReportOnOperatingRevenue; - - @Excel(name = "企查分") - private String enterpriseScoreCheck; - - @Excel(name = "信用等级") - private String creditRating; - - @Excel(name = "科创分") - private String cechnologyScore; - - @Excel(name = "科创等级") - private String cechnologyLevel; - - @Excel(name = "是否小微企业") - private String smallEnterprise; - @Excel(name = "企业简介") private String companyProfile; diff --git a/src/main/resources/application-ysb2.yml b/src/main/resources/application-ysb2.yml index e424b10..689ecf7 100644 --- a/src/main/resources/application-ysb2.yml +++ b/src/main/resources/application-ysb2.yml @@ -1,4 +1,4 @@ -# 生产环境配置 +# 服务器配置 server: port: 9200 diff --git a/websoft-modules.log.2026-02-24.0.gz b/websoft-modules.log.2026-02-24.0.gz deleted file mode 100644 index c6ac469f944460a3129689552935d083e13a1032..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3926 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 b&XHXERW^rBSNh1=>UF{U@g;r>q8tAM0z0Kz