Commit 0be42798 authored by hongguangwu's avatar hongguangwu

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

parents bc0c2fe7 50f5d489
......@@ -48,8 +48,8 @@ public class TEmployeeRetirement extends BaseEntity implements Serializable {
*/
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("身份证号码")
@ExcelAttribute(name = "身份证号")
@Schema(description = "身份证号")
@ExcelAttribute(name = "身份证号")
@Schema(description = "身份证号")
private String empIdcard;
/**
......@@ -173,9 +173,9 @@ public class TEmployeeRetirement extends BaseEntity implements Serializable {
* 项目编码
*/
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("客户编码")
@ExcelAttribute(name = "客户编码")
@Schema(description = "客户编码")
@ExcelProperty("项目编码")
@ExcelAttribute(name = "项目编码")
@Schema(description = "项目编码")
private String deptNo;
/**
......
......@@ -44,9 +44,9 @@ public class TEmployeeRetirementExportVo{
* 身份证号码
*/
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("身份证号")
@ExcelAttribute(name = "身份证号")
@Schema(description = "身份证号")
@ExcelProperty("身份证号")
@ExcelAttribute(name = "身份证号")
@Schema(description = "身份证号")
private String empIdcard;
/**
......@@ -71,9 +71,9 @@ public class TEmployeeRetirementExportVo{
* 年龄
*/
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("年龄")
@ExcelAttribute(name = "年龄")
@Schema(description = "年龄")
@ExcelProperty("年龄(岁)")
@ExcelAttribute(name = "年龄(岁)")
@Schema(description = "年龄(岁)")
private Integer empAge;
/**
......@@ -87,15 +87,15 @@ public class TEmployeeRetirementExportVo{
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("档案")
@ExcelAttribute(name = "档案")
@Schema(description = "档案")
@ExcelProperty("档案所在地")
@ExcelAttribute(name = "档案所在地")
@Schema(description = "档案所在地")
private String fileAddress;
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保")
@ExcelAttribute(name = "社保")
@Schema(description = "社保")
@ExcelProperty("社保所在地")
@ExcelAttribute(name = "社保所在地")
@Schema(description = "社保所在地")
private String socialAddress;
......@@ -137,14 +137,7 @@ public class TEmployeeRetirementExportVo{
@Schema(description = "社保-县")
private Integer socialTown;
/**
* 项目名称
*/
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("项目名称")
@ExcelAttribute(name = "项目名称")
@Schema(description = "项目名称")
private String deptName;
/**
* 客户名称
......@@ -164,6 +157,14 @@ public class TEmployeeRetirementExportVo{
@Schema(description = "客户编码")
private String unitNo;
/**
* 项目名称
*/
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("项目名称")
@ExcelAttribute(name = "项目名称")
@Schema(description = "项目名称")
private String deptName;
/**
* 项目编码
*/
......
......@@ -1153,7 +1153,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
TEmployeeContractInfo contractInfo;
if (!EmployeeConstants.SITUATION_SEVEN.equals(insert.getSituation()) && !EmployeeConstants.SITUATION_SIX.equals(insert.getSituation())) {
if (CommonConstants.TWO_STRING.equals(insert.getContractType()) || CommonConstants.ZERO_STRING.equals(insert.getContractType())) {
if (CommonConstants.CONTRACT_TYPE_TWO.equals(insert.getContractType()) || CommonConstants.CONTRACT_TYPE_ZERO.equals(insert.getContractType())) {
contractInfo = this.getOne(Wrappers.<TEmployeeContractInfo>query().lambda()
.eq(TEmployeeContractInfo::getEmpIdcard, insert.getEmpIdcard())
.eq(TEmployeeContractInfo::getContractStart, insert.getContractStart())
......
......@@ -18,9 +18,9 @@
<result property="socialProvince" column="SOCIAL_PROVINCE" jdbcType="INTEGER"/>
<result property="socialCity" column="SOCIAL_CITY" jdbcType="INTEGER"/>
<result property="socialTown" column="SOCIAL_TOWN" jdbcType="INTEGER"/>
<result property="deptName" column="DEPT_NAME" jdbcType="VARCHAR"/>
<result property="unitName" column="UNIT_NAME" jdbcType="VARCHAR"/>
<result property="unitNo" column="UNIT_NO" jdbcType="VARCHAR"/>
<result property="deptName" column="DEPT_NAME" jdbcType="VARCHAR"/>
<result property="deptNo" column="DEPT_NO" jdbcType="VARCHAR"/>
<result property="handleFlag" column="HANDLE_FLAG" jdbcType="INTEGER"/>
<result property="createBy" column="CREATE_BY" jdbcType="VARCHAR"/>
......@@ -35,8 +35,8 @@
EMP_PHONE,EMP_SEX,EMP_AGE,
EMP_NATRUE,FILE_PROVINCE,FILE_CITY,
FILE_TOWN,SOCIAL_PROVINCE,SOCIAL_CITY,
SOCIAL_TOWN,DEPT_NAME,UNIT_NAME,
UNIT_NO,DEPT_NO,HANDLE_FLAG,
SOCIAL_TOWN,UNIT_NAME,
UNIT_NO,DEPT_NAME,DEPT_NO,HANDLE_FLAG,
CREATE_BY,CREATE_NAME,CREATE_TIME,
UPDATE_BY,UPDATE_TIME
</sql>
......
......@@ -47,7 +47,7 @@
</if>
</if>
</if>
<if test="tMinSalary.town != null and tMinSalary.town.trim() != ''">
<if test="tMinSalary.town != null">
AND TOWN = '${tMinSalary.town}'
</if>
</if>
......
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