Commit f92664c0 authored by fangxinjiang's avatar fangxinjiang

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

parents a03256c8 09bf1ccd
...@@ -276,9 +276,9 @@ public class TEmployeeProject extends BaseEntity { ...@@ -276,9 +276,9 @@ public class TEmployeeProject extends BaseEntity {
/** /**
* 是否完整 0是 1 否 * 档案是否完整 0是 1 否
*/ */
@Schema(description ="是否完整0是 1 否") @Schema(description ="档案是否完整0是 1 否")
private String isComplete; private String isComplete;
/** /**
......
...@@ -490,6 +490,11 @@ public class EmployeeProjectExportParamVO extends BaseEntity { ...@@ -490,6 +490,11 @@ public class EmployeeProjectExportParamVO extends BaseEntity {
@ExcelAttribute(name = "合同甲方") @ExcelAttribute(name = "合同甲方")
private String contractParty; private String contractParty;
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "档案是否完整")
@ExcelAttribute(name = "档案是否完整", readConverterExp = "0=是,1=否")
private String isComplete;
private String[] socialStatusArray; private String[] socialStatusArray;
private String[] fundStatusArray; private String[] fundStatusArray;
......
...@@ -529,6 +529,11 @@ public class EmployeeProjectExportVO { ...@@ -529,6 +529,11 @@ public class EmployeeProjectExportVO {
@ExcelAttribute(name = "合同甲方") @ExcelAttribute(name = "合同甲方")
private String contractParty; private String contractParty;
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "档案是否完整")
@ExcelAttribute(name = "档案是否完整", readConverterExp = "0=是,1=否")
private String isComplete;
private String[] socialStatusArray; private String[] socialStatusArray;
private String[] fundStatusArray; private String[] fundStatusArray;
......
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
<result property="fundStatus" column="FUND_STATUS"/> <result property="fundStatus" column="FUND_STATUS"/>
<result property="contractStatus" column="CONTRACT_STATUS"/> <result property="contractStatus" column="CONTRACT_STATUS"/>
<result property="empLabel" column="EMP_LABEL"/> <result property="empLabel" column="EMP_LABEL"/>
<result property="isComplete" column="IS_COMPLETE"/>
</resultMap> </resultMap>
<resultMap id="tEmployeeProjectExportMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO"> <resultMap id="tEmployeeProjectExportMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO">
...@@ -122,6 +123,7 @@ ...@@ -122,6 +123,7 @@
<result property="contactCity" column="CONTACT_CITY"/> <result property="contactCity" column="CONTACT_CITY"/>
<result property="contactTown" column="CONTACT_TOWN"/> <result property="contactTown" column="CONTACT_TOWN"/>
<result property="contactAddress" column="contact_address"/> <result property="contactAddress" column="contact_address"/>
<result property="isComplete" column="IS_COMPLETE"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
...@@ -241,7 +243,8 @@ ...@@ -241,7 +243,8 @@
b.EMP_EMAIL, b.EMP_EMAIL,
b.EMP_NATRUE AS PROEMP_NATRUE, b.EMP_NATRUE AS PROEMP_NATRUE,
a.EMP_LABEL, a.EMP_LABEL,
t.CONTRACT_PARTY t.CONTRACT_PARTY,
a.IS_COMPLETE
</sql> </sql>
...@@ -442,6 +445,9 @@ ...@@ -442,6 +445,9 @@
<if test="tEmployeeProject.createTimeEnd != null"> <if test="tEmployeeProject.createTimeEnd != null">
AND a.CREATE_TIME <![CDATA[ <= ]]> #{tEmployeeProject.createTimeEnd} AND a.CREATE_TIME <![CDATA[ <= ]]> #{tEmployeeProject.createTimeEnd}
</if> </if>
<if test="tEmployeeProject.isComplete != null and tEmployeeProject.isComplete.trim() != ''">
AND a.IS_COMPLETE = #{tEmployeeProject.isComplete}
</if>
</if> </if>
</sql> </sql>
...@@ -612,6 +618,9 @@ ...@@ -612,6 +618,9 @@
AND a.CREATE_TIME <![CDATA[ <= ]]> #{tEmployeeProject.createTimeEnd} AND a.CREATE_TIME <![CDATA[ <= ]]> #{tEmployeeProject.createTimeEnd}
</if> </if>
<if test="tEmployeeProject.isComplete != null and tEmployeeProject.isComplete.trim() != ''">
AND a.IS_COMPLETE = #{tEmployeeProject.isComplete}
</if>
</if> </if>
</sql> </sql>
......
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