Merge remote-tracking branch 'origin/develop' into develop

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java

@@ -296,8 +296,7 @@ public class TEmployeeProject extends BaseEntity {
 	/**
 	 * 近3个月发薪（0否；1是）
 	 */
-	@Schema(description = "近3个月发薪（0否；1是）")
-	@TableField(exist = false)
+	@Schema(description = "近3个月发薪（0无；1是；2否）")
 	private Integer salaryStatus;
 
 	/**
@@ -320,4 +319,11 @@ public class TEmployeeProject extends BaseEntity {
 	@Schema(description = "档案-县")
 	@TableField(exist = false)
 	private Integer fileTown;
+
+	/**
+	 * 员工合同状态（字典）
+	 */
+	@Schema(description = "员工合同状态（字典）0初始状态")
+	private Integer contractStatus;
+
 }

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml

@@ -52,6 +52,7 @@
     <result property="insuranceStatus" column="INSURANCE_STATUS"/>
     <result property="socialStatus" column="SOCIAL_STATUS"/>
     <result property="fundStatus" column="FUND_STATUS"/>
+    <result property="contractStatus" column="CONTRACT_STATUS"/>
   </resultMap>
 
 	<resultMap id="tEmployeeProjectExportMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO">
@@ -111,6 +112,7 @@
 		<result property="fundStatus" column="FUND_STATUS"/>
 		<result property="createName" column="CREATE_NAME"/>
 		<result property="createTime" column="CREATE_TIME"/>
+		<result property="contractStatus" column="CONTRACT_STATUS"/>
 	</resultMap>
 
 	<sql id="Base_Column_List">
@@ -154,6 +156,7 @@
                   a.UPDATE_BY,
                   a.UPDATE_TIME,
                   a.REMARK,
+                  a.CONTRACT_STATUS,
 				  b.EMP_PHONE,
 				  b.INSURANCE_STATUS,
 				  b.SOCIAL_STATUS,
@@ -161,7 +164,7 @@
 				  b.FILE_PROVINCE,
 				  b.FILE_CITY,
 				  b.FILE_TOWN,
-				  b.SALARY_STATUS
+				  a.SALARY_STATUS
 	</sql>
 
 	<sql id="Base_Export_List">
@@ -186,6 +189,7 @@
                   a.ENJOIN_DATE,
                   a.TRY_PERIOD,
                   a.PROJECT_SOURCE,
+                  a.CONTRACT_STATUS,
                   b.STATUS AS PROSTATUS,
                   b.CREATE_NAME AS PROCREATE_NAME,
                   b.CREATE_TIME AS PROCREATE_TIME,
@@ -196,7 +200,7 @@
 				  b.FILE_PROVINCE,
 				  b.FILE_CITY,
 				  b.FILE_TOWN,
-				  b.SALARY_STATUS,
+				  a.SALARY_STATUS,
 				  b.VALIDITY_START,
 				  b.VALIDITY_END,
 				  b.EMP_MARRI_STATUS,
@@ -338,6 +342,9 @@
 			<if test="tEmployeeProject.remark != null and tEmployeeProject.remark.trim() != ''">
 				AND a.REMARK = #{tEmployeeProject.remark}
 			</if>
+			<if test="tEmployeeProject.contractStatus != null">
+				AND a.CONTRACT_STATUS = #{tEmployeeProject.contractStatus}
+			</if>
 			<if test="tEmployeeProject.empPhone != null and tEmployeeProject.empPhone.trim() != ''">
 				AND b.EMP_PHONE = #{tEmployeeProject.empPhone}
 			</if>
@@ -351,7 +358,7 @@
 				AND b.FUND_STATUS = #{tEmployeeProject.fundStatus}
 		    </if>
 			<if test="tEmployeeProject.salaryStatus != null">
-				AND b.SALARY_STATUS = #{tEmployeeProject.salaryStatus}
+				AND a.SALARY_STATUS = #{tEmployeeProject.salaryStatus}
 			</if>
 			<if test="tEmployeeProject.fileProvince != null">
 				AND b.FILE_PROVINCE = #{tEmployeeProject.fileProvince}
@@ -442,6 +449,9 @@
 			<if test="tEmployeeProject.remark != null and tEmployeeProject.remark.trim() != ''">
 				AND a.REMARK = #{tEmployeeProject.remark}
 			</if>
+			<if test="tEmployeeProject.contractStatus != null">
+				AND a.CONTRACT_STATUS = #{tEmployeeProject.contractStatus}
+			</if>
 			<if test="tEmployeeProject.empPhone != null and tEmployeeProject.empPhone.trim() != ''">
 				AND b.EMP_PHONE = #{tEmployeeProject.empPhone}
 			</if>
@@ -455,7 +465,7 @@
 				AND b.FUND_STATUS = #{tEmployeeProject.fundStatus}
 			</if>
 			<if test="tEmployeeProject.salaryStatus != null">
-				AND b.SALARY_STATUS = #{tEmployeeProject.salaryStatus}
+				AND a.SALARY_STATUS = #{tEmployeeProject.salaryStatus}
 			</if>
 			<if test="tEmployeeProject.fileProvince != null">
 				AND b.FILE_PROVINCE = #{tEmployeeProject.fileProvince}