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 c6ac469..0000000 Binary files a/websoft-modules.log.2026-02-24.0.gz and /dev/null differ