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

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

@@ -24,6 +24,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
@@ -151,7 +152,15 @@ public class EmployeeContractExportAuditVO implements Serializable {
 	@Schema(description = "工时制（数据字典） 1标准工时 2 综合工时 3不定时工时制", name = "workingHours")
 	@ExcelProperty("工时制")
 	private String workingHours;
-
+	/**
+	 * 合同编码
+	 */
+	@NotBlank(message = "合同编码不能为空")
+	@Length(max = 50, message = "合同编码不能超过50个字符")
+	@ExcelAttribute(name = "合同编码", maxLength = 50)
+	@ExcelProperty("合同编码")
+	@Schema(description = "合同编码", name = "contractNo")
+	private String contractNo;
 	/**
 	 * 离职日期
 	 */

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

@@ -141,6 +141,32 @@ public class EmployeeContractExportVO implements Serializable {
 	@Schema(description = "合同类型", name = "contractName")
 	private String contractName;
 
+	/**
+	 * 合同岗位
+	 */
+	@Length(max = 32, message = "合同岗位不能超过32个字符")
+	@ExcelAttribute(name = "合同岗位", maxLength = 32, needExport = true)
+	@ExcelProperty("合同岗位")
+	@Schema(description = "合同岗位", name = "post")
+	private String post;
+
+	/**
+	 * 工时制（数据字典） 1标准工时 2 综合工时 3不定时工时制
+	 */
+	@ExcelAttribute(name = "工时制")
+	@Schema(description = "工时制（数据字典） 1标准工时 2 综合工时 3不定时工时制", name = "workingHours")
+	@ExcelProperty("工时制")
+	private String workingHours;
+	/**
+	 * 合同编码
+	 */
+	@NotBlank(message = "合同编码不能为空")
+	@Length(max = 50, message = "合同编码不能超过50个字符")
+	@ExcelAttribute(name = "合同编码", maxLength = 50)
+	@ExcelProperty("合同编码")
+	@Schema(description = "合同编码", name = "contractNo")
+	private String contractNo;
+
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("业务细分")
 	@NotBlank(message = "业务细分不能为空")

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

@@ -100,7 +100,7 @@
 		<result property="createTime" column="CREATE_TIME"/>
 		<result property="contractSubName" column="CONTRACT_SUB_NAME"/>
 		<result property="reason" column="REASON"/>
-
+		<result property="contractNo" column="CONTRACT_NO"/>
 		<result property="type" column="TYPE"/>
 		<result property="leaveDate" column="LEAVE_DATE"/>
 		<result property="reduceReason" column="REDUCE_REASON"/>
@@ -136,7 +136,9 @@
 		<result property="endDate" column="END_DATE"/>
 		<result property="history" column="HISTORY"/>
 		<result property="type" column="TYPE"/>
-
+		<result property="contractNo" column="CONTRACT_NO"/>
+		<result property="workingHours" column="WORKING_HOURS"/>
+		<result property="post" column="POST"/>
 	</resultMap>
 
 	<sql id="Base_Column_List">
@@ -489,6 +491,12 @@
 		if(a.IS_FILE = 0,'有附件','无附件') FILES,
 		if(a.IS_FILE = 0,'已归档','未归档') IS_FILE,
 		a.CREATE_NAME,
+		a.CONTRACT_NO,
+		a.POST,
+		CASE WHEN a.WORKING_HOURS=1 THEN "标准工时"
+		WHEN a.WORKING_HOURS =2 THEN "综合工时"
+		WHEN a.WORKING_HOURS =3 THEN "不定时工时制"
+		ELSE a.WORKING_HOURS END as "WORKING_HOURS",
 		CASE WHEN a.type=0 THEN "派增-社保派单"
 		WHEN a.type =1 THEN "派增-无社保新签"
 		WHEN a.type =2 THEN "派增-续签"
@@ -555,6 +563,12 @@
 			if(a.IN_USE = 0,'可用','不可用') IN_USE,
 			if(a.IS_FILE = 0,'有附件','无附件') FILES,
 			if(a.IS_FILE = 0,'已归档','未归档') IS_FILE,
+			a.CONTRACT_NO,
+			a.POST,
+			CASE WHEN a.WORKING_HOURS=1 THEN "标准工时"
+			WHEN a.WORKING_HOURS =2 THEN "综合工时"
+			WHEN a.WORKING_HOURS =3 THEN "不定时工时制"
+			ELSE a.WORKING_HOURS END as "WORKING_HOURS",
 			a.CREATE_NAME,
 			CASE WHEN a.type=0 THEN "派增-社保派单"
 			WHEN a.type =1 THEN "派增-无社保新签"
@@ -629,6 +643,7 @@
 		a.REASON,
 		a.TYPE,
 		a.LEAVE_DATE,
+		a.CONTRACT_NO,
 		a.REDUCE_REASON
 		FROM t_employee_contract_info a
 		<where>

yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml

@@ -949,6 +949,8 @@
 		<result property="fundTown" column="FUND_TOWN"/>
 		<result property="belongUnit" column="BELONG_UNIT_NAME"/>
 		<result property="fundTrustRemark" column="TRUST_REMARK"/>
+		<result property="leaveDate" column="LEAVE_DATE"/>
+		<result property="reduceReason" column="REDUCE_REASON"/>
 
 	</resultMap>
 	<!--tDispatchInfo 社保花名册数据查询-->
@@ -1065,7 +1067,9 @@
 		f.FUND_PROVINCE,
 		f.FUND_CITY,
 		f.FUND_TOWN,
-		a.TRUST_REMARK
+		a.TRUST_REMARK,
+		a.LEAVE_DATE,
+		a.REDUCE_REASON
 		<include refid="where_getFundRecord"/>
 	</select>