Commit 48a2a61c authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.13' into MVP1.7.13

parents 834bcc52 069bf640
...@@ -36,48 +36,19 @@ import java.math.BigDecimal; ...@@ -36,48 +36,19 @@ import java.math.BigDecimal;
@ColumnWidth(15) @ColumnWidth(15)
public class TGzOfferInfoExportDetailVo implements Serializable { public class TGzOfferInfoExportDetailVo implements Serializable {
@ExcelProperty("流程ID") // 2025-7-24 16:18:55 新顺序:
private String bizId; // 人员类别名称 姓名 姓名拼音 证件类型描述 证件号码 性别 个人手机号 个人邮箱 预计入职日期 部门名称 职务描述 直接上级姓名 工作地点描述 社保缴纳地
@ExcelProperty("人员类别编码")
private String emplType;
@ExcelProperty("人员类别名称") @ExcelProperty("人员类别名称")
private String emplTypeDescr; private String emplTypeDescr;
/**
* 外签类型:A: 洼地外签/ B:属地外签
*/
@ExcelAttribute(name = "外签类型", isDataId = true, dataType = ExcelAttributeConstants.GZ_OUT_SGIN_TYPE)
@ExcelProperty("外签类型")
private String outSginType;
/**
* 合同公司主体:公司信息表
*/
@ExcelProperty("合同公司主体")
private String company;
@ExcelProperty("姓名") @ExcelProperty("姓名")
private String name; private String name;
@ExcelProperty("姓名拼音") @ExcelProperty("姓名拼音")
private String nameAc; private String nameAc;
@ExcelProperty("姓氏拼音")
private String lastNameAc;
@ExcelProperty("名字拼音")
private String firstNameAc;
@ExcelProperty("国籍编码")
private String country;
@ExcelProperty("国籍描述")
private String countryDescr;
@ExcelProperty("证件类型编码")
private String nationalIdType;
@ExcelProperty("证件类型描述") @ExcelProperty("证件类型描述")
private String nationalIdTypeDescr; private String nationalIdTypeDescr;
@ExcelProperty("证件号码") @ExcelProperty("证件号码")
private String nationalId; private String nationalId;
@ExcelAttribute(name = "性别", isDataId = true, dataType = ExcelAttributeConstants.GZ_SEX) @ExcelAttribute(name = "性别", isDataId = true, dataType = ExcelAttributeConstants.GZ_SEX)
@ExcelProperty("性别") @ExcelProperty("性别")
private String sex; private String sex;
...@@ -85,18 +56,21 @@ public class TGzOfferInfoExportDetailVo implements Serializable { ...@@ -85,18 +56,21 @@ public class TGzOfferInfoExportDetailVo implements Serializable {
private String phone; private String phone;
@ExcelProperty("个人邮箱") @ExcelProperty("个人邮箱")
private String email; private String email;
@ExcelProperty("直接上级姓名")
private String supervisorName;
@ExcelProperty("职务描述")
private String jobcodeDescr;
@ExcelProperty("工作地点")
private String workLocation;
@ExcelProperty("工作地点描述")
private String workLocationDescr;
@ExcelProperty("预计入职日期") @ExcelProperty("预计入职日期")
private String expEntryDate; private String expEntryDate;
@ExcelProperty("部门名称") @ExcelProperty("部门名称")
private String deptName; private String deptName;
@ExcelProperty("职务描述")
private String jobcodeDescr;
@ExcelProperty("直接上级姓名")
private String supervisorName;
@ExcelProperty("工作地点描述")
private String workLocationDescr;
@ExcelProperty("社保缴纳地")
private String socialInsuranceLocationDescr;
// 基本工资 绩效工资 年终奖月数 流程ID 人员类别编码 外签类型 合同公司主体 姓氏拼音 名字拼音 国籍编码 国籍描述 证件类型编码 工作地点 社保缴纳地编码
/** /**
* 基本工资,两位小数 * 基本工资,两位小数
*/ */
...@@ -109,10 +83,38 @@ public class TGzOfferInfoExportDetailVo implements Serializable { ...@@ -109,10 +83,38 @@ public class TGzOfferInfoExportDetailVo implements Serializable {
private BigDecimal perfomPay; private BigDecimal perfomPay;
@ExcelProperty("年终奖月数") @ExcelProperty("年终奖月数")
private Integer yearBonusMonth; private Integer yearBonusMonth;
@ExcelProperty("流程ID")
private String bizId;
@ExcelProperty("人员类别编码")
private String emplType;
/**
* 外签类型:A: 洼地外签/ B:属地外签
*/
@ExcelAttribute(name = "外签类型", isDataId = true, dataType = ExcelAttributeConstants.GZ_OUT_SGIN_TYPE)
@ExcelProperty("外签类型")
private String outSginType;
/**
* 合同公司主体:公司信息表
*/
@ExcelProperty("合同公司主体")
private String company;
@ExcelProperty("姓氏拼音")
private String lastNameAc;
@ExcelProperty("名字拼音")
private String firstNameAc;
@ExcelProperty("国籍编码")
private String country;
@ExcelProperty("国籍描述")
private String countryDescr;
@ExcelProperty("证件类型编码")
private String nationalIdType;
@ExcelProperty("工作地点")
private String workLocation;
@ExcelProperty("社保缴纳地编码") @ExcelProperty("社保缴纳地编码")
private String socialInsuranceLocation; private String socialInsuranceLocation;
@ExcelProperty("社保缴纳地") // 社保基数 公积金基数 是否转正后缴纳公积金 申请人邮箱 接收瓜子Offer时间 Offer短信通知状态 Offer状态
private String socialInsuranceLocationDescr;
@ExcelProperty("社保基数") @ExcelProperty("社保基数")
private BigDecimal socialInsuranceBase; private BigDecimal socialInsuranceBase;
@ExcelProperty("公积金基数") @ExcelProperty("公积金基数")
...@@ -134,4 +136,5 @@ public class TGzOfferInfoExportDetailVo implements Serializable { ...@@ -134,4 +136,5 @@ public class TGzOfferInfoExportDetailVo implements Serializable {
@ExcelProperty("Offer状态") @ExcelProperty("Offer状态")
private String offerStatus; private String offerStatus;
} }
...@@ -754,7 +754,7 @@ ...@@ -754,7 +754,7 @@
'' comment '' comment
FROM t_gz_emp_work b left join t_gz_emp_info a on a.id=b.emp_id FROM t_gz_emp_work b left join t_gz_emp_info a on a.id=b.emp_id
where a.del_flag = '0' and b.del_flag = '0' and a.id = #{gzEmpId} where a.del_flag = '0' and b.del_flag = '0' and a.id = #{gzEmpId}
ORDER BY b.create_time desc limit 1 ORDER BY b.create_time desc
</select> </select>
<!--推送瓜子的瓜子档案信息Education--> <!--推送瓜子的瓜子档案信息Education-->
<select id="getGzEmpInfoToPushGzByIdEducation" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoPushGzVoEducation"> <select id="getGzEmpInfoToPushGzByIdEducation" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoPushGzVoEducation">
......
...@@ -105,8 +105,8 @@ ...@@ -105,8 +105,8 @@
<!-- 税友养工失增加模板--> <!-- 税友养工失增加模板-->
<select id="getSocialSoldierYgsAddVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SociaFriendYgsAddVo"> <select id="getSocialSoldierYgsAddVoList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SociaFriendYgsAddVo">
<include refid="getSocialSoldierBaseOne"/> <include refid="getSocialSoldierBaseOne"/>
,if(s.PENSION_START is not null,DATE_FORMAT(s.PENSION_START,"%Y-%m-%d"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y-%m-%d")) socialStartDate ,if(YGS_SOCIAL_START_DATE_NEXT is not null,DATE_FORMAT(s.YGS_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"), if(s.PENSION_START is not null,DATE_FORMAT(s.PENSION_START,"%Y-%m-%d"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y-%m-%d"))) socialStartDate
,if(s.PENSION_START is not null,DATE_FORMAT(s.PENSION_START,"%Y%m"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y%m")) socialStartMonth ,if(YGS_SOCIAL_START_DATE_NEXT is not null,DATE_FORMAT(s.YGS_SOCIAL_START_DATE_NEXT,"%Y%m"), if(s.PENSION_START is not null,DATE_FORMAT(s.PENSION_START,"%Y%m"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y%m"))) socialStartMonth
<include refid="getSocialSoldierBaseTwo"/> <include refid="getSocialSoldierBaseTwo"/>
and a.type = '0' and s.YGS_HANDLE_STATUS in ('0','1','3') and a.type = '0' and s.YGS_HANDLE_STATUS in ('0','1','3')
and ( and (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment