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/EmployeeContractExportVO.java

@@ -141,32 +141,6 @@ 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 = "业务细分不能为空")
@@ -235,6 +209,32 @@ public class EmployeeContractExportVO implements Serializable {
 	@Schema(description = "归档状态", name = "isFile")
 	private String isFile;
 
+	/**
+	 * 合同岗位
+	 */
+	@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("创建人")
 	private String createName;

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java

@@ -676,6 +676,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 				}
 			}
 			tEmployeeContractInfo.setAuditUserName(user.getNickname());
+			tEmployeeContractInfo.setContractNo(contractInfo.getContractNo());
 			// 不是待提交，记录审核记录
 			this.setAuditInfo(tEmployeeContractInfo);
 			this.updateById(tEmployeeContractInfo);
@@ -1352,6 +1353,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 			tEmployeeContractInfo = new TEmployeeContractInfo();
 			tEmployeeContractInfo.setAuditRemark(contractAuditVo.getAuditRemark());
 			tEmployeeContractInfo.setAuditStatus(contractAuditVo.getAuditStatus());
+			tEmployeeContractInfo.setContractNo(contract.getContractNo());
 			tEmployeeContractInfo.setAuditUserName(user.getNickname());
 			tEmployeeContractInfo.setId(contract.getId());
 			if (tEmployeeContractInfo.getAuditStatus() == CommonConstants.dingleDigitIntArray[2]) {