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/entity/TEmpContractAlert.java

@@ -247,6 +247,28 @@ public class TEmpContractAlert extends BaseEntity {
 	@ExcelIgnore
 	private String contractId;
 
+	/**
+	 * 客户id
+	 */
+	@Schema(description = "客户id")
+	private String unitId;
+	/**
+	 * 客户名称
+	 */
+	@Schema(description = "客户名称")
+	private String unitName;
+	/**
+	 * 客户编码
+	 */
+	@Schema(description = "客户编码")
+	private String unitNo;
+	/**
+	 * 手机号码
+	 */
+	@Schema(description = "手机号码")
+	private String empPhone;
+
+
 	/**
 	 * 合同截止日期
 	 */

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

@@ -237,6 +237,9 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 		if (Common.isNotNull(entity.getDaysDue())){
 			wrapper.eq(TEmpContractAlert::getDaysDue,entity.getDaysDue());
 		}
+		if (Common.isNotNull(entity.getUnitId())){
+			wrapper.eq(TEmpContractAlert::getUnitId, entity.getUnitId());
+		}
 		return wrapper;
 	}
 	/**
@@ -348,6 +351,12 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 		}else {
 			alert.setFirstAlertTime(new Date());
 		}
+		// 2023-4-3 09:38:21 hgw 添加
+		alert.setUnitId(contract.getCustomerId());
+		alert.setUnitName(contract.getSubjectUnit());
+		alert.setUnitNo(contract.getUnitNo());
+		alert.setEmpPhone(employeeInfo.getEmpPhone());
+
 		alert.setCreateBy(contract.getCreateBy());
 		alert.setCreateName(contract.getCreateName());
 		alert.setContractId(contract.getId());