LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 缺失字段处理

Browse Source
This commit is contained in:
lijiarao
2024-06-06 18:11:28 +08:00
parent b4ee04bcff
commit 46ef98a5bb
5 changed files with 83 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/24年6月变更.sql
+42 -39
View File
@@ -31,7 +31,7 @@ create table pay_committee_info
facsimile varchar(100) null comment '传真', facsimile varchar(100) null comment '传真',
preparation_unit varchar(100) null comment '筹建单位', preparation_unit varchar(100) null comment '筹建单位',
committee_name varchar(100) null comment '委员会名称', committee_name varchar(100) null comment '委员会名称',
member_number int null comment '委员数量', member_number int null comment '委员数量',
constraint Index_1 constraint Index_1
unique (id) unique (id)
) )
@@ -44,44 +44,47 @@ alter table pay_committee_info
drop table if exists pay_committee_member_info; drop table if exists pay_committee_member_info;
create table pay_committee_member_info create table pay_committee_member_info
( (
id varchar(36) not null comment 'id', id varchar(36) not null comment 'id',
mobile_phone varchar(100) null comment '手机', mobile_phone varchar(100) null comment '手机',
number int null comment '序号', number int null comment '序号',
identification_number varchar(100) null comment '证件号码', identification_number varchar(100) null comment '证件号码',
major_studied varchar(100) null comment '所学专业', major_studied varchar(100) null comment '所学专业',
administrative_position varchar(100) null comment '行政职务', administrative_position varchar(100) null comment '行政职务',
technical_title varchar(100) null comment '技术职称', technical_title varchar(100) null comment '技术职称',
affiliated_parties varchar(100) null comment '所属相关方', affiliated_parties varchar(100) null comment '所属相关方',
committee_participation_time date null comment '参加委员会时间', committee_participation_time date null comment '参加委员会时间',
work_unit varchar(100) null comment '工作单位', work_unit varchar(100) null comment '工作单位',
e_mail varchar(100) null comment '电子邮箱', e_mail varchar(100) null comment '电子邮箱',
committee_number varchar(100) null comment '委员会编号', committee_number varchar(100) null comment '委员会编号',
name varchar(100) null comment '姓名', name varchar(100) null comment '姓名',
nation varchar(100) null comment '民族', nation varchar(100) null comment '民族',
contact_phone_number varchar(100) null comment '联系电话', contact_phone_number varchar(100) null comment '联系电话',
graduation_institution varchar(100) null comment '毕业院校', graduation_institution varchar(100) null comment '毕业院校',
validity_period_of_employment_letter date null comment '聘书有效期', validity_period_of_employment_letter date null comment '聘书有效期',
foreign_language varchar(100) null comment '外语', foreign_language varchar(100) null comment '外语',
appointment_letter_number varchar(100) null comment '委员聘书编号', appointment_letter_number varchar(100) null comment '委员聘书编号',
position_of_standards_committee varchar(100) null comment '标委会职务', position_of_standards_committee varchar(100) null comment '标委会职务',
professional_technical_expertise text null comment '专业技术特长', professional_technical_expertise text null comment '专业技术特长',
title_level varchar(100) null comment '职称级别', title_level varchar(100) null comment '职称级别',
engaged_in_profession varchar(100) null comment '从事专业', engaged_in_profession varchar(100) null comment '从事专业',
educational_background varchar(100) null comment '学历', educational_background varchar(100) null comment '学历',
zip_code varchar(100) null comment '邮政编码', zip_code varchar(100) null comment '邮政编码',
degree varchar(100) null comment '学位', degree varchar(100) null comment '学位',
unit_nature varchar(100) null comment '单位性质', unit_nature varchar(100) null comment '单位性质',
gender varchar(100) null comment '性别', gender varchar(100) null comment '性别',
communication_address varchar(100) null comment '通信地址', communication_address varchar(100) null comment '通信地址',
foreign_language_proficiency_level varchar(100) null comment '外语熟练程度', foreign_language_proficiency_level varchar(100) null comment '外语熟练程度',
facsimile varchar(100) null comment '传真', facsimile varchar(100) null comment '传真',
central_enterprise_level varchar(100) null comment '央企级别', central_enterprise_level varchar(100) null comment '央企级别',
org_code varchar(100) null comment '工作单位统一社会信用代码或组织机构代码', org_code varchar(100) null comment '工作单位统一社会信用代码或组织机构代码',
political_landscape varchar(100) null comment '政治面貌', political_landscape varchar(100) null comment '政治面貌',
province_of_work_unit varchar(100) null comment '工作单位所属省_直辖市_自治区_特区', province_of_work_unit varchar(100) null comment '工作单位所属省_直辖市_自治区_特区',
document_type varchar(100) null comment '证件类型', document_type varchar(100) null comment '证件类型',
birth_date varchar(100) null comment '出生年月', birth_date varchar(100) null comment '出生年月',
photo varchar(100) null comment '个人证件照', photo varchar(100) null comment '个人证件照',
other_languages_and_proficiency_levels varchar(100) null comment '其他语言及熟练程度',
is_academician varchar(100) null comment '是否工程院院士',
is_academy_of_sciences varchar(100) null comment '是否科学院院士',
constraint Index_1 constraint Index_1
unique (id) unique (id)
) )
jero-boot-incoming-payment/src/main/java/com/jero/committee/dto/CommitteeMemberInfoDTO.java
+15
View File
@@ -191,4 +191,19 @@ public class CommitteeMemberInfoDTO {
*/ */
@JSONField(name = "出生年月") @JSONField(name = "出生年月")
private String birthDate; private String birthDate;
/**
* 其他语言及熟练程度
*/
@JSONField(name = "其他语言及熟练程度")
private String otherLanguagesAndProficiencyLevels;
/**
* 是否工程院院士
*/
@JSONField(name = "是否工程院院士")
private String isAcademician;
/**
* 是否科学院院士
*/
@JSONField(name = "是否科学院院士")
private String isAcademyOfSciences;
} }
jero-boot-incoming-payment/src/main/java/com/jero/committee/entity/PayCommitteeInfo.java
+2
View File
@@ -1,9 +1,11 @@
package com.jero.committee.entity; package com.jero.committee.entity;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.util.Date; import java.util.Date;
jero-boot-incoming-payment/src/main/java/com/jero/committee/entity/PayCommitteeMemberInfo.java
+21
View File
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.util.Date; import java.util.Date;
@@ -286,4 +287,24 @@ public class PayCommitteeMemberInfo {
@TableField(value = "photo") @TableField(value = "photo")
@ApiModelProperty(value = "个人证件照") @ApiModelProperty(value = "个人证件照")
private String photo; private String photo;
/**
* 其他语言及熟练程度
*/
@TableField(value = "other_languages_and_proficiency_levels")
@ApiModelProperty(value = "其他语言及熟练程度")
private String otherLanguagesAndProficiencyLevels;
/**
* 是否工程院院士
*/
@TableField(value = "is_academician")
@Dict(dicCode = "yn")
@ApiModelProperty(value = "是否工程院院士")
private String isAcademician;
/**
* 是否科学院院士
*/
@TableField(value = "is_academy_of_sciences")
@ApiModelProperty(value = "是否科学院院士")
private String isAcademyOfSciences;
} }
jero-boot-incoming-payment/src/main/java/com/jero/committee/service/PayCommitteeInfoService.java
+3
View File
@@ -205,6 +205,9 @@ public class PayCommitteeInfoService extends ServiceImpl<PayCommitteeInfoMapper,
DateTime date = DateUtil.date(Long.parseLong(birthDate)); DateTime date = DateUtil.date(Long.parseLong(birthDate));
payCommitteeMemberInfo.setBirthDate(date.toDateStr()); payCommitteeMemberInfo.setBirthDate(date.toDateStr());
} }
payCommitteeMemberInfo.setIsAcademician(dto.getIsAcademician());
payCommitteeMemberInfo.setIsAcademyOfSciences(dto.getIsAcademyOfSciences());
payCommitteeMemberInfo.setOtherLanguagesAndProficiencyLevels(dto.getOtherLanguagesAndProficiencyLevels());
return payCommitteeMemberInfo; return payCommitteeMemberInfo;
} }