From e38a906f695ffee53dabc43024e49b69675b6228 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 11 Sep 2024 14:15:50 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=A7=94=E5=91=98=E4=BC=9A=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../committee/entity/PayCommitteeInfo.java    | 31 ++++++++++++++
 .../entity/PayCommitteeMemberInfo.java        | 41 +++++++++++++++++++
 .../PayCommitteeMemberInfoService.java        |  2 +-
 3 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/committee/entity/PayCommitteeInfo.java b/jero-boot-incoming-payment/src/main/java/com/jero/committee/entity/PayCommitteeInfo.java
index b7cfe098..afadaa42 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/committee/entity/PayCommitteeInfo.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/committee/entity/PayCommitteeInfo.java
@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**
@@ -37,6 +38,7 @@ public class PayCommitteeInfo {
      * 联系人
      */
     @TableField(value = "contacts")
+    @Excel(name = "联系人")
     @ApiModelProperty(value = "联系人")
     private String contacts;
 
@@ -44,6 +46,7 @@ public class PayCommitteeInfo {
      * Email
      */
     @TableField(value = "email")
+    @Excel(name = "Email")
     @ApiModelProperty(value = "Email")
     private String email;
 
@@ -51,6 +54,7 @@ public class PayCommitteeInfo {
      * 成立年代
      */
     @TableField(value = "establishment_year")
+    @Excel(name = "成立年代")
     @ApiModelProperty(value = "成立年代")
     private String establishmentYear;
 
@@ -58,6 +62,7 @@ public class PayCommitteeInfo {
      * 电话
      */
     @TableField(value = "telephone")
+    @Excel(name = "电话")
     @ApiModelProperty(value = "电话")
     private String telephone;
 
@@ -65,6 +70,7 @@ public class PayCommitteeInfo {
      * 秘书处所在单位
      */
     @TableField(value = "the_unit_to_which_one_belongs")
+    @Excel(name = "秘书处所在单位")
     @ApiModelProperty(value = "秘书处所在单位")
     private String theUnitToWhichOneBelongs;
 
@@ -74,6 +80,7 @@ public class PayCommitteeInfo {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @TableField(value = "approval_time_for_this_session")
+    @Excel(name = "本届批准时间",format = "yyyy-MM-dd")
     @ApiModelProperty(value = "本届批准时间")
     private Date approvalTimeForThisSession;
 
@@ -81,6 +88,7 @@ public class PayCommitteeInfo {
      * 技术组织类型
      */
     @TableField(value = "technical_organization_type")
+    @Excel(name = "技术组织类型")
     @ApiModelProperty(value = "技术组织类型")
     private String technicalOrganizationType;
 
@@ -88,6 +96,7 @@ public class PayCommitteeInfo {
      * 联系人Email
      */
     @TableField(value = "contact_email")
+    @Excel(name = "联系人Email")
     @ApiModelProperty(value = "联系人Email")
     private String contactEmail;
 
@@ -95,6 +104,7 @@ public class PayCommitteeInfo {
      * 委员会编号
      */
     @TableField(value = "committee_number")
+    @Excel(name = "委员会编号")
     @ApiModelProperty(value = "委员会编号")
     private String committeeNumber;
 
@@ -102,6 +112,7 @@ public class PayCommitteeInfo {
      * 秘书处所在省
      */
     @TableField(value = "province")
+    @Excel(name = "秘书处所在省")
     @ApiModelProperty(value = "秘书处所在省")
     private String province;
 
@@ -111,6 +122,7 @@ public class PayCommitteeInfo {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @TableField(value = "first_establishment_date")
+    @Excel(name = "第一届成立时间",format = "yyyy-MM-dd")
     @ApiModelProperty(value = "第一届成立时间")
     private Date firstEstablishmentDate;
 
@@ -118,6 +130,7 @@ public class PayCommitteeInfo {
      * 联系人传真
      */
     @TableField(value = "contact_fax")
+    @Excel(name = "联系人传真")
     @ApiModelProperty(value = "联系人传真")
     private String contactFax;
 
@@ -125,6 +138,7 @@ public class PayCommitteeInfo {
      * 负责专业范围
      */
     @TableField(value = "responsible_for_professional_scope")
+    @Excel(name = "负责专业范围")
     @ApiModelProperty(value = "负责专业范围")
     private String responsibleForProfessionalScope;
 
@@ -132,6 +146,7 @@ public class PayCommitteeInfo {
      * 秘书处通讯地址
      */
     @TableField(value = "secretariat_mailing_address")
+    @Excel(name = "秘书处通讯地址")
     @ApiModelProperty(value = "秘书处通讯地址")
     private String secretariatMailingAddress;
 
@@ -139,6 +154,7 @@ public class PayCommitteeInfo {
      * 联系人电话
      */
     @TableField(value = "contact_phone_number")
+    @Excel(name = "联系人电话")
     @ApiModelProperty(value = "联系人电话")
     private String contactPhoneNumber;
 
@@ -146,6 +162,7 @@ public class PayCommitteeInfo {
      * 业务指导单位
      */
     @TableField(value = "business_guidance_unit")
+    @Excel(name = "业务指导单位")
     @ApiModelProperty(value = "业务指导单位")
     private String businessGuidanceUnit;
 
@@ -153,6 +170,7 @@ public class PayCommitteeInfo {
      * 秘书处所在城市
      */
     @TableField(value = "city")
+    @Excel(name = "秘书处所在城市")
     @ApiModelProperty(value = "秘书处所在城市")
     private String city;
 
@@ -160,6 +178,7 @@ public class PayCommitteeInfo {
      * 秘书处单位性质
      */
     @TableField(value = "unit_nature")
+    @Excel(name = "秘书处单位性质")
     @ApiModelProperty(value = "秘书处单位性质")
     private String unitNature;
 
@@ -167,6 +186,7 @@ public class PayCommitteeInfo {
      * 秘书处组织机构代码
      */
     @TableField(value = "org_code")
+    @Excel(name = "秘书处组织机构代码")
     @ApiModelProperty(value = "秘书处组织机构代码")
     private String orgCode;
 
@@ -174,6 +194,7 @@ public class PayCommitteeInfo {
      * 秘书长
      */
     @TableField(value = "secretary_general")
+    @Excel(name = "秘书长")
     @ApiModelProperty(value = "秘书长")
     private String secretaryGeneral;
 
@@ -181,6 +202,7 @@ public class PayCommitteeInfo {
      * 成立文号
      */
     @TableField(value = "establishment_number")
+    @Excel(name = "成立文号")
     @ApiModelProperty(value = "成立文号")
     private String establishmentNumber;
 
@@ -188,6 +210,7 @@ public class PayCommitteeInfo {
      * 联系人手机
      */
     @TableField(value = "cell_phone")
+    @Excel(name = "联系人手机")
     @ApiModelProperty(value = "联系人手机")
     private String cellPhone;
 
@@ -195,6 +218,7 @@ public class PayCommitteeInfo {
      * 现为第几届
      */
     @TableField(value = "what_is_the_current_session")
+    @Excel(name = "现为第几届")
     @ApiModelProperty(value = "现为第几届")
     private String whatIsTheCurrentSession;
 
@@ -202,6 +226,7 @@ public class PayCommitteeInfo {
      * 邮政编码
      */
     @TableField(value = "zip_code")
+    @Excel(name = "邮政编码")
     @ApiModelProperty(value = "邮政编码")
     private String zipCode;
 
@@ -209,6 +234,7 @@ public class PayCommitteeInfo {
      * 英文名称
      */
     @TableField(value = "english_name")
+    @Excel(name = "英文名称")
     @ApiModelProperty(value = "英文名称")
     private String englishName;
 
@@ -216,6 +242,7 @@ public class PayCommitteeInfo {
      * 本届批准文号编号
      */
     @TableField(value = "approval_number_for_this_session")
+    @Excel(name = "本届批准文号编号")
     @ApiModelProperty(value = "本届批准文号编号")
     private String approvalNumberForThisSession;
 
@@ -223,6 +250,7 @@ public class PayCommitteeInfo {
      * 传真
      */
     @TableField(value = "facsimile")
+    @Excel(name = "传真")
     @ApiModelProperty(value = "传真")
     private String facsimile;
 
@@ -230,6 +258,7 @@ public class PayCommitteeInfo {
      * 筹建单位
      */
     @TableField(value = "preparation_unit")
+    @Excel(name = "筹建单位")
     @ApiModelProperty(value = "筹建单位")
     private String preparationUnit;
 
@@ -237,12 +266,14 @@ public class PayCommitteeInfo {
      * 委员会名称
      */
     @TableField(value = "committee_name")
+    @Excel(name = "委员会名称")
     @ApiModelProperty(value = "委员会名称")
     private String committeeName;
     /**
      * 委员数量
      */
     @TableField(value = "member_number")
+    @Excel(name = "委员数量")
     @ApiModelProperty(value = "委员数量")
     private Integer memberNumber;
     /**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/committee/entity/PayCommitteeMemberInfo.java b/jero-boot-incoming-payment/src/main/java/com/jero/committee/entity/PayCommitteeMemberInfo.java
index b2831651..687f54b3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/committee/entity/PayCommitteeMemberInfo.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/committee/entity/PayCommitteeMemberInfo.java
@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
 import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**
@@ -36,6 +37,7 @@ public class PayCommitteeMemberInfo {
      * 手机
      */
     @TableField(value = "mobile_phone")
+    @Excel(name = "手机")
     @ApiModelProperty(value = "手机")
     private String mobilePhone;
 
@@ -43,6 +45,7 @@ public class PayCommitteeMemberInfo {
      * 序号
      */
     @TableField(value = "`number`")
+    @Excel(name = "序号")
     @ApiModelProperty(value = "序号")
     private String number;
 
@@ -50,6 +53,7 @@ public class PayCommitteeMemberInfo {
      * 证件号码
      */
     @TableField(value = "identification_number")
+    @Excel(name = "证件号码")
     @ApiModelProperty(value = "证件号码")
     private String identificationNumber;
 
@@ -57,6 +61,7 @@ public class PayCommitteeMemberInfo {
      * 所学专业
      */
     @TableField(value = "major_studied")
+    @Excel(name = "所学专业")
     @ApiModelProperty(value = "所学专业")
     private String majorStudied;
 
@@ -64,6 +69,7 @@ public class PayCommitteeMemberInfo {
      * 行政职务
      */
     @TableField(value = "administrative_position")
+    @Excel(name = "行政职务")
     @ApiModelProperty(value = "行政职务")
     private String administrativePosition;
 
@@ -71,6 +77,7 @@ public class PayCommitteeMemberInfo {
      * 技术职称
      */
     @TableField(value = "technical_title")
+    @Excel(name = "技术职称")
     @ApiModelProperty(value = "技术职称")
     private String technicalTitle;
 
@@ -78,6 +85,7 @@ public class PayCommitteeMemberInfo {
      * 所属相关方
      */
     @TableField(value = "affiliated_parties")
+    @Excel(name = "所属相关方")
     @ApiModelProperty(value = "所属相关方")
     private String affiliatedParties;
 
@@ -87,6 +95,7 @@ public class PayCommitteeMemberInfo {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @TableField(value = "committee_participation_time")
+    @Excel(name = "参加委员会时间",format = "yyyy-MM-dd")
     @ApiModelProperty(value = "参加委员会时间")
     private Date committeeParticipationTime;
 
@@ -94,6 +103,7 @@ public class PayCommitteeMemberInfo {
      * 工作单位
      */
     @TableField(value = "work_unit")
+    @Excel(name = "工作单位")
     @ApiModelProperty(value = "工作单位")
     private String workUnit;
 
@@ -101,6 +111,7 @@ public class PayCommitteeMemberInfo {
      * 电子邮箱
      */
     @TableField(value = "e_mail")
+    @Excel(name = "电子邮箱")
     @ApiModelProperty(value = "电子邮箱")
     private String eMail;
 
@@ -108,6 +119,7 @@ public class PayCommitteeMemberInfo {
      * 委员会编号
      */
     @TableField(value = "committee_number")
+    @Excel(name = "委员会编号")
     @ApiModelProperty(value = "委员会编号")
     private String committeeNumber;
 
@@ -115,6 +127,7 @@ public class PayCommitteeMemberInfo {
      * 姓名
      */
     @TableField(value = "`name`")
+    @Excel(name = "姓名")
     @ApiModelProperty(value = "姓名")
     private String name;
 
@@ -122,6 +135,7 @@ public class PayCommitteeMemberInfo {
      * 民族
      */
     @TableField(value = "nation")
+    @Excel(name = "民族")
     @ApiModelProperty(value = "民族")
     private String nation;
 
@@ -129,6 +143,7 @@ public class PayCommitteeMemberInfo {
      * 联系电话
      */
     @TableField(value = "contact_phone_number")
+    @Excel(name = "联系电话")
     @ApiModelProperty(value = "联系电话")
     private String contactPhoneNumber;
 
@@ -136,6 +151,7 @@ public class PayCommitteeMemberInfo {
      * 毕业院校
      */
     @TableField(value = "graduation_institution")
+    @Excel(name = "毕业院校")
     @ApiModelProperty(value = "毕业院校")
     private String graduationInstitution;
 
@@ -145,6 +161,7 @@ public class PayCommitteeMemberInfo {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @TableField(value = "validity_period_of_employment_letter")
+    @Excel(name = "聘书有效期",format = "yyyy-MM-dd")
     @ApiModelProperty(value = "聘书有效期")
     private Date validityPeriodOfEmploymentLetter;
 
@@ -152,6 +169,7 @@ public class PayCommitteeMemberInfo {
      * 外语
      */
     @TableField(value = "foreign_language")
+    @Excel(name = "外语")
     @ApiModelProperty(value = "外语")
     private String foreignLanguage;
 
@@ -159,6 +177,7 @@ public class PayCommitteeMemberInfo {
      * 委员聘书编号
      */
     @TableField(value = "appointment_letter_number")
+    @Excel(name = "委员聘书编号")
     @ApiModelProperty(value = "委员聘书编号")
     private String appointmentLetterNumber;
 
@@ -166,6 +185,7 @@ public class PayCommitteeMemberInfo {
      * 标委会职务
      */
     @TableField(value = "position_of_standards_committee")
+    @Excel(name = "标委会职务")
     @ApiModelProperty(value = "标委会职务")
     private String positionOfStandardsCommittee;
 
@@ -173,6 +193,7 @@ public class PayCommitteeMemberInfo {
      * 专业技术特长
      */
     @TableField(value = "professional_technical_expertise")
+    @Excel(name = "专业技术特长")
     @ApiModelProperty(value = "专业技术特长")
     private String professionalTechnicalExpertise;
 
@@ -180,6 +201,7 @@ public class PayCommitteeMemberInfo {
      * 职称级别
      */
     @TableField(value = "title_level")
+    @Excel(name = "职称级别")
     @ApiModelProperty(value = "职称级别")
     private String titleLevel;
 
@@ -187,6 +209,7 @@ public class PayCommitteeMemberInfo {
      * 从事专业
      */
     @TableField(value = "engaged_in_profession")
+    @Excel(name = "从事专业")
     @ApiModelProperty(value = "从事专业")
     private String engagedInProfession;
 
@@ -194,6 +217,7 @@ public class PayCommitteeMemberInfo {
      * 学历
      */
     @TableField(value = "educational_background")
+    @Excel(name = "学历")
     @ApiModelProperty(value = "学历")
     private String educationalBackground;
 
@@ -201,6 +225,7 @@ public class PayCommitteeMemberInfo {
      * 邮政编码
      */
     @TableField(value = "zip_code")
+    @Excel(name = "邮政编码")
     @ApiModelProperty(value = "邮政编码")
     private String zipCode;
 
@@ -208,6 +233,7 @@ public class PayCommitteeMemberInfo {
      * 学位
      */
     @TableField(value = "`degree`")
+    @Excel(name = "学位")
     @ApiModelProperty(value = "学位")
     private String degree;
 
@@ -215,6 +241,7 @@ public class PayCommitteeMemberInfo {
      * 单位性质
      */
     @TableField(value = "unit_nature")
+    @Excel(name = "单位性质")
     @ApiModelProperty(value = "单位性质")
     private String unitNature;
 
@@ -222,6 +249,7 @@ public class PayCommitteeMemberInfo {
      * 性别
      */
     @TableField(value = "gender")
+    @Excel(name = "性别")
     @ApiModelProperty(value = "性别")
     private String gender;
 
@@ -229,6 +257,7 @@ public class PayCommitteeMemberInfo {
      * 通信地址
      */
     @TableField(value = "communication_address")
+    @Excel(name = "通信地址")
     @ApiModelProperty(value = "通信地址")
     private String communicationAddress;
 
@@ -236,6 +265,7 @@ public class PayCommitteeMemberInfo {
      * 外语熟练程度
      */
     @TableField(value = "foreign_language_proficiency_level")
+    @Excel(name = "外语熟练程度")
     @ApiModelProperty(value = "外语熟练程度")
     private String foreignLanguageProficiencyLevel;
 
@@ -243,6 +273,7 @@ public class PayCommitteeMemberInfo {
      * 传真
      */
     @TableField(value = "facsimile")
+    @Excel(name = "传真")
     @ApiModelProperty(value = "传真")
     private String facsimile;
 
@@ -250,6 +281,7 @@ public class PayCommitteeMemberInfo {
      * 央企级别
      */
     @TableField(value = "central_enterprise_level")
+    @Excel(name = "央企级别")
     @ApiModelProperty(value = "央企级别")
     private String centralEnterpriseLevel;
 
@@ -257,6 +289,7 @@ public class PayCommitteeMemberInfo {
      * 工作单位统一社会信用代码或组织机构代码
      */
     @TableField(value = "org_code")
+    @Excel(name = "工作单位统一社会信用代码或组织机构代码")
     @ApiModelProperty(value = "工作单位统一社会信用代码或组织机构代码")
     private String orgCode;
 
@@ -264,6 +297,7 @@ public class PayCommitteeMemberInfo {
      * 政治面貌
      */
     @TableField(value = "political_landscape")
+    @Excel(name = "政治面貌")
     @ApiModelProperty(value = "政治面貌")
     private String politicalLandscape;
 
@@ -271,6 +305,7 @@ public class PayCommitteeMemberInfo {
      * 工作单位所属省_直辖市_自治区_特区
      */
     @TableField(value = "province_of_work_unit")
+    @Excel(name = "工作单位所属省_直辖市_自治区_特区")
     @ApiModelProperty(value = "工作单位所属省_直辖市_自治区_特区")
     private String provinceOfWorkUnit;
 
@@ -278,6 +313,7 @@ public class PayCommitteeMemberInfo {
      * 证件类型
      */
     @TableField(value = "document_type")
+    @Excel(name = "证件类型")
     @ApiModelProperty(value = "证件类型")
     private String documentType;
 
@@ -285,12 +321,14 @@ public class PayCommitteeMemberInfo {
      * 出生年月
      */
     @TableField(value = "birth_date")
+    @Excel(name = "出生年月")
     @ApiModelProperty(value = "出生年月")
     private String birthDate;
     /**
      * 个人证件照
      */
     @TableField(value = "photo")
+    @Excel(name = "个人证件照")
     @ApiModelProperty(value = "个人证件照")
     private String photo;
 
@@ -298,18 +336,21 @@ public class PayCommitteeMemberInfo {
      * 其他语言及熟练程度
      */
     @TableField(value = "other_languages_and_proficiency_levels")
+    @Excel(name = "其他语言及熟练程度")
     @ApiModelProperty(value = "其他语言及熟练程度")
     private String otherLanguagesAndProficiencyLevels;
     /**
      * 是否工程院院士
      */
     @TableField(value = "is_academician")
+    @Excel(name = "是否工程院院士")
     @ApiModelProperty(value = "是否工程院院士")
     private String isAcademician;
     /**
      * 是否科学院院士
      */
     @TableField(value = "is_academy_of_sciences")
+    @Excel(name = "是否科学院院士")
     @ApiModelProperty(value = "是否科学院院士")
     private String isAcademyOfSciences;
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/committee/service/PayCommitteeMemberInfoService.java b/jero-boot-incoming-payment/src/main/java/com/jero/committee/service/PayCommitteeMemberInfoService.java
index 326f05ad..3c774f3b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/committee/service/PayCommitteeMemberInfoService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/committee/service/PayCommitteeMemberInfoService.java
@@ -54,7 +54,7 @@ public class PayCommitteeMemberInfoService extends ServiceImpl<PayCommitteeMembe
         for (PayCommitteeMemberInfo record : pageList.getRecords()) {
             desensitized(record);
         }
-        return null;
+        return pageList;
     }