Merge remote-tracking branch 'origin/master'

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportParamVO.java

@@ -443,12 +443,12 @@ public class EmployeeProjectExportParamVO extends BaseEntity {
 	private String projectSource;
 
 	/**
-	 * 项目档案状态（0草稿、1已审核）
+	 * 项目档案状态
 	 */
-	@ExcelAttribute(name ="项目档案状态", readConverterExp = "0=草稿,1=已审核")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty(value ="项目档案状态")
-	private String status;
+	@ExcelAttribute(name = "项目档案状态")
+	private String projectStatusReplace;
 
 	/**
 	 * 社保-省

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportVO.java

@@ -442,12 +442,12 @@ public class EmployeeProjectExportVO {
 	private String projectSource;
 
 	/**
-	 * 项目档案状态（0草稿、1已审核）
+	 * 项目档案状态（0=正常,1=已减项）
 	 */
-	@ExcelAttribute(name ="项目档案状态", readConverterExp = "0=草稿,1=已审核")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty(value ="项目档案状态")
-	private String status;
+	@ExcelAttribute(name = "项目档案状态")
+	private String projectStatus;
 
 	 /**
 	 * 项目档案创建人

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

@@ -60,6 +60,7 @@
 
 	<resultMap id="tEmployeeProjectExportMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO">
 		<result property="empCode" column="EMP_CODE"/>
+		<result property="projectStatus" column="PROJECT_STATUS"/>
 		<result property="proEmpNatrue" column="PROEMP_NATRUE"/>
 		<result property="empNatrue" column="EMP_NATRUE"/>
 		<result property="empName" column="EMP_NAME"/>
@@ -103,7 +104,6 @@
 		<result property="empNatrue" column="EMP_NATRUE"/>
 		<result property="proCreateName" column="PROCREATE_NAME"/>
 		<result property="proCreateTime" column="PROCREATE_TIME"/>
-		<result property="status" column="STATUS"/>
 		<result property="fileProvince" column="FILE_PROVINCE"/>
 		<result property="fileCity" column="FILE_CITY"/>
 		<result property="fileTown" column="FILE_TOWN"/>
@@ -224,7 +224,7 @@
 				  b.ADMISSION_DATE,
 				  b.GRADUTION_DATE,
 				  b.REMARK,
-				  if(a.STATUS=0,'草稿','已审核') STATUS,
+				  if(a.STATUS='0','草稿',IF(a.PROJECT_STATUS=1,'已减项','已审核')) PROJECT_STATUS,
 				  a.CREATE_NAME,
 				  a.CREATE_TIME,
 				  b.EMP_EMAIL,
@@ -435,6 +435,9 @@
 			<if test="tEmployeeProject.empIdcard != null and tEmployeeProject.empIdcard.trim() != ''">
 				AND a.EMP_IDCARD like concat('%',#{tEmployeeProject.empIdcard},'%')
 			</if>
+			<if test="tEmployeeProject.projectStatusReplace != null and tEmployeeProject.projectStatusReplace.trim() != ''">
+				AND a.PROJECT_STATUS = #{tEmployeeProject.projectStatusReplace}
+			</if>
 			<if test="tEmployeeProject.bankName != null and tEmployeeProject.bankName.trim() != ''">
 				AND a.BANK_NAME = #{tEmployeeProject.bankName}
 			</if>