Commit cc688308 authored by hongguangwu's avatar hongguangwu

Merge branch 'develop'

parents a860d87d c831c013
......@@ -66,14 +66,14 @@ public class TGzOfferInfo extends BaseEntity {
/**
* Offer状态
* (3:待发送Offer,4:待接受Offer,5:拒绝Offer,7:接受offer,9:候选人填写信息,10:取消offer,
* (3:待发送Offer,4:待接受Offer,5:拒绝Offer,6:接受offer,9:候选人填写信息,10:取消offer,
* 12:候选人信息审核,13:待签署,8:合同审核通过,99:已归档,98:信息待收集,97:候选人审核通过)
*/
@ExcelAttribute(name = "Offer状态(3:待发送Offer,4:待接受Offer,5:拒绝Offer,7:接受offer,9:候选人填写信息,10:取消offer,12:候选人信息审核,13:待签署,8:合同审核通过。99:已归档)", isNotEmpty = true, errorInfo = "Offer状态(3:待发送Offer,4:待接受Offer,5:拒绝Offer,7:接受offer,9:候选人填写信息,10:取消offer,12:候选人信息审核,13:待签署,8:合同审核通过。99:已归档)不能为空", maxLength = 2)
@NotBlank(message = "Offer状态(3:待发送Offer,4:待接受Offer,5:拒绝Offer,7:接受offer,9:候选人填写信息,10:取消offer,12:候选人信息审核,13:待签署,8:合同审核通过。99:已归档)不能为空")
@Length(max = 2, message = "Offer状态(3:待发送Offer,4:待接受Offer,5:拒绝Offer,7:接受offer,9:候选人填写信息,10:取消offer,12:候选人信息审核,13:待签署,8:合同审核通过。99:已归档)不能超过2个字符")
@ExcelProperty("Offer状态(3:待发送Offer,4:待接受Offer,5:拒绝Offer,7:接受offer,9:候选人填写信息,10:取消offer,12:候选人信息审核,13:待签署,8:合同审核通过。99:已归档)")
@Schema(description = "Offer状态(3:待发送Offer,4:待接受Offer,5:拒绝Offer,7:接受offer,9:候选人填写信息,10:取消offer,12:候选人信息审核,13:待签署,8:合同审核通过。99:已归档)")
@ExcelAttribute(name = "Offer状态(3:待发送Offer,4:待接受Offer,5:拒绝Offer,6:接受offer,9:候选人填写信息,10:取消offer,12:候选人信息审核,13:待签署,8:合同审核通过。99:已归档)", isNotEmpty = true, errorInfo = "Offer状态(3:待发送Offer,4:待接受Offer,5:拒绝Offer,7:接受offer,9:候选人填写信息,10:取消offer,12:候选人信息审核,13:待签署,8:合同审核通过。99:已归档)不能为空", maxLength = 2)
@NotBlank(message = "Offer状态(3:待发送Offer,4:待接受Offer,5:拒绝Offer,6:接受offer,9:候选人填写信息,10:取消offer,12:候选人信息审核,13:待签署,8:合同审核通过。99:已归档)不能为空")
@Length(max = 2, message = "Offer状态(3:待发送Offer,4:待接受Offer,5:拒绝Offer,6:接受offer,9:候选人填写信息,10:取消offer,12:候选人信息审核,13:待签署,8:合同审核通过。99:已归档)不能超过2个字符")
@ExcelProperty("Offer状态(3:待发送Offer,4:待接受Offer,5:拒绝Offer,6:接受offer,9:候选人填写信息,10:取消offer,12:候选人信息审核,13:待签署,8:合同审核通过。99:已归档)")
@Schema(description = "Offer状态(3:待发送Offer,4:待接受Offer,5:拒绝Offer,6:接受offer,9:候选人填写信息,10:取消offer,12:候选人信息审核,13:待签署,8:合同审核通过。99:已归档)")
private String offerStatus;
/**
* Offer短信通知状态( 0:已发送;1:未发送)
......
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime;
/**
* 瓜子系统交互任务跟进表
*
* @author cyx
* @date 2025-07-09 17:03:50
*/
@Data
@TableName("t_gz_push_entry")
@EqualsAndHashCode(callSuper = true)
@Schema(description = "瓜子系统交互任务跟进表")
public class TGzPushEntry extends BaseEntity {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ExcelProperty("主键")
@Schema(description = "主键")
private String id;
/**
* 流程ID(瓜子推过来的主键)
*/
@ExcelAttribute(name = "流程ID(瓜子推过来的主键)", isNotEmpty = true, errorInfo = "流程ID(瓜子推过来的主键)不能为空", maxLength = 32)
@NotBlank(message = "流程ID(瓜子推过来的主键)不能为空")
@Length(max = 32, message = "流程ID(瓜子推过来的主键)不能超过32个字符")
@ExcelProperty("流程ID(瓜子推过来的主键)")
@Schema(description = "流程ID(瓜子推过来的主键)")
private String bizId;
/**
* 交互任务类型(4:待接受Offer,5:拒绝Offer,6:接受offer,9:候选人填写信息,10:取消offer,12:候选人信息审核,97:档案信息推送,13:待签署,8:合同信息推送,99:合同附件推送)
*/
@ExcelAttribute(name = "交互任务类型(4:待接受Offer,5:拒绝Offer,6:接受offer,9:候选人填写信息,10:取消offer,12:候选人信息审核,97:档案信息推送,13:待签署,8:合同信息推送,99:合同附件推送)", isNotEmpty = true, errorInfo = "交互任务类型(4:待接受Offer,5:拒绝Offer,7:接受offer,9:候选人填写信息,10:取消offer,12:候选人信息审核,97:档案信息推送,13:待签署,8:合同信息推送,99:合同附件推送)不能为空", maxLength = 2)
@NotBlank(message = "交互任务类型(4:待接受Offer,5:拒绝Offer,6:接受offer,9:候选人填写信息,10:取消offer,12:候选人信息审核,97:档案信息推送,13:待签署,8:合同信息推送,99:合同附件推送)不能为空")
@Length(max = 2, message = "交互任务类型(4:待接受Offer,5:拒绝Offer,7:接受offer,9:候选人填写信息,10:取消offer,12:候选人信息审核,97:档案信息推送,13:待签署,8:合同信息推送,99:合同附件推送)不能超过2个字符")
@ExcelProperty("交互任务类型(4:待接受Offer,5:拒绝Offer,6:接受offer,9:候选人填写信息,10:取消offer,12:候选人信息审核,97:档案信息推送,13:待签署,8:合同信息推送,99:合同附件推送)")
@Schema(description = "交互任务类型(4:待接受Offer,5:拒绝Offer,6:接受offer,9:候选人填写信息,10:取消offer,12:候选人信息审核,97:档案信息推送,13:待签署,8:合同信息推送,99:合同附件推送)")
private String taskType;
/**
* 推送状态(0:推送成功1:推送失败2:待推送3 推送中)
*/
@ExcelAttribute(name = "推送状态(0:推送成功1:推送失败2:待推送)", isNotEmpty = true, errorInfo = "推送状态(0:推送成功1:推送失败2:待推送)不能为空", maxLength = 1)
@NotBlank(message = "推送状态(0:推送成功1:推送失败2:待推送)不能为空")
@Length(max = 1, message = "推送状态(0:推送成功1:推送失败2:待推送)不能超过1个字符")
@ExcelProperty("推送状态(0:推送成功1:推送失败2:待推送)")
@Schema(description = "推送状态(0:推送成功1:推送失败2:待推送3 推送中)")
private String pushStatus;
/**
* 推送时间
*/
@ExcelAttribute(name = "推送时间", isDate = true)
@ExcelProperty("推送时间")
@Schema(description = "推送时间")
private LocalDateTime pushTime;
/**
* 失败原因
*/
@ExcelAttribute(name = "失败原因", maxLength = 512)
@Length(max = 512, message = "失败原因不能超过512个字符")
@ExcelProperty("失败原因")
@Schema(description = "失败原因")
private String failReason;
/**
* 推送报文,JSON格式的字符串
*/
@ExcelAttribute(name = "推送报文,JSON格式的字符串")
@ExcelProperty("推送报文,JSON格式的字符串")
@Schema(description = "推送报文,JSON格式的字符串")
private String pushData;
/**
* 对方响应的报文,JSON格式的字符串
*/
@ExcelAttribute(name = "对方响应的报文,JSON格式的字符串")
@ExcelProperty("对方响应的报文,JSON格式的字符串")
@Schema(description = "对方响应的报文,JSON格式的字符串")
private String responseData;
/**
* 删除标记
*/
@ExcelAttribute(name = "删除标记", maxLength = 1)
@Length(max = 1, message = "删除标记不能超过1个字符")
@ExcelProperty("删除标记")
@Schema(description = "删除标记")
private String delFlag;
/**
* 姓名
*/
@ExcelAttribute(name = "姓名", maxLength = 50)
@Length(max = 50, message = "姓名不能超过50个字符")
@ExcelProperty("姓名")
@Schema(description = "姓名")
private String name;
/**
* 证件号码
*/
@ExcelAttribute(name = "证件号码", maxLength = 50)
@Length(max = 50, message = "证件号码不能超过50个字符")
@ExcelProperty("证件号码")
@Schema(description = "证件号码")
private String nationalId;
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import lombok.Data;
/**
* 瓜子档案表_推送瓜子附件(名称类型等信息,不是上传文件哦!)
*
* @author hgw
* @date 2025-7-10 10:19:40
*/
@Data
public class TGzEmpInfoPushGzAttaVo {
// 4.2.5、员工附件补充接口
private String bizId;
// 附件类型:参考字典
private String attachType;
// 文件ID
private String fileId;
// 文件名称,带后缀
private String fileName;
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import lombok.Data;
/**
* 瓜子档案表_推送瓜子合同
*
* @author hgw
* @date 2025-7-10 10:19:40
*/
@Data
public class TGzEmpInfoPushGzContractVo {
private String bizId;
private String contractNum;
private String sginatureMethod;
private String contractType;
private String sginatureType;
private String sginatureDt;
private String contractBeginDt;
private String contractEndDt;
private String contrctExpEndDt;
private String probation;
private String prcExpDt;
private String probationDt;
private String neeProviderId;
private String workLocation;
private String fileId;
private String fileName;
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import lombok.Data;
import java.util.List;
/**
* 瓜子档案表_推送瓜子附件(文件大内容)
*
* @author hgw
* @date 2025-7-10 10:19:40
*/
@Data
public class TGzEmpInfoPushGzFileVo {
// 4.2.3、员工文件信息上传接口
private String bizId;
// 文件名称带后缀
private String fileName;
// 文件数据 Base64
private String fileData;
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import lombok.Data;
import java.util.List;
/**
* 瓜子档案表_推送瓜子的字段
*
* @author hgw
* @date 2025-7-10 10:19:40
*/
@Data
public class TGzEmpInfoPushGzVo {
private String bizId;
private String name;
private String birthdate;
private String sex;
private String startDate;
private String country;
private String ethnicGrpCd;
private String nativePlace;
private String blooeType;
private String constel;
private String phone;
private String email;
private String marStatus;
private String politicalSta;
private String insuranceSta;
private String driverType;
private String driverLicenExp;
private String nationalId;
private String nationalIdType;
private String nidStartDate;
private String nidExpiryDate;
private String persistFlag;
private String hukouType;
private String hukouProvince;
private String hukouCity;
private String hukouCounty;
private String hukouDetail;
private TGzEmpInfoPushGzVoAdress address;
private TGzEmpInfoPushGzVoBank bankAccount;
private List<TGzEmpInfoPushGzVoFamily> family;
private List<TGzEmpInfoPushGzVoContact> emergContact;
private List<TGzEmpInfoPushGzVoWork> workExp;
private List<TGzEmpInfoPushGzVoEducation> eduExp;
private List<TGzEmpInfoPushGzVoSkill> skill;
private List<TGzEmpInfoPushGzVoAtta> attach;
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import lombok.Data;
/**
* 瓜子档案表_推送瓜子的字段
*
* @author hgw
* @date 2025-7-10 10:19:40
*/
@Data
public class TGzEmpInfoPushGzVoAdress {
private String addressType;
private String stateId;
private String cityId;
private String countyId;
private String address;
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import lombok.Data;
/**
* 瓜子档案表_推送瓜子的字段
*
* @author hgw
* @date 2025-7-10 10:19:40
*/
@Data
public class TGzEmpInfoPushGzVoAtta {
private String attachType;
private String fileId;
private String fileName;
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import lombok.Data;
/**
* 瓜子档案表_推送瓜子的字段
*
* @author hgw
* @date 2025-7-10 10:19:40
*/
@Data
public class TGzEmpInfoPushGzVoBank {
private String accountType;
private String bankCd;
private String cnapsId;
private String bankName;
private String accountEcId;
private String accountName;
private String country;
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import lombok.Data;
/**
* 瓜子档案表_推送瓜子的字段
*
* @author hgw
* @date 2025-7-10 10:19:40
*/
@Data
public class TGzEmpInfoPushGzVoContact {
private String emergRelation;
private String emergName;
private String phone;
private String address;
private String primaryNid;
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import lombok.Data;
/**
* 瓜子档案表_推送瓜子的字段
*
* @author hgw
* @date 2025-7-10 10:19:40
*/
@Data
public class TGzEmpInfoPushGzVoEducation {
private String eduType;
private String eduDergee;
private String eduQual;
private String school;
private String startDate;
private String endDate;
private String graduateType;
private String major;
private String highEduDegreeFlag;
private String highEduQualFlag;
private String firstDegreeFlag;
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import lombok.Data;
/**
* 瓜子档案表_推送瓜子的字段
*
* @author hgw
* @date 2025-7-10 10:19:40
*/
@Data
public class TGzEmpInfoPushGzVoFamily {
private String famMemRelation;
private String name;
private String phone;
private String address;
private String company;
private String gzEmeFlag;
private String jobCode;
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import lombok.Data;
/**
* 瓜子档案表_推送瓜子的字段
*
* @author hgw
* @date 2025-7-10 10:19:40
*/
@Data
public class TGzEmpInfoPushGzVoSkill {
private Integer orderId;
private String skillName;
private String skillDate;
private String skillOrg;
private String skillLevel;
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import lombok.Data;
/**
* 瓜子档案表_推送瓜子的字段
*
* @author hgw
* @date 2025-7-10 10:19:40
*/
@Data
public class TGzEmpInfoPushGzVoWork {
private String employer;
private String startDate;
private String endDate;
private String deptDescr;
private String endingTitle;
private String adminName;
private String phone;
private String email;
private String comment;
}
......@@ -36,48 +36,19 @@ import java.math.BigDecimal;
@ColumnWidth(15)
public class TGzOfferInfoExportDetailVo implements Serializable {
@ExcelProperty("流程ID")
private String bizId;
@ExcelProperty("人员类别编码")
private String emplType;
// 2025-7-24 16:18:55 新顺序:
// 人员类别名称 姓名 姓名拼音 证件类型描述 证件号码 性别 个人手机号 个人邮箱 预计入职日期 部门名称 职务描述 直接上级姓名 工作地点描述 社保缴纳地
@ExcelProperty("人员类别名称")
private String emplTypeDescr;
/**
* 外签类型:A: 洼地外签/ B:属地外签
*/
@ExcelAttribute(name = "外签类型", isDataId = true, dataType = ExcelAttributeConstants.GZ_OUT_SGIN_TYPE)
@ExcelProperty("外签类型")
private String outSginType;
/**
* 合同公司主体:公司信息表
*/
@ExcelProperty("合同公司主体")
private String company;
@ExcelProperty("姓名")
private String name;
@ExcelProperty("姓名拼音")
private String nameAc;
@ExcelProperty("姓氏拼音")
private String lastNameAc;
@ExcelProperty("名字拼音")
private String firstNameAc;
@ExcelProperty("国籍编码")
private String country;
@ExcelProperty("国籍描述")
private String countryDescr;
@ExcelProperty("证件类型编码")
private String nationalIdType;
@ExcelProperty("证件类型描述")
private String nationalIdTypeDescr;
@ExcelProperty("证件号码")
private String nationalId;
@ExcelAttribute(name = "性别", isDataId = true, dataType = ExcelAttributeConstants.GZ_SEX)
@ExcelProperty("性别")
private String sex;
......@@ -85,18 +56,21 @@ public class TGzOfferInfoExportDetailVo implements Serializable {
private String phone;
@ExcelProperty("个人邮箱")
private String email;
@ExcelProperty("直接上级姓名")
private String supervisorName;
@ExcelProperty("职务描述")
private String jobcodeDescr;
@ExcelProperty("工作地点")
private String workLocation;
@ExcelProperty("工作地点描述")
private String workLocationDescr;
@ExcelProperty("预计入职日期")
private String expEntryDate;
@ExcelProperty("部门名称")
private String deptName;
@ExcelProperty("职务描述")
private String jobcodeDescr;
@ExcelProperty("直接上级姓名")
private String supervisorName;
@ExcelProperty("工作地点描述")
private String workLocationDescr;
@ExcelProperty("社保缴纳地")
private String socialInsuranceLocationDescr;
// 基本工资 绩效工资 年终奖月数 流程ID 人员类别编码 外签类型 合同公司主体 姓氏拼音 名字拼音 国籍编码 国籍描述 证件类型编码 工作地点 社保缴纳地编码
/**
* 基本工资,两位小数
*/
......@@ -109,10 +83,38 @@ public class TGzOfferInfoExportDetailVo implements Serializable {
private BigDecimal perfomPay;
@ExcelProperty("年终奖月数")
private Integer yearBonusMonth;
@ExcelProperty("流程ID")
private String bizId;
@ExcelProperty("人员类别编码")
private String emplType;
/**
* 外签类型:A: 洼地外签/ B:属地外签
*/
@ExcelAttribute(name = "外签类型", isDataId = true, dataType = ExcelAttributeConstants.GZ_OUT_SGIN_TYPE)
@ExcelProperty("外签类型")
private String outSginType;
/**
* 合同公司主体:公司信息表
*/
@ExcelProperty("合同公司主体")
private String company;
@ExcelProperty("姓氏拼音")
private String lastNameAc;
@ExcelProperty("名字拼音")
private String firstNameAc;
@ExcelProperty("国籍编码")
private String country;
@ExcelProperty("国籍描述")
private String countryDescr;
@ExcelProperty("证件类型编码")
private String nationalIdType;
@ExcelProperty("工作地点")
private String workLocation;
@ExcelProperty("社保缴纳地编码")
private String socialInsuranceLocation;
@ExcelProperty("社保缴纳地")
private String socialInsuranceLocationDescr;
// 社保基数 公积金基数 是否转正后缴纳公积金 申请人邮箱 接收瓜子Offer时间 Offer短信通知状态 Offer状态
@ExcelProperty("社保基数")
private BigDecimal socialInsuranceBase;
@ExcelProperty("公积金基数")
......@@ -134,4 +136,5 @@ public class TGzOfferInfoExportDetailVo implements Serializable {
@ExcelProperty("Offer状态")
private String offerStatus;
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzPushEntry;
import lombok.Data;
/**
* 瓜子系统交互任务跟进表
*
* @author cyx
* @date 2025-07-09 17:03:50
*/
@Data
public class TGzPushEntrySearchVo extends TGzPushEntry {
/**
* 查询使用:推送时间开始
*/
private String createTimeStart;
/**
* 查询使用:推送时间结束
*/
private String createTimeEnd;
/**
* 查询使用:推送状态数组
*/
private String[] pushStatusArray;
}
......@@ -28,19 +28,25 @@ import com.yifu.cloud.plus.v1.yifu.archives.service.TGzEmpInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TGzOfferInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.utils.GZSign;
import com.yifu.cloud.plus.v1.yifu.archives.utils.ReturnGz;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoPushGzAttaVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoPushGzContractVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoPushGzFileVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoPushGzVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.OSSUtil;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* 瓜子交互控制器
......@@ -65,6 +71,9 @@ public class TGzController {
private RestTemplate restTemplate = new RestTemplate();
@Autowired
private OSSUtil ossUtil;
/**
* @Description: 接收瓜子推送过来的Offer信息
* @Author: hgw
......@@ -139,7 +148,7 @@ public class TGzController {
* @return: boolean
**/
@GetMapping("/updateGzOfferStatus")
public boolean updateGzOfferStatus(@RequestParam String bizId, @RequestParam Integer status
public Map<String,String> updateGzOfferStatus(@RequestParam String bizId, @RequestParam Integer status
, @RequestParam(required = false) String phone, @RequestParam(required = false) String email
, @RequestParam(required = false) String entryDate) {
Map<String, Object> params = new HashMap<>();
......@@ -154,7 +163,7 @@ public class TGzController {
params.put("email", email);
params.put("entryDate", entryDate);
return gzConfig.updateGzOfferStatus(restTemplate, params, sortedParams);
return gzConfig.updateGzOfferStatus(restTemplate, params);
}
/**
......@@ -164,7 +173,7 @@ public class TGzController {
* @return: boolean
**/
@GetMapping("/pushGzEmpInfo")
public boolean pushGzEmpInfo(@RequestParam(required = false) String gzEmpId) {
public Map<String,String> pushGzEmpInfo(@RequestParam(required = false) String gzEmpId) {
Map<String, Object> params = new HashMap<>();
params.put("appsecret", gzConfig.getAppsecret());
params.put("tid", gzConfig.getTid());
......@@ -174,8 +183,8 @@ public class TGzController {
// 653497199507262524 李丽
gzEmpId = "1942036120125800449";
}
TGzEmpInfo a = tGzEmpInfoService.getById(gzEmpId);
return gzConfig.pushGzEmpInfo(restTemplate, a, sortedParams);
TGzEmpInfoPushGzVo a = tGzEmpInfoService.getGzEmpInfoToPushGzById(gzEmpId);
return gzConfig.pushGzEmpInfo(restTemplate, a);
}
/**
* @Description: 3、合同信息回推接口;
......@@ -184,47 +193,82 @@ public class TGzController {
* @return: boolean
**/
@GetMapping("/pushGzEmpContract")
public boolean pushGzEmpContract(@RequestParam(required = false) String empContractId) {
public Map<String,String> pushGzEmpContract(@RequestParam(required = false) String gzEmpId) {
Map<String, Object> params = new HashMap<>();
params.put("appsecret", gzConfig.getAppsecret());
params.put("tid", gzConfig.getTid());
GZSign.addSignature(params, gzConfig.getAppkey(), gzConfig.getAppsecret());
String sortedParams = GZSign.getEncodeString(params);
if (Common.isEmpty(empContractId)) {
if (Common.isEmpty(gzEmpId)) {
// 653497199507262524 李丽
empContractId = "1942036120125800449";
gzEmpId = "1942036120125800449";
}
TEmpContactInfo a = tEmpContactInfoService.getById(empContractId);
return gzConfig.pushGzEmpContract(restTemplate, a, sortedParams);
TGzEmpInfoPushGzContractVo a = tGzEmpInfoService.getGzEmpInfoToPushGzByIdContract(gzEmpId);
return gzConfig.pushGzEmpContract(restTemplate, a);
}
/**
* @Description: 4、合同附件推送接口;
* @Description: 4.2.3、员工文件信息上传接口
* @Author: hgw
* @Date: 2025-7-11 11:11:11
* @return: boolean
**/
@GetMapping("/pushGzEmpContractFile")
public boolean pushGzEmpContractFile(@RequestParam(required = false) String empContractId) {
@GetMapping("/pushGzEmpInfoFile")
public Map<String, String> pushGzEmpInfoFile(@RequestParam(required = false) String gzEmpId) {
Map<String, Object> params = new HashMap<>();
params.put("appsecret", gzConfig.getAppsecret());
params.put("tid", gzConfig.getTid());
GZSign.addSignature(params, gzConfig.getAppkey(), gzConfig.getAppsecret());
String sortedParams = GZSign.getEncodeString(params);
if (Common.isEmpty(empContractId)) {
if (Common.isEmpty(gzEmpId)) {
// 653497199507262524 李丽
empContractId = "1942036120125800449";
gzEmpId = "1942036120125800449";
}
TGzEmpInfo a = tGzEmpInfoService.getById(empContractId);
return gzConfig.pushGzEmpInfo(restTemplate, a, sortedParams);
List<TAttaInfo> aList = tAttaInfoService.getTAttaInfoListByDoMainId(gzEmpId);
TGzEmpInfoPushGzFileVo vo;
TGzEmpInfo tGzEmpInfo = tGzEmpInfoService.getById(gzEmpId);
Map<String, String> returnMap = new HashMap<>();
if (tGzEmpInfo != null && Common.isNotNull(tGzEmpInfo.getBizId())) {
String bizId = tGzEmpInfo.getBizId();
URL url;
InputStream inStream = null;
String base64String;
for (TAttaInfo a : aList) {
// 证件正面
if (Common.isNotNull(a.getRelationType()) && "NID_A".equals(a.getRelationType()) && Common.isNotNull(a.getAttaSrc())) {
url = ossUtil.getObjectUrl(null, a.getAttaSrc());
try {
inStream = url.openStream();
base64String = Base64.getEncoder().encodeToString(IOUtils.toByteArray(inStream));
vo = new TGzEmpInfoPushGzFileVo();
vo.setBizId(bizId);
vo.setFileName(a.getAttaName());
// 文件数据 Base64
vo.setFileData(base64String);
returnMap.put(a.getId(), gzConfig.pushGzFile(restTemplate, vo));
} catch (Exception e) {
log.info("瓜子附件推送失败!");
} finally {
if (null != inStream) {
try {
inStream.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
}
}
return returnMap;
}
/**
* @Description: 5:员工文件信息上传接口
* @Description: 4.2.5、员工附件补充接口
* @Author: hgw
* @Date: 2025-7-11 11:11:11
* @return: boolean
**/
@GetMapping("/pushGzEmpInfoFile")
public boolean pushGzEmpInfoFile(@RequestParam(required = false) String gzEmpId) {
@GetMapping("/pushGzEmpInfoAtta")
public Map<String, String> pushGzEmpInfoAtta(@RequestParam(required = false) String gzEmpId) {
Map<String, Object> params = new HashMap<>();
params.put("appsecret", gzConfig.getAppsecret());
params.put("tid", gzConfig.getTid());
......@@ -235,22 +279,55 @@ public class TGzController {
gzEmpId = "1942036120125800449";
}
List<TAttaInfo> aList = tAttaInfoService.getTAttaInfoListByDoMainId(gzEmpId);
List<Map<String, Object>> attaMapList = new ArrayList<>();
Map<String, Object> attaMap;
TGzEmpInfo tGzEmpInfo;
for (TAttaInfo a : aList) {
tGzEmpInfo = tGzEmpInfoService.getById(a.getDomainId());
if (tGzEmpInfo != null && Common.isNotNull(tGzEmpInfo.getBizId())) {
attaMap = new HashMap<>();
attaMap.put("bizId", tGzEmpInfo.getBizId());
// TODO-文件名称带后缀
attaMap.put("fileName", a.getAttaName());
// TODO-文件数据 Base64
attaMap.put("fileData", null);
attaMapList.add(attaMap);
TGzEmpInfoPushGzFileVo vo;
TGzEmpInfoPushGzAttaVo attaVo;
TGzEmpInfo tGzEmpInfo = tGzEmpInfoService.getById(gzEmpId);
Map<String, String> returnMap = new HashMap<>();
if (tGzEmpInfo != null && Common.isNotNull(tGzEmpInfo.getBizId())) {
String bizId = tGzEmpInfo.getBizId();
String fileId;
URL url;
InputStream inStream = null;
String base64String;
// 先上传附件,再推送atta与类型
for (TAttaInfo a : aList) {
// 获取合同附件
if (Common.isNotNull(a.getRelationType()) && "CONTRACT".equals(a.getRelationType()) && Common.isNotNull(a.getAttaSrc())) {
url = ossUtil.getObjectUrl(null, a.getAttaSrc());
try {
inStream = url.openStream();
base64String = Base64.getEncoder().encodeToString(IOUtils.toByteArray(inStream));
vo = new TGzEmpInfoPushGzFileVo();
vo.setBizId(bizId);
vo.setFileName(a.getAttaName());
// 文件数据 Base64
vo.setFileData(base64String);
fileId = gzConfig.pushGzFile(restTemplate, vo);
attaVo = new TGzEmpInfoPushGzAttaVo();
attaVo.setBizId(bizId);
attaVo.setFileId(fileId);
attaVo.setAttachType(a.getRelationType());
attaVo.setFileName(a.getAttaName());
gzConfig.pushGzAttach(restTemplate, attaVo);
//returnMap.put(a.getId(), gzConfig.pushGzAttach(restTemplate, attaVo));
} catch (Exception e) {
log.info("瓜子附件推送失败!");
} finally {
if (null != inStream) {
try {
inStream.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
}
}
return gzConfig.pushGzFileList(restTemplate, attaMapList, sortedParams);
return returnMap;
}
......
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzPushEntry;
import com.yifu.cloud.plus.v1.yifu.archives.service.TGzPushEntryService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TGzPushEntrySearchVo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
/**
* 瓜子系统交互任务跟进表
*
* @author cyx
* @date 2025-07-09 17:03:50
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/tgzpushentry" )
@Tag(name = "瓜子系统交互任务跟进表管理")
public class TGzPushEntryController {
private final TGzPushEntryService tGzPushEntryService;
/**
* 简单分页查询
* @param page 分页对象
* @param tGzPushEntry 瓜子系统交互任务跟进表
* @return
*/
@Operation(description = "简单分页查询")
@GetMapping("/page")
public R<IPage<TGzPushEntrySearchVo>> getTGzPushEntryPage(Page<TGzPushEntry> page, TGzPushEntrySearchVo tGzPushEntry) {
return new R<>(tGzPushEntryService.getTGzPushEntryPage(page,tGzPushEntry));
}
/**
* 任务推送重试
* @param tGzPushEntry 瓜子系统交互任务跟进表
* @return R
*/
@Operation(summary = "任务推送重试")
@SysLog("任务推送重试" )
@PostMapping("/retry")
public R<String> retryPushEntry(@RequestBody TGzPushEntry tGzPushEntry) {
return tGzPushEntryService.retryPushEntry(tGzPushEntry);
}
}
......@@ -83,4 +83,18 @@ public interface TGzEmpInfoMapper extends BaseMapper<TGzEmpInfo> {
int getTGzEmpInfoCountSkill(@Param("tGzEmpInfo") TGzEmpInfoSearchVo tGzEmpInfo);
List<TGzEmpInfoExportSkill> getTGzEmpInfoListSkill(@Param("tGzEmpInfo") TGzEmpInfoSearchVo tGzEmpInfo);
// 推送瓜子档案信息给瓜子
TGzEmpInfoPushGzVo getGzEmpInfoToPushGzById(@Param("gzEmpId") String gzEmpId);
TGzEmpInfoPushGzVoAdress getGzEmpInfoToPushGzByIdAdress(@Param("gzEmpId") String gzEmpId);
TGzEmpInfoPushGzVoBank getGzEmpInfoToPushGzByIdBank(@Param("gzEmpId") String gzEmpId);
List<TGzEmpInfoPushGzVoFamily> getGzEmpInfoToPushGzByIdFamily(@Param("gzEmpId") String gzEmpId);
List<TGzEmpInfoPushGzVoContact> getGzEmpInfoToPushGzByIdContact(@Param("gzEmpId") String gzEmpId);
List<TGzEmpInfoPushGzVoWork> getGzEmpInfoToPushGzByIdWork(@Param("gzEmpId") String gzEmpId);
List<TGzEmpInfoPushGzVoEducation> getGzEmpInfoToPushGzByIdEducation(@Param("gzEmpId") String gzEmpId);
List<TGzEmpInfoPushGzVoSkill> getGzEmpInfoToPushGzByIdSkill(@Param("gzEmpId") String gzEmpId);
List<TGzEmpInfoPushGzVoAtta> getGzEmpInfoToPushGzByIdAtta(@Param("gzEmpId") String gzEmpId);
// 推送瓜子档案里的合同
TGzEmpInfoPushGzContractVo getGzEmpInfoToPushGzByIdContract(@Param("gzEmpId") String gzEmpId);
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzPushEntry;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TGzPushEntrySearchVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 瓜子系统交互任务跟进表
*
* @author cyx
* @date 2025-07-09 17:03:50
*/
@Mapper
public interface TGzPushEntryMapper extends BaseMapper<TGzPushEntry> {
/**
* 瓜子系统交互任务跟进表简单分页查询
*
* @param tGzPushEntry 瓜子系统交互任务跟进表
* @return
*/
IPage<TGzPushEntrySearchVo> getTGzPushEntryPage(Page<TGzPushEntry> page, @Param("tGzPushEntry") TGzPushEntrySearchVo tGzPushEntry);
}
......@@ -37,4 +37,13 @@ public interface TGzContractService {
*/
void saveContractInfoToGzEmpInfo(TEmployeeContractInfo contractInfo, Integer offerId, String workLocation, String workLocationDescr);
/**
* 存合同附件到瓜子档案里
* chenyx
*
* @param offerId offerId
* @param contractId 合同ID
*/
void saveContractAtta(Integer offerId, String contractId);
}
......@@ -23,6 +23,8 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzEmpInfo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzOfferInfo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoPushGzContractVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoPushGzVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoSearchVo;
......@@ -75,4 +77,21 @@ public interface TGzEmpInfoService extends IService<TGzEmpInfo> {
**/
R<String> saveEmpInfoByGz(TGzOfferInfo offerInfo);
/**
* @param gzEmpId
* @Description: 推送给瓜子的档案信息
* @Author: hgw
* @Date: 2025/7/10 15:33
* @return: com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoPushGzVo
**/
TGzEmpInfoPushGzVo getGzEmpInfoToPushGzById(String gzEmpId);
/**
* @param gzEmpId
* @Description: 推送给瓜子的合同信息
* @Author: hgw
* @Date: 2025/7/10 17:33
* @return: com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoPushGzVo
**/
TGzEmpInfoPushGzContractVo getGzEmpInfoToPushGzByIdContract(String gzEmpId);
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzPushEntry;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TGzPushEntrySearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
/**
* 瓜子系统交互任务跟进表
*
* @author cyx
* @date 2025-07-09 17:03:50
*/
public interface TGzPushEntryService extends IService<TGzPushEntry> {
/**
* 瓜子系统交互任务跟进表简单分页查询
* @param tGzPushEntry 瓜子系统交互任务跟进表
* @return
*/
IPage<TGzPushEntrySearchVo> getTGzPushEntryPage(Page<TGzPushEntry> page, TGzPushEntrySearchVo tGzPushEntry);
/**
* 任务推送重试
* @param tGzPushEntry 瓜子系统交互任务跟进表
* @return R
*/
R<String> retryPushEntry(TGzPushEntry tGzPushEntry);
/**
* 新增推送任务(异步)
* @param tGzPushEntry 瓜子系统交互任务跟进表
*/
void addPushEntry(TGzPushEntry tGzPushEntry);
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.service;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzPushEntry;
/**
* 瓜子系统交互任务处理异步任务类
*
* @author chenyuxi
* @date 2025-07-11
* @since 1.7.13
*/
public interface TGzPushHandleService {
/**
* 处理异步的推送任务
* @param tGzPushEntry 瓜子系统交互任务跟进表
*/
void handlePushEntry(TGzPushEntry tGzPushEntry);
}
......@@ -186,7 +186,7 @@ public class LGuaziOfferRecordServiceImpl extends ServiceImpl<LGuaziOfferRecordM
statusMap.put("3","待发送Offer");
statusMap.put("4","待接受Offer");
statusMap.put("5","拒绝Offer");
statusMap.put("7","接受offer");
statusMap.put("6","接受offer");
statusMap.put("9","候选人填写信息");
statusMap.put("10","取消offer");
statusMap.put("12","候选人信息审核");
......
......@@ -285,7 +285,7 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
.eq(TEmployeeContractInfo::getInUse,CommonConstants.ZERO_STRING)
.eq(TEmployeeContractInfo::getContractType,CommonConstants.ONE_STRING)
.eq(TEmployeeContractInfo::getWorkFlag,CommonConstants.ZERO_STRING)
.ne(TEmployeeContractInfo::getSituation,"续签")
.ne(TEmployeeContractInfo::getSituation,"作废")
.ne(TEmployeeContractInfo::getSituation,"终止")
.le(TEmployeeContractInfo::getContractEnd,DateUtil.dateIncreaseByDay(
DateUtil.dateIncreaseByMonth(DateUtil.getCurrentDateTime(),
......
......@@ -112,6 +112,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
private final TGzContractService tGzContractService;
private final TGzPushEntryService tGzPushEntryService;
private final TGzEmpInfoMapper tGzEmpInfoMapper;
/**
* 员工合同信息表简单分页查询
*
......@@ -2277,7 +2281,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
//更新瓜子offer状态
public void updateGzOfferStatus(TEmployeeContractInfo contractInfo,String preStatus,String updStatus, String userId, String nickname) {
private void updateGzOfferStatus(TEmployeeContractInfo contractInfo,String preStatus,String updStatus, String userId, String nickname) {
if(Common.isEmpty(contractInfo)){
return;
}
......@@ -2287,6 +2291,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
.eq(TGzOfferInfo::getDelFlag,CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(gzOfferInfo)) {
// updStatus == 13:待签署 更新 入职日期为合同开始时间
if(CommonConstants.THIRTEEN_STRING.equals(updStatus)){
gzOfferInfo.setExpEntryDate(contractInfo.getContractStart());
}
gzOfferInfo.setOfferStatus(updStatus);
gzOfferInfo.setUpdateBy(userId);
gzOfferInfo.setUpdateTime(LocalDateTime.now());
......@@ -2297,10 +2305,36 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
tGzContractService.saveContractInfoToGzEmpInfo(contractInfo, gzOfferInfo.getId(), gzOfferInfo.getWorkLocation(),gzOfferInfo.getWorkLocationDescr());
}
// 1.7.13: updStatus == 99:存合同附件到瓜子档案里
if(CommonConstants.NINETY_NINE.equals(updStatus)){
// 查档案ID
TGzEmpInfo gzEmpInfo = tGzEmpInfoMapper.getInfoByOfferId(gzOfferInfo.getId());
if(Common.isNotNull(gzEmpInfo)){
// 获取合同归档附件
List<TAttaInfo> contractAttas = tAttaInfoService.list(Wrappers.<TAttaInfo>query().lambda().eq(TAttaInfo::getDomainId,contractInfo.getId()));
if (Common.isNotNull(contractAttas)) {
for (TAttaInfo attaInfo : contractAttas) {
// 附件赋值
TAttaInfo gzContractAtta = new TAttaInfo();
BeanUtils.copyProperties(attaInfo, gzContractAtta);
gzContractAtta.setDomainId(gzEmpInfo.getId());
gzContractAtta.setRelationType("CONTRACT");
gzContractAtta.setId(null);
gzContractAtta.setCreateBy(userId);
gzContractAtta.setCreateName(nickname);
gzContractAtta.setCreateTime(LocalDateTime.now());
tAttaInfoService.save(gzContractAtta);
}
}
}
}
// 瓜子状态变更增加操作日志
// 13:待签署,8:合同审核通过,99:已归档
// 9:发起合同申请10:合同审核通过;11:合同归档;
String recordFrom = "";
switch (updStatus) {
case "13":
recordFrom = "9";
......@@ -2313,6 +2347,16 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
break;
}
// 1.7.13: 推送瓜子
TGzPushEntry tGzPushEntry = new TGzPushEntry();
tGzPushEntry.setCreateBy(userId);
tGzPushEntry.setCreateName(nickname);
tGzPushEntry.setBizId(gzOfferInfo.getBizId());
tGzPushEntry.setTaskType(updStatus);
tGzPushEntry.setName(gzOfferInfo.getName());
tGzPushEntry.setNationalId(gzOfferInfo.getNationalId());
tGzPushEntryService.addPushEntry(tGzPushEntry);
LGuaziOfferRecordVo lGuaziOfferRecordVo = new LGuaziOfferRecordVo();
// 存变更前后的状态到 状态数组里
List<String> changeStatusList = new ArrayList<>();
......
......@@ -141,6 +141,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
private final TGzContractService tGzContractService;
private final TGzPushEntryService tGzPushEntryService;
@Autowired
private OSSUtil ossUtil;
......@@ -2636,6 +2638,15 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
// 合同审核通过 生成瓜子档案里的合同信息
tGzContractService.saveContractInfoToGzEmpInfo(c, gzOfferInfo.getId(), gzOfferInfo.getWorkLocation(),gzOfferInfo.getWorkLocationDescr());
// 1.7.13: 合同审核通过:推送瓜子 合同信息
TGzPushEntry tGzPushEntry = new TGzPushEntry();
tGzPushEntry.setCreateBy(vo.getCreateBy());
tGzPushEntry.setCreateName(vo.getCreateName());
tGzPushEntry.setBizId(gzOfferInfo.getBizId());
tGzPushEntry.setTaskType(CommonConstants.EIGHT_STRING);
tGzPushEntry.setName(gzOfferInfo.getName());
tGzPushEntry.setNationalId(gzOfferInfo.getNationalId());
tGzPushEntryService.addPushEntry(tGzPushEntry);
// 瓜子状态变更增加操作日志
LGuaziOfferRecordVo lGuaziOfferRecordVo = new LGuaziOfferRecordVo();
......@@ -2770,14 +2781,26 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
.eq(TGzOfferInfo::getDelFlag,CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(gzOfferInfo)) {
// 13:待签署 更新 入职日期为合同开始时间
gzOfferInfo.setExpEntryDate(contract.getContractStart());
gzOfferInfo.setOfferStatus(CommonConstants.THIRTEEN_STRING);
gzOfferInfoMapper.updateById(gzOfferInfo);
// 1.7.13: 合同提交申请:推送瓜子 更新状态
TGzPushEntry tGzPushEntry = new TGzPushEntry();
tGzPushEntry.setCreateBy(contract.getCreateBy());
tGzPushEntry.setCreateName(contract.getCreateName());
tGzPushEntry.setBizId(gzOfferInfo.getBizId());
tGzPushEntry.setTaskType(CommonConstants.THIRTEEN_STRING);
tGzPushEntry.setName(gzOfferInfo.getName());
tGzPushEntry.setNationalId(gzOfferInfo.getNationalId());
tGzPushEntryService.addPushEntry(tGzPushEntry);
// 瓜子状态变更增加操作日志
LGuaziOfferRecordVo lGuaziOfferRecordVo = new LGuaziOfferRecordVo();
// 存变更前后的状态到 状态数组里
List<String> changeStatusList = new ArrayList<>();
changeStatusList.add(gzOfferInfo.getOfferStatus());
changeStatusList.add("97");
changeStatusList.add(CommonConstants.THIRTEEN_STRING);
if(changeStatusList.size() > 0){
......@@ -2832,36 +2855,29 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
employeeInfo.setContactAddress(empAdd.getContactAddress());
if (empAdd.getHignEducation().equals("文盲")) {
employeeInfo.setHignEducation("1");
}
if (empAdd.getHignEducation().equals("小学")) {
}else if (empAdd.getHignEducation().equals("小学")) {
employeeInfo.setHignEducation("2");
}
if (empAdd.getHignEducation().equals("初中")) {
}else if (empAdd.getHignEducation().equals("初中")) {
employeeInfo.setHignEducation("3");
}
if (empAdd.getHignEducation().equals("高中")) {
}else if (empAdd.getHignEducation().equals("高中")) {
employeeInfo.setHignEducation("4");
}
if (empAdd.getHignEducation().equals("大专")) {
}else if (empAdd.getHignEducation().equals("大专")) {
employeeInfo.setHignEducation("5");
}
if (empAdd.getHignEducation().equals("本科")) {
}else if (empAdd.getHignEducation().equals("本科")) {
employeeInfo.setHignEducation("6");
}
if (empAdd.getHignEducation().equals("硕士")) {
}else if (empAdd.getHignEducation().equals("硕士")) {
employeeInfo.setHignEducation("7");
}
if (empAdd.getHignEducation().equals("博士")) {
}else if (empAdd.getHignEducation().equals("博士")) {
employeeInfo.setHignEducation("8");
}
if (empAdd.getHignEducation().equals("技工")) {
}else if (empAdd.getHignEducation().equals("技工")) {
employeeInfo.setHignEducation("9");
}
if (empAdd.getHignEducation().equals("职高")) {
}else if (empAdd.getHignEducation().equals("职高")) {
employeeInfo.setHignEducation("10");
}
if (empAdd.getHignEducation().equals("中专")) {
}else if (empAdd.getHignEducation().equals("中专")) {
employeeInfo.setHignEducation("11");
}else {
//优化 如果非设定的最高学历 直接默认空
employeeInfo.setHignEducation(null);
}
if ("5".equals(employeeInfo.getHignEducation())
|| "6".equals(employeeInfo.getHignEducation())
......
......@@ -16,19 +16,25 @@
*/
package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAttaInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzEmpInfo;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TGzEmpInfoMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TAttaInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TGzContractService;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Date;
import java.util.List;
/**
* 瓜子合同提取方法
......@@ -43,6 +49,8 @@ public class TGzContractServiceImpl implements TGzContractService {
private final TGzEmpInfoMapper tGzEmpInfoMapper;
private final TAttaInfoService tAttaInfoService;
/**
* 生成瓜子档案里的合同信息
* chenyx
......@@ -57,7 +65,10 @@ public class TGzContractServiceImpl implements TGzContractService {
TGzEmpInfo gzEmpInfo = tGzEmpInfoMapper.getInfoByOfferId(offerId);
if (Common.isNotNull(gzEmpInfo)) {
// 确认 用合同编号(用户在页面上填写的)
gzEmpInfo.setContractNum(contractInfo.getContractNo());
// gzEmpInfo.setContractNum(contractInfo.getContractNo());
// 1.7.13: 换成用合同申请号
gzEmpInfo.setContractNum(contractInfo.getApplyNo());
// 客服申请处选择“标准合同”传“外签-劳动合同 ”;“实习协议”传“外签-实习协议 ”
if ("标准合同".equals(contractInfo.getContractName())) {
gzEmpInfo.setContractType("1E");
......@@ -107,4 +118,33 @@ public class TGzContractServiceImpl implements TGzContractService {
}
}
/**
* 存合同附件到瓜子档案里
* chenyx
*
* @param offerId offerId
* @param contractId 合同ID
*/
@Override
public void saveContractAtta(Integer offerId, String contractId) {
TGzEmpInfo gzEmpInfo = tGzEmpInfoMapper.getInfoByOfferId(offerId);
if(Common.isNotNull(gzEmpInfo)){
// 获取合同归档附件
List<TAttaInfo> contractAttas = tAttaInfoService.list(Wrappers.<TAttaInfo>query().lambda().eq(TAttaInfo::getDomainId, contractId));
if (Common.isNotNull(contractAttas)) {
for (TAttaInfo attaInfo : contractAttas) {
// 附件赋值
TAttaInfo gzContractAtta = new TAttaInfo();
BeanUtils.copyProperties(attaInfo, gzContractAtta);
gzContractAtta.setDomainId(gzEmpInfo.getId());
gzContractAtta.setRelationType("CONTRACT");
gzContractAtta.setId(null);
gzContractAtta.setCreateBy("1");
gzContractAtta.setCreateName("系统");
gzContractAtta.setCreateTime(LocalDateTime.now());
tAttaInfoService.save(gzContractAtta);
}
}
}
}
}
......@@ -28,9 +28,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaMap;
import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.*;
import com.yifu.cloud.plus.v1.yifu.archives.service.LGuaziOfferRecordService;
import com.yifu.cloud.plus.v1.yifu.archives.service.*;
import com.yifu.cloud.plus.v1.yifu.archives.service.TPreEmpDeclarationService;
import com.yifu.cloud.plus.v1.yifu.archives.util.IdCardUtil;
import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
......@@ -45,6 +43,7 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.lang.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.security.core.GrantedAuthority;
......@@ -57,7 +56,6 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URL;
import java.net.URLEncoder;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.*;
......@@ -116,6 +114,8 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
// 员工家庭信息表
private final TEmpFamilyService tEmpFamilyService;
private final TGzPushEntryService tGzPushEntryService;
/**
* 瓜子档案表简单分页查询
......@@ -510,6 +510,26 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
// 记录状态变更的offer操作日志 记录来源: 6:(系统触发)C端采集提交
this.saveOfferStatusRecord(gzOfferInfo.getId(),CommonConstants.SIX_STRING,
CommonConstants.NINE_STRING,gzOfferInfo.getOfferStatus(),"0","系统触发");
// 1.7.13: 同一个流程ID推送过12:候选人信息审核,之前没推送过这个状态的,才触发推送
TGzPushEntry findFailInfo = tGzPushEntryService.getOne(Wrappers.<TGzPushEntry>query().lambda()
.eq(TGzPushEntry::getBizId, gzOfferInfo.getBizId())
.eq(TGzPushEntry::getTaskType, "12")
.eq(TGzPushEntry::getDelFlag, CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isEmpty(findFailInfo)) {
// 推送状态给瓜子
if(!CommonConstants.ZERO_STRING.equals(gzOfferInfo.getBizId())){
TGzPushEntry tGzPushEntry = new TGzPushEntry();
tGzPushEntry.setCreateBy(user.getId());
tGzPushEntry.setCreateName(user.getNickname());
tGzPushEntry.setBizId(gzOfferInfo.getBizId());
tGzPushEntry.setTaskType("12");
tGzPushEntry.setName(gzOfferInfo.getName());
tGzPushEntry.setNationalId(gzOfferInfo.getNationalId());
tGzPushEntryService.addPushEntry(tGzPushEntry);
}
}
}
String gzEmpId = tGzEmpInfoVo.getId();
......@@ -834,6 +854,51 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
return R.ok();
}
/**
* @param gzEmpId
* @Description: 推送给瓜子的档案信息
* @Author: hgw
* @Date: 2025/7/10 15:33
* @return: com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoPushGzVo
**/
@Override
public TGzEmpInfoPushGzVo getGzEmpInfoToPushGzById(String gzEmpId) {
TGzEmpInfoPushGzVo vo = baseMapper.getGzEmpInfoToPushGzById(gzEmpId);
TGzEmpInfoPushGzVoAdress address = baseMapper.getGzEmpInfoToPushGzByIdAdress(gzEmpId);
TGzEmpInfoPushGzVoBank bank = baseMapper.getGzEmpInfoToPushGzByIdBank(gzEmpId);
List<TGzEmpInfoPushGzVoFamily> family = baseMapper.getGzEmpInfoToPushGzByIdFamily(gzEmpId);
List<TGzEmpInfoPushGzVoContact> contact = baseMapper.getGzEmpInfoToPushGzByIdContact(gzEmpId);
List<TGzEmpInfoPushGzVoWork> work = baseMapper.getGzEmpInfoToPushGzByIdWork(gzEmpId);
List<TGzEmpInfoPushGzVoEducation> education = baseMapper.getGzEmpInfoToPushGzByIdEducation(gzEmpId);
List<TGzEmpInfoPushGzVoSkill> skill = baseMapper.getGzEmpInfoToPushGzByIdSkill(gzEmpId);
String[] directlyCityArr = {"110000", "120000", "310000", "500000"};
// 特殊处理: 是4个直辖市的,市编码和省编码一致
if (ArrayUtils.contains(directlyCityArr, vo.getHukouProvince())) {
vo.setHukouCity(vo.getHukouProvince());
}
if (ArrayUtils.contains(directlyCityArr, address.getStateId())) {
address.setCityId(address.getStateId());
}
//List<TGzEmpInfoPushGzVoAtta> atta = baseMapper.getGzEmpInfoToPushGzByIdAtta(gzEmpId);
vo.setAddress(address);
vo.setBankAccount(bank);
vo.setFamily(family);
vo.setEmergContact(contact);
vo.setWorkExp(work);
vo.setEduExp(education);
vo.setSkill(skill);
//vo.setAttach(atta);
return vo;
}
@Override
public TGzEmpInfoPushGzContractVo getGzEmpInfoToPushGzByIdContract(String gzEmpId) {
return baseMapper.getGzEmpInfoToPushGzByIdContract(gzEmpId);
}
private TEmployeeInfo saveEmployeeInfo(TGzEmpInfo gzEmpInfo, YifuUser user, String empIdCard
, Map<String, Map<String,String>> dictMap, String firstWorkFlag, TGzEmpEducation education) {
// 查找档案、项目档案,无则新建
......
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzPushEntry;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TGzPushEntryMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TGzPushEntryService;
import com.yifu.cloud.plus.v1.yifu.archives.utils.DoJointTask;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.lang.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TGzPushEntrySearchVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.time.LocalDateTime;
/**
* 瓜子系统交互任务跟进表
*
* @author cyx
* @date 2025-07-09 17:03:50
*/
@Log4j2
@Service
@RequiredArgsConstructor
public class TGzPushEntryServiceImpl extends ServiceImpl<TGzPushEntryMapper, TGzPushEntry> implements TGzPushEntryService {
@Autowired
@Lazy
private DoJointTask doJointTask;
// 任务类型是改状态的: 4:待接受Offer,5:拒绝Offer,6:接受offer,9:候选人填写信息,10:取消offer,12:候选人信息审核,13:待签署
private final String[] taskTypeArr = {"4", "5", "6", "9", "10", "12", "13", "97", "8", "99"};
/**
* 瓜子系统交互任务跟进表简单分页查询
*
* @param tGzPushEntry 瓜子系统交互任务跟进表
* @return
*/
@Override
public IPage<TGzPushEntrySearchVo> getTGzPushEntryPage(Page<TGzPushEntry> page, TGzPushEntrySearchVo tGzPushEntry) {
return baseMapper.getTGzPushEntryPage(page, tGzPushEntry);
}
/**
* 任务推送重试
*
* @param tGzPushEntry 瓜子系统交互任务跟进表
* @return R
*/
@Override
public R<String> retryPushEntry(TGzPushEntry tGzPushEntry) {
YifuUser user = SecurityUtils.getUser();
if (user == null || Common.isEmpty(user.getId())) {
return R.failed(CommonConstants.PLEASE_LOG_IN);
}
if (Common.isEmpty(tGzPushEntry.getId())) {
return R.failed(CommonConstants.PARAM_IS_NOT_EMPTY);
}
// 获取推送失败的数据信息
TGzPushEntry findInfo = this.getOne(Wrappers.<TGzPushEntry>query().lambda()
.eq(TGzPushEntry::getId, tGzPushEntry.getId())
.eq(TGzPushEntry::getPushStatus, CommonConstants.ONE_STRING)
.eq(TGzPushEntry::getDelFlag, CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isEmpty(findInfo)) {
return R.failed(CommonConstants.ERROR_NO_DOMAIN);
}
// 先改为推送中
findInfo.setPushTime(LocalDateTime.now());
findInfo.setPushStatus(CommonConstants.THREE_STRING);
findInfo.setFailReason("");
findInfo.setUpdateBy(user.getId());
findInfo.setUpdateTime(LocalDateTime.now());
this.updateById(tGzPushEntry);
// 改为异步处理
doJointTask.handleGzPushEntry(findInfo);
return R.ok("已发起重新推送,正在后台推送中...稍后请刷新页面查看结果");
}
/**
* 新增推送任务
*
* @param tGzPushEntry 瓜子系统交互任务跟进表
*/
@Override
public void addPushEntry(TGzPushEntry tGzPushEntry) {
// 流程是0的,不推送
if(CommonConstants.ZERO_STRING.equals(tGzPushEntry.getBizId())){
return;
}
// 仅存指定状态的任务
if (!ArrayUtils.contains(taskTypeArr, tGzPushEntry.getTaskType())) {
return;
}
// offer状态是 7 的,改为推送 6
if(CommonConstants.SEVEN_STRING.equals(tGzPushEntry.getTaskType())){
tGzPushEntry.setTaskType(CommonConstants.SIX_STRING);
}
// 新建任务,先存为"待推送"
tGzPushEntry.setPushStatus(CommonConstants.TWO_STRING);
tGzPushEntry.setCreateTime(LocalDateTime.now());
tGzPushEntry.setDelFlag(CommonConstants.NOT_DELETE_FLAG);
this.save(tGzPushEntry);
// 除了本次任务,获取是否有【推送失败、待推送、推送中】的任务,有的话本次不推送,存为“待推送”就结束
TGzPushEntry findBizFailInfo = this.getOne(Wrappers.<TGzPushEntry>query().lambda()
.eq(TGzPushEntry::getBizId, tGzPushEntry.getBizId())
.ne(TGzPushEntry::getId, tGzPushEntry.getId())
.in(TGzPushEntry::getPushStatus, CommonConstants.ONE_STRING, CommonConstants.TWO_STRING, CommonConstants.THREE_STRING)
.eq(TGzPushEntry::getDelFlag, CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(findBizFailInfo)) {
return;
}
tGzPushEntry.setUpdateBy(tGzPushEntry.getCreateBy());
// 改为异步处理
doJointTask.handleGzPushEntry(tGzPushEntry);
}
}
......@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yifu.cloud.plus.v1.yifu.archives.entity.FddContractAttachInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzPushEntry;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeProjectMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeLogService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TGzPushHandleService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectNewOldVO;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
......@@ -39,6 +41,9 @@ public class DoJointTask {
@Autowired
private TEmployeeLogService tEmployeeLogService;
@Autowired
private TGzPushHandleService tGzPushHandleService;
/**
* @Description: 合同-批量更换负责人
* @Author: huyc
......@@ -144,4 +149,20 @@ public class DoJointTask {
}
log.info("档案-更新项目档案操作记录结束");
}
/**
* 处理推送给瓜子的交互任务
* @author chenyuxi
* @date 2025-07-11
* @since 1.7.13
**/
@Async
public void handleGzPushEntry(TGzPushEntry tGzPushEntry) {
try {
tGzPushHandleService.handlePushEntry(tGzPushEntry);
} catch (Exception e) {
log.error("处理推送给瓜子的交互任务错误", e);
}
log.info("处理推送给瓜子的交互任务结束");
}
}
......@@ -36,10 +36,10 @@ wx:
#瓜子配置
gz:
appkey: hr_eny00002_test
appsecret: hr_eny00002_test_20250620
tid: c2da1d84e9bd4a30b6be5ecd209096fb
appUrl: https://eim-busin-api-test-jwtys.guazi.com
appkey: hr_eny00002
appsecret: f30274f7b386469cb45a4e302b4b816b
tid: 189061502af84752b1842e9c1ecd03d7
appUrl: https://eimapi.guazi.com
......@@ -652,4 +652,169 @@
</if>
</select>
<!--推送瓜子的瓜子档案信息-->
<select id="getGzEmpInfoToPushGzById" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoPushGzVo">
SELECT
a.biz_id AS bizId,
a.name AS name,
DATE_FORMAT(a.birthdate,'%Y-%m-%d') AS birthdate,
a.sex AS sex,
DATE_FORMAT(a.start_date,'%Y-%m-%d') AS startDate,
a.country AS country,
a.ethnic_grp_cd AS ethnicGrpCd,
a.native_place AS nativePlace,
a.blood_type AS blooeType,
a.constel,
a.phone AS phone,
a.mail AS email,
a.mar_status AS marStatus,
a.political_sta AS politicalSta,
a.insurance_sta AS insuranceSta,
a.driver_type AS driverType,
DATE_FORMAT(a.driver_licen_exp,'%Y-%m-%d') AS driverLicenExp,
a.national_id AS nationalId,
a.national_id_type AS nationalIdType,
DATE_FORMAT(a.nid_start_date,'%Y-%m-%d') AS nidStartDate,
DATE_FORMAT(a.nid_expiry_date,'%Y-%m-%d') AS nidExpiryDate,
a.persist_flag AS persistFlag,
a.hukou_type AS hukouType,
a.hukou_province AS hukouProvince,
a.hukou_city AS hukouCity,
a.hukou_county AS hukouCounty,
a.hukou_detail AS hukouDetail
FROM t_gz_emp_info a
where a.del_flag = '0' and a.id = #{gzEmpId}
ORDER BY a.create_time desc limit 1
</select>
<!--推送瓜子的瓜子档案信息Adress-->
<select id="getGzEmpInfoToPushGzByIdAdress" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoPushGzVoAdress">
SELECT
a.address_type AS addressType,
a.state_id AS stateId,
a.city_id AS cityId,
a.county_id AS countyId,
a.address AS address
FROM t_gz_emp_info a
where a.del_flag = '0' and a.id = #{gzEmpId}
ORDER BY a.create_time desc limit 1
</select>
<!--推送瓜子的瓜子档案信息Bank-->
<select id="getGzEmpInfoToPushGzByIdBank" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoPushGzVoBank">
SELECT
a.account_type AS accountType,
a.bank_cd AS bankCd,
a.cnaps_id AS cnapsId,
a.bank_name AS bankName,
a.account_ec_id AS accountEcId,
a.account_name AS accountName,
a.account_country AS country
FROM t_gz_emp_info a
where a.del_flag = '0' and a.id = #{gzEmpId}
ORDER BY a.create_time desc limit 1
</select>
<!--推送瓜子的瓜子档案信息Family-->
<select id="getGzEmpInfoToPushGzByIdFamily" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoPushGzVoFamily">
SELECT
b.family_relation famMemRelation,
b.family_name name,
b.family_phone phone,
b.family_address address,
b.family_company company,
b.gz_eme_flag gzEmeFlag,
b.job_code jobCode
FROM t_gz_emp_family b left join t_gz_emp_info a on a.id=b.emp_id
where a.del_flag = '0' and b.del_flag = '0' and a.id = #{gzEmpId}
</select>
<!--推送瓜子的瓜子档案信息Family-->
<select id="getGzEmpInfoToPushGzByIdContact" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoPushGzVoContact">
SELECT
b.emerg_name emergName,
b.emerg_relation emergRelation,
b.emerg_phone phone,
b.emerg_address address,
b.primary_nid primaryNid
FROM t_gz_emp_contact_info b left join t_gz_emp_info a on a.id=b.emp_id
where a.del_flag = '0' and b.del_flag = '0' and a.id = #{gzEmpId}
</select>
<!--推送瓜子的瓜子档案信息Work-->
<select id="getGzEmpInfoToPushGzByIdWork" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoPushGzVoWork">
SELECT
b.work_unit employer,
date_format(b.work_start_date, '%Y-%m-%d') startDate,
date_format(b.work_end_date, '%Y-%m-%d') endDate,
b.work_dept deptDescr,
b.work_job endingTitle,
b.certifier_name adminName,
b.certifier_phone phone,
'' email,
'' comment
FROM t_gz_emp_work b left join t_gz_emp_info a on a.id=b.emp_id
where a.del_flag = '0' and b.del_flag = '0' and a.id = #{gzEmpId}
ORDER BY b.create_time desc
</select>
<!--推送瓜子的瓜子档案信息Education-->
<select id="getGzEmpInfoToPushGzByIdEducation" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoPushGzVoEducation">
SELECT
b.edu_qual eduQual,
b.edu_degree eduDergee,
b.edu_type eduType,
b.school school,
date_format(b.edu_start_date, '%Y-%m-%d') startDate,
date_format(b.edu_end_date, '%Y-%m-%d') endDate,
b.gradution_type graduateType,
b.major,
b.high_edu_qual_flag highEduQualFlag,
b.high_edu_degree_flag highEduDegreeFlag,
b.first_degree_flag firstDegreeFlag
FROM t_gz_emp_education b left join t_gz_emp_info a on a.id=b.emp_id
where a.del_flag = '0' and b.del_flag = '0' and a.id = #{gzEmpId}
</select>
<!--推送瓜子的瓜子档案信息Skill-->
<select id="getGzEmpInfoToPushGzByIdSkill" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoPushGzVoSkill">
SELECT
@row_num := @row_num + 1 AS orderId,
b.skill_name skillName,
date_format(b.skill_date, '%Y-%m-%d') skillDate,
b.skill_org skillOrg,
b.skill_level skillLevel
FROM t_gz_emp_skill b left join t_gz_emp_info a on a.id=b.emp_id,(SELECT @row_num := 0) AS t
where a.del_flag = '0' and b.del_flag = '0' and a.id = #{gzEmpId} and b.skill_date is not null and b.skill_name != ''
</select>
<!--推送瓜子的瓜子档案信息Atta-->
<select id="getGzEmpInfoToPushGzByIdAtta" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoPushGzVoAtta">
SELECT
a.RELATION_TYPE attachType,
a.id fileId,
a.ATTA_NAME fileName
FROM t_atta_info a
where a.RELATION_TYPE not in ('41','42','43') and a.domain_id = #{gzEmpId}
</select>
<!--推送瓜子的瓜子档案信息-合同 注意:2025年7月17号,瓜子接口变更了,取值时:试用期预计结束日期 和 预计转正日期,调换了-->
<select id="getGzEmpInfoToPushGzByIdContract" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoPushGzContractVo">
SELECT
a.biz_id bizId,
a.contract_num contractNum,
a.sginature_method sginatureMethod,
a.contract_type contractType,
a.sginature_type sginatureType,
date_format(a.sginature_dt, '%Y-%m-%d') sginatureDt,
date_format(a.contract_begin_dt, '%Y-%m-%d') contractBeginDt,
date_format(a.contract_end_dt, '%Y-%m-%d') contractEndDt,
date_format(a.contract_exp_end_dt, '%Y-%m-%d') contrctExpEndDt,
a.probation probation,
if(a.probation='0','1900-01-01',date_format(a.prc_exp_dt, '%Y-%m-%d')) probationDt,
if(a.probation='0','1900-01-01',date_format(a.probation_dt, '%Y-%m-%d')) prcExpDt,
a.nee_provider_id neeProviderId,
a.work_location workLocation,
'' fileId,
'' fileName
FROM t_gz_emp_info a
where a.del_flag = '0' and a.id = #{gzEmpId}
ORDER BY a.create_time desc limit 1
</select>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!--
~
~ Copyright (c) 2018-2025, lengleng All rights reserved.
~
~ Redistribution and use in source and binary forms, with or without
~ modification, are permitted provided that the following conditions are met:
~
~ Redistributions of source code must retain the above copyright notice,
~ this list of conditions and the following disclaimer.
~ Redistributions in binary form must reproduce the above copyright
~ notice, this list of conditions and the following disclaimer in the
~ documentation and/or other materials provided with the distribution.
~ Neither the name of the yifu4cloud.com developer nor the names of its
~ contributors may be used to endorse or promote products derived from
~ this software without specific prior written permission.
~ Author: lengleng (wangiegie@gmail.com)
~
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yifu.cloud.plus.v1.yifu.archives.mapper.TGzPushEntryMapper">
<resultMap id="tGzPushEntryMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.TGzPushEntrySearchVo">
<id property="id" column="id"/>
<result property="bizId" column="biz_id"/>
<result property="taskType" column="task_type"/>
<result property="pushStatus" column="push_status"/>
<result property="pushTime" column="push_time"/>
<result property="failReason" column="fail_reason"/>
<result property="pushData" column="push_data"/>
<result property="responseData" column="response_data"/>
<result property="delFlag" column="del_flag"/>
<result property="name" column="name"/>
<result property="nationalId" column="national_id"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="createName" column="create_name"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
</resultMap>
<sql id="Base_Column_List">
a.id,
a.biz_id,
a.task_type,
a.push_status,
a.push_time,
a.fail_reason,
a.push_data,
a.response_data,
a.del_flag,
a.name,
a.national_id,
a.create_time,
a.create_by,
a.create_name,
a.update_by,
a.update_time
</sql>
<sql id="tGzPushEntry_where">
<if test="tGzPushEntry != null">
<if test="tGzPushEntry.id != null and tGzPushEntry.id.trim() != ''">
AND a.id = #{tGzPushEntry.id}
</if>
<if test="tGzPushEntry.bizId != null and tGzPushEntry.bizId.trim() != ''">
AND a.biz_id = #{tGzPushEntry.bizId}
</if>
<if test="tGzPushEntry.taskType != null and tGzPushEntry.taskType.trim() != ''">
AND a.task_type = #{tGzPushEntry.taskType}
</if>
<if test="tGzPushEntry.pushStatus != null and tGzPushEntry.pushStatus.trim() != ''">
AND a.push_status = #{tGzPushEntry.pushStatus}
</if>
<if test="tGzPushEntry.pushStatusArray != null and tGzPushEntry.pushStatusArray.length > 0">
AND a.push_status in
<foreach item="item" index="index" collection="tGzPushEntry.pushStatusArray" open="(" separator="," close=")">
'${item}'
</foreach>
</if>
<if test="tGzPushEntry.pushTime != null">
AND a.push_time = #{tGzPushEntry.pushTime}
</if>
<!--查询推送时间-->
<if test="tGzPushEntry.createTimeStart != null ">
AND a.push_time &gt;= #{tGzPushEntry.createTimeStart}
</if>
<if test="tGzPushEntry.createTimeEnd != null ">
AND a.push_time &lt;= #{tGzPushEntry.createTimeEnd}
</if>
<if test="tGzPushEntry.failReason != null and tGzPushEntry.failReason.trim() != ''">
AND a.fail_reason = #{tGzPushEntry.failReason}
</if>
<if test="tGzPushEntry.pushData != null and tGzPushEntry.pushData.trim() != ''">
AND a.push_data = #{tGzPushEntry.pushData}
</if>
<if test="tGzPushEntry.responseData != null and tGzPushEntry.responseData.trim() != ''">
AND a.response_data = #{tGzPushEntry.responseData}
</if>
<if test="tGzPushEntry.delFlag != null and tGzPushEntry.delFlag.trim() != ''">
AND a.del_flag = #{tGzPushEntry.delFlag}
</if>
<if test="tGzPushEntry.name != null and tGzPushEntry.name.trim() != ''">
AND a.name like concat('%',#{tGzPushEntry.name},'%')
</if>
<if test="tGzPushEntry.nationalId != null and tGzPushEntry.nationalId.trim() != ''">
AND a.national_id like concat('%',#{tGzPushEntry.nationalId},'%')
</if>
<if test="tGzPushEntry.createTime != null">
AND a.create_time = #{tGzPushEntry.createTime}
</if>
<if test="tGzPushEntry.createBy != null and tGzPushEntry.createBy.trim() != ''">
AND a.create_by = #{tGzPushEntry.createBy}
</if>
<if test="tGzPushEntry.createName != null and tGzPushEntry.createName.trim() != ''">
AND a.create_name = #{tGzPushEntry.createName}
</if>
<if test="tGzPushEntry.updateBy != null and tGzPushEntry.updateBy.trim() != ''">
AND a.update_by = #{tGzPushEntry.updateBy}
</if>
<if test="tGzPushEntry.updateTime != null">
AND a.update_time = #{tGzPushEntry.updateTime}
</if>
</if>
</sql>
<!--tGzPushEntry简单分页查询-->
<select id="getTGzPushEntryPage" resultMap="tGzPushEntryMap">
SELECT
<include refid="Base_Column_List"/>
FROM t_gz_push_entry a
<where>
a.del_flag = '0'
<include refid="tGzPushEntry_where"/>
</where>
ORDER by a.biz_id asc,a.create_time asc,a.id asc
</select>
</mapper>
......@@ -677,4 +677,7 @@ public interface CommonConstants {
String NINETY_NINE = "99";
String GZ_NEE_PROVIDER_ID = "V59";
// 瓜子推送成功标识
String GZ_SUCCESS_CODE = "S00000";
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.ekp.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.util.Date;
/**
* 预警配置表
*
* @author fxj
* @date 2025-07-21 09:49:56
*/
@Data
@TableName("ekp_alert_table")
@Schema(description = "预警配置表")
public class EkpAlertTable {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ExcelProperty("主键")
@Schema(description = "主键")
private String fdId;
/**
* 预警科目ID
*/
@ExcelAttribute(name = "预警科目ID", maxLength = 1000)
@Length(max = 1000, message = "预警科目ID不能超过1000个字符")
@ExcelProperty("预警科目ID")
@Schema(description = "预警科目ID")
private String fdAlertSubject;
/**
* 预警科目
*/
@ExcelAttribute(name = "预警科目", maxLength = 1000)
@Length(max = 1000, message = "预警科目不能超过1000个字符")
@ExcelProperty("预警科目")
@Schema(description = "预警科目")
private String fdAlertSubjectText;
/**
* 有效日期始
*/
@ExcelAttribute(name = "有效日期始", isDate = true)
@ExcelProperty("有效日期始")
@Schema(description = "有效日期始")
private Date fdEffectiveStartDate;
/**
* 有效日期止
*/
@ExcelAttribute(name = "有效日期止", isDate = true)
@ExcelProperty("有效日期止")
@Schema(description = "有效日期止")
private Date fdEffectiveEndDate;
/**
* 检测方式
*/
@ExcelAttribute(name = "检测方式", maxLength = 200)
@Length(max = 200, message = "检测方式不能超过200个字符")
@ExcelProperty("检测方式")
@Schema(description = "检测方式")
private String fdDetectionMethod;
/**
* 阈值(%)
*/
@ExcelAttribute(name = "阈值")
@ExcelProperty("阈值")
@Schema(description = "阈值")
private Integer fdThresholdValue;
/**
* 是否有效:是 否
*/
@ExcelAttribute(name = "是否有效", maxLength = 200)
@Length(max = 200, message = "是否有效不能超过200个字符")
@ExcelProperty("是否有效")
@Schema(description = "是否有效")
private String fdIsActive;
/**
* 预警内容
*/
@ExcelAttribute(name = "预警内容")
@ExcelProperty("预警内容")
@Schema(description = "预警内容")
private String fdAlertMessage;
/**
* 检测方式-每日时间
*/
@ExcelAttribute(name = "检测方式-每日", isDate = true)
@ExcelProperty("检测方式-每日")
@Schema(description = "检测方式-每日")
private Date fdEverydayTime;
/**
* 检测方式-每月:每月时间(日)
*/
@ExcelAttribute(name = "检测方式", maxLength = 20)
@Length(max = 20, message = "检测方式不能超过20个字符")
@ExcelProperty("检测方式")
@Schema(description = "检测方式")
private String fdChecktype;
/**
* 检测方式-每月:1.每月 2.每日
*/
@ExcelAttribute(name = "检测方式-每月")
@ExcelProperty("检测方式-每月")
@Schema(description = "检测方式-每月")
private Integer fdMonthday;
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.ekp.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import java.util.Date;
/**
* EKP预算预警表
*
* @author fxj
* @date 2025-07-15 11:53:01
*/
@Data
@TableName("ekp_budget_warning_info")
@Schema(description = "EKP预算预警表")
public class EkpBudgetWarningInfo{
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
@ExcelProperty("主键")
@Schema(description = "主键")
private String fdId;
/**
* 预警内容
*/
@ExcelAttribute(name = "预警内容", maxLength = 300)
@Length(max = 300, message = "预警内容不能超过300个字符")
@ExcelProperty("预警内容")
@Schema(description = "预警内容")
private String fdContent;
/**
* 预警时间
*/
@ExcelAttribute(name = "预警时间", isDate = true)
@ExcelProperty("预警时间")
@Schema(description = "预警时间")
private Date fdCreateTime;
/**
* 科目
*/
@ExcelAttribute(name = "科目", maxLength = 50)
@Length(max = 50, message = "科目不能超过50个字符")
@ExcelProperty("科目")
@Schema(description = "科目")
private String fdSubject;
/**
* 阅读状态:0未读 1已读
*/
@ExcelAttribute(name = "阅读状态:0未读 1已读", maxLength = 10)
@Length(max = 10, message = "阅读状态:0未读 1已读不能超过10个字符")
@ExcelProperty("阅读状态:0未读 1已读")
@Schema(description = "阅读状态:0未读 1已读")
private String fdReadStatus;
/**
* 接受人姓名
*/
@ExcelAttribute(name = "接受人姓名", maxLength = 50)
@Length(max = 50, message = "接受人姓名不能超过50个字符")
@ExcelProperty("接受人姓名")
@Schema(description = "接受人姓名")
private String fdRecipientName;
/**
* 接收人账号
*/
@ExcelAttribute(name = "接收人账号", maxLength = 50)
@Length(max = 50, message = "接收人账号不能超过50个字符")
@ExcelProperty("接收人账号")
@Schema(description = "接收人账号")
private String fdRecipientAccount;
/**
* 接收人ID(EKP-ID)
*/
@ExcelAttribute(name = "接收人ID(EKP-ID)", maxLength = 36)
@Length(max = 36, message = "接收人ID(EKP-ID)不能超过36个字符")
@ExcelProperty("接收人ID(EKP-ID)")
@Schema(description = "接收人ID(EKP-ID)")
private String fdRecipientId;
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.ekp.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import java.util.Date;
/**
* 预警配置表
*
* @author fxj
* @date 2025-07-21 09:49:56
*/
@Data
@Schema(description = "预警配置表")
public class BudgetWarningVo {
/**
* 科目
*/
@Schema(description = "科目")
private String km;
/**
* 提醒时间
*/
@Schema(description = "提醒时间")
private String at;
/**
* 余额
*/
@Schema(description = "余额")
private Double ye;
/**
* 比率
*/
@Schema(description = "比率")
private Double bl;
/**
* 二级成本中心
*/
@Schema(description = "二级成本中心")
private String cbzx;
/**
* 二级成本中心-提醒人
*/
@Schema(description = "二级成本中心-提醒人")
private String txr;
/**
* 阀值-剩余
*/
@Schema(description = "阀值-剩余")
private Integer fz;
}
package com.yifu.cloud.plus.v1.ekp.config;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.exception.CheckedException;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.AuthenticationServiceException;
import org.springframework.web.client.RestTemplate;
import java.util.Map;
import java.util.concurrent.TimeUnit;
/**
* @Author: huyc
* @Date: 2023/7/28
* @Description:
* @return: 企业微信配置
**/
@Configuration
@Data
@Slf4j
public class WxConfig {
@Value("${wx.corpid}")
private String corpid;
@Value("${wx.corpsecret}")
private String corpsecret;
@Value("${wx.agentid}")
private String agentid;
@Value("${wx.authUrl}")
private String authUrl;
@Value("${wx.domainName}")
private String domainName;
@Autowired
private RedisTemplate redisTemplate;
//未授权
private String accossTokenInvliad = "40014";
/**
* @param
* @Author: huyc
* @Date: 2023/7/28
* @Description: 获取微信accos_token
* @return: java.lang.String
**/
public String getAccessToken(RestTemplate restTemplate) {
if (Common.isNotNull(agentid)) {
return this.getToken(restTemplate, CacheConstants.WX_ACCOSS_TOKEN.concat(agentid), corpsecret);
}
return this.getToken(restTemplate, CacheConstants.WX_ACCOSS_TOKEN, corpsecret);
}
public String getAccessToken(RestTemplate restTemplate,String corpsecret)throws AuthenticationServiceException {
if(Common.isEmpty(corpsecret)){
throw new AuthenticationServiceException("未找到对应的corpsecret请联系管理员配置");
}
return this.getToken(restTemplate, CacheConstants.WX_ACCOSS_TOKEN.concat(agentid), corpsecret);
}
/**
* @param restTemplate
* @param tokenKey
* @param corpsecretKey
* @Description: 获取token
* @Author: huyc
* @Date: 2023/7/28 14:46
* @return: java.lang.String
**/
public String getToken(RestTemplate restTemplate,String tokenKey, String corpsecretKey) {
Object wxToken = redisTemplate.opsForValue().get(tokenKey);
if (null != wxToken) {
return String.valueOf(wxToken);
}
String requestTokenUrl = String.format(SecurityConstants.WX_GET_ACCOSS_TOKEN, corpid, corpsecretKey);
String result = restTemplate.getForObject(requestTokenUrl, String.class);
if (Common.isEmpty(result)) {
throw new CheckedException("微信授权失败");
}
String token = JSON.parseObject(result).getString("access_token");
if (Common.isEmpty(token)) {
log.info(result);
throw new CheckedException("获取微信token失败");
}
redisTemplate.opsForValue().set(tokenKey, token);
redisTemplate.expire(tokenKey, 3600, TimeUnit.SECONDS);
return token;
}
/**
* @param
* @Author: huyc
* @Date: 2023/7/28 14:43
* @Description: 移除微信accossToken
* @return: java.lang.String
**/
public void removeAccessToken() {
redisTemplate.delete(CacheConstants.WX_ACCOSS_TOKEN);
}
/**
* @param restTemplate
* @param requestMap 请求内容
* @Author: huyc
* @Date: 2023/7/28 14:48
* @Description: 发送卡片消息
* @return: java.lang.String
**/
public boolean sendTextCard(RestTemplate restTemplate, Map<String, Object> requestMap) {
// 必须加上header说明
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
Gson gson = new Gson();
log.debug("发企业微信===请求:{}", gson.toJson(requestMap));
HttpEntity<String> requestEntity = new HttpEntity<>(gson.toJson(requestMap), headers);
String accessToken = getAccessToken(restTemplate);
ResponseEntity<String> responseEntity = restTemplate.postForEntity(String.format(SecurityConstants.WX_SEND_MESSAGE, accessToken), requestEntity, String.class);
log.debug("发企业微信===返回:{}",JSON.toJSONString(responseEntity));
JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(responseEntity));
JSONObject jsonBody = jsonObject.getJSONObject("body");
if (jsonBody != null) {
String errcode = jsonBody.getString("errcode");
if (accossTokenInvliad.equals(errcode)) {
//删除accossToken缓存
removeAccessToken();
return false;
}
if (!CommonConstants.ZERO_STRING.equals(errcode)) { //非正常,则打印错误日志
log.info(jsonObject.toJSONString());
}
} else {
log.info(jsonObject.toJSONString());
}
return true;
}
/**
* 功能描述: 获取微信accos_token
* @Author: huyc
* @Date: 2023/7/28 14:50
* @return: java.lang.String
*/
public String getAppAccessToken(RestTemplate restTemplate) {
return this.getToken(restTemplate, CacheConstants.WX_ACCOSS_TOKEN, corpsecret);
}
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.ekp.controller;
import com.yifu.cloud.plus.v1.ekp.service.EkpAlertTableService;
import com.yifu.cloud.plus.v1.ekp.vo.EkpIncomePushInfoVo;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamRisk;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 预警配置表
*
* @author fxj
* @date 2025-07-21 09:49:56
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/ekpalerttable")
@Tag(name = "预警配置表管理")
public class EkpAlertTableController {
private final EkpAlertTableService ekpAlertTableService;
/**
* @return
* @Author fxj
* @Description 定时任务推送 预算超额预警信息 按日推送
* @Date 10:03 2025/7/21
* @Param
**/
@Inner
@PostMapping("/inner/pushBudgetAlertInfoTomanager")
public void pushRiskInfoToEkp() {
ekpAlertTableService.pushBudgetAlertInfoTomanager(1);
}
/**
* @return
* @Author fxj
* @Description 定时任务推送 预算超额预警信息 按月推送
* @Date 10:03 2025/7/21
* @Param
**/
@Inner
@PostMapping("/inner/pushBudgetAlertInfoTomanagerMonth")
public void pushBudgetAlertInfoTomanagerMonth() {
ekpAlertTableService.pushBudgetAlertInfoTomanager(0);
}
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.ekp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.ekp.entity.EkpAlertTable;
import com.yifu.cloud.plus.v1.ekp.vo.BudgetWarningVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 预警配置表
*
* @author fxj
* @date 2025-07-21 09:49:56
*/
@Mapper
public interface EkpAlertTableMapper extends BaseMapper<EkpAlertTable> {
/**
* 预警配置表简单分页查询
*
* @param ekpAlertTable 预警配置表
* @return
*/
IPage<EkpAlertTable> getEkpAlertTablePage(Page<EkpAlertTable> page, @Param("ekpAlertTable") EkpAlertTable ekpAlertTable);
List<BudgetWarningVo> getBudgetWarningVos(@Param("km") String km);
List<EkpAlertTable> getEkpAlertTableList(int type);
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.ekp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.ekp.entity.EkpBudgetWarningInfo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* EKP预算预警表
*
* @author fxj
* @date 2025-07-15 11:53:01
*/
@Mapper
public interface EkpBudgetWarningInfoMapper extends BaseMapper<EkpBudgetWarningInfo> {
/**
* EKP预算预警表简单分页查询
*
* @param ekpBudgetWarningInfo EKP预算预警表
* @return
*/
IPage<EkpBudgetWarningInfo> getEkpBudgetWarningInfoPage(Page<EkpBudgetWarningInfo> page, @Param("ekpBudgetWarningInfo") EkpBudgetWarningInfo ekpBudgetWarningInfo);
}
......@@ -58,4 +58,11 @@ public interface EkpSocialInfoMapper extends BaseMapper<EkpSocialInfo> {
List<Map<String,String>> getAccountList();
EkpDeptContractInfoVo selectContractInfoByDetptNo(@Param("deptNo") String deptNo);
/**
* 获取所有工行卡bin信息
* @param
* @return
*/
List<String> getAllIcbcCardBinInfo();
}
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.ekp.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.ekp.entity.EkpAlertTable;
/**
* 预警配置表
*
* @author fxj
* @date 2025-07-21 09:49:56
*/
public interface EkpAlertTableService extends IService<EkpAlertTable> {
void pushBudgetAlertInfoTomanager(int type);
}
......@@ -546,19 +546,38 @@ public class IcbcTransactionFlowIssueServiceImpl extends ServiceImpl<EkpSocialIn
R<EkpBankCodeSet> bankInfoQuery;
EkpBankCodeConfiglVo bankVo;
// 组装
//工行的卡号bin list
List<String> binList = baseMapper.getAllIcbcCardBinInfo();
for (EkpBankExcelVo excelVo : list) {
if (Common.isEmpty(excelVo.getFdRecipientBankCode())) {
// 查询行号
bankInfoQuery = icbcTransactionFlowQueryService.querybankinfo(excelVo.getFdPayeeAccount());
if (bankInfoQuery != null && bankInfoQuery.getCode() == CommonConstants.SUCCESS && bankInfoQuery.getData() != null) {
codeSet = bankInfoQuery.getData();
excelVo.setFdRecipientBankCode(codeSet.getFdRecipientBankCode());
excelVo.setFdRecipientBank(codeSet.getFdRecipientBank());
} else if (Common.isNotNull(excelVo.getFdRecipientBank())) {
bankVo = bankMap.get(excelVo.getFdRecipientBank());
if (bankVo != null) {
excelVo.setFdRecipientBankCode(bankVo.getFdRecipientBankCode());
excelVo.setFdRecipientBank(bankVo.getFdRecipientBank());
//工行的卡号通过bin来判断,如果是工行的卡号,则不需要行名行号
// 检查长度是否足够
boolean flag = false;
if (Common.isNotNull(binList) && !binList.isEmpty() && excelVo.getFdPayeeAccount().length() >= 5) {
for (String bin : binList) {
if ((bin.length() == 5 && excelVo.getFdPayeeAccount().substring(0, 5).equals(bin)) ||
(bin.length() == 6 && excelVo.getFdPayeeAccount().length() >= 6 &&
excelVo.getFdPayeeAccount().substring(0, 6).equals(bin))) {
excelVo.setFdRecipientBankCode(null);
excelVo.setFdRecipientBank(null);
flag = true;
break;
}
}
}
if (!flag) {
// 查询行号
bankInfoQuery = icbcTransactionFlowQueryService.querybankinfo(excelVo.getFdPayeeAccount());
if (bankInfoQuery != null && bankInfoQuery.getCode() == CommonConstants.SUCCESS && bankInfoQuery.getData() != null) {
codeSet = bankInfoQuery.getData();
excelVo.setFdRecipientBankCode(codeSet.getFdRecipientBankCode());
excelVo.setFdRecipientBank(codeSet.getFdRecipientBank());
} else if (Common.isNotNull(excelVo.getFdRecipientBank())) {
bankVo = bankMap.get(excelVo.getFdRecipientBank());
if (bankVo != null) {
excelVo.setFdRecipientBankCode(bankVo.getFdRecipientBankCode());
excelVo.setFdRecipientBank(bankVo.getFdRecipientBank());
}
}
}
}
......
......@@ -45,4 +45,11 @@ entry:
entryFdFlowId: 191919ae533d080b60e6e784c55a3c8b
entryDocStatus: 20
entryLoginName: admin
entryDocSubject: 入账明细推送ekp接口
\ No newline at end of file
entryDocSubject: 入账明细推送ekp接口
wx:
corpid: wwbcb090af0dfe50e5
corpsecret: 16kqEL_eU-ARwYyqLgEBWHgxm8gXVnkzv_eJMLy9NpU
agentid: 1000010
authUrl: https://test-wx.worfu.com/yifu-auth/method/oauth/wxLogin
domainName: https://test-wx.worfu.com
\ No newline at end of file
......@@ -45,4 +45,11 @@ entry:
entryFdFlowId: 191919ae533d0484bb60c5ed74e55a4b
entryDocStatus: 20
entryLoginName: admin
entryDocSubject: 入账明细推送ekp接口
\ No newline at end of file
entryDocSubject: 入账明细推送ekp接口
wx:
corpid: wwbcb090af0dfe50e5
corpsecret: R0nKkvsY-oF41fuQvUXZ-kFG3_g_Ce0bpZt6mByx524
agentid: 1000009
authUrl: https://wx.worfu.com/yifu-auth/method/oauth/wxLogin
domainName: https://wx.worfu.com
\ No newline at end of file
......@@ -111,4 +111,11 @@ entry:
entryFdFlowId: 191919ae533d080b60e6e784c55a3c8b
entryDocStatus: 20
entryLoginName: admin
entryDocSubject: 入账明细推送ekp接口
\ No newline at end of file
entryDocSubject: 入账明细推送ekp接口
wx:
corpid: wwbcb090af0dfe50e5
corpsecret: 16kqEL_eU-ARwYyqLgEBWHgxm8gXVnkzv_eJMLy9NpU
agentid: 1000010
authUrl: https://test-wx.worfu.com/yifu-auth/method/oauth/wxLogin
domainName: https://test-wx.worfu.com
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!--
~
~ Copyright (c) 2018-2025, lengleng All rights reserved.
~
~ Redistribution and use in source and binary forms, with or without
~ modification, are permitted provided that the following conditions are met:
~
~ Redistributions of source code must retain the above copyright notice,
~ this list of conditions and the following disclaimer.
~ Redistributions in binary form must reproduce the above copyright
~ notice, this list of conditions and the following disclaimer in the
~ documentation and/or other materials provided with the distribution.
~ Neither the name of the yifu4cloud.com developer nor the names of its
~ contributors may be used to endorse or promote products derived from
~ this software without specific prior written permission.
~ Author: lengleng (wangiegie@gmail.com)
~
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yifu.cloud.plus.v1.ekp.mapper.EkpAlertTableMapper">
<resultMap id="budgetWarningMap" type="com.yifu.cloud.plus.v1.ekp.vo.BudgetWarningVo">
<id property="km" column="km"/>
<result property="at" column="at"/>
<result property="ye" column="ye"/>
<result property="bl" column="bl"/>
<result property="cbzx" column="cbzx"/>
<result property="txr" column="txr"/>
</resultMap>
<resultMap id="ekpAlertTableMap" type="com.yifu.cloud.plus.v1.ekp.entity.EkpAlertTable">
<id property="fdId" column="fd_id"/>
<result property="fdAlertSubject" column="fd_alert_subject"/>
<result property="fdAlertSubjectText" column="fd_alert_subject_text"/>
<result property="fdEffectiveStartDate" column="fd_effective_start_date"/>
<result property="fdEffectiveEndDate" column="fd_effective_end_date"/>
<result property="fdDetectionMethod" column="fd_detection_method"/>
<result property="fdThresholdValue" column="fd_threshold_value"/>
<result property="fdIsActive" column="fd_is_active"/>
<result property="fdAlertMessage" column="fd_alert_message"/>
<result property="fdEverydayTime" column="fd_everyday_time"/>
<result property="fdChecktype" column="fd_checktype"/>
<result property="fdMonthday" column="fd_monthday"/>
</resultMap>
<sql id="Base_Column_List">
a.fd_id,
a.fd_alert_subject,
a.fd_alert_subject_text,
a.fd_effective_start_date,
a.fd_effective_end_date,
a.fd_detection_method,
a.fd_threshold_value,
a.fd_is_active,
a.fd_alert_message,
a.fd_everyday_time,
a.fd_checktype,
a.fd_monthday
</sql>
<sql id="ekpAlertTable_where">
<if test="ekpAlertTable != null">
<if test="ekpAlertTable.fdId != null and ekpAlertTable.fdId.trim() != ''">
AND a.fd_id = #{ekpAlertTable.fdId}
</if>
<if test="ekpAlertTable.fdAlertSubject != null and ekpAlertTable.fdAlertSubject.trim() != ''">
AND a.fd_alert_subject = #{ekpAlertTable.fdAlertSubject}
</if>
<if test="ekpAlertTable.fdAlertSubjectText != null and ekpAlertTable.fdAlertSubjectText.trim() != ''">
AND a.fd_alert_subject_text = #{ekpAlertTable.fdAlertSubjectText}
</if>
<if test="ekpAlertTable.fdEffectiveStartDate != null">
AND a.fd_effective_start_date = #{ekpAlertTable.fdEffectiveStartDate}
</if>
<if test="ekpAlertTable.fdEffectiveEndDate != null">
AND a.fd_effective_end_date = #{ekpAlertTable.fdEffectiveEndDate}
</if>
<if test="ekpAlertTable.fdDetectionMethod != null and ekpAlertTable.fdDetectionMethod.trim() != ''">
AND a.fd_detection_method = #{ekpAlertTable.fdDetectionMethod}
</if>
<if test="ekpAlertTable.fdThresholdValue != null">
AND a.fd_threshold_value = #{ekpAlertTable.fdThresholdValue}
</if>
<if test="ekpAlertTable.fdIsActive != null and ekpAlertTable.fdIsActive.trim() != ''">
AND a.fd_is_active = #{ekpAlertTable.fdIsActive}
</if>
<if test="ekpAlertTable.fdAlertMessage != null and ekpAlertTable.fdAlertMessage.trim() != ''">
AND a.fd_alert_message = #{ekpAlertTable.fdAlertMessage}
</if>
<if test="ekpAlertTable.fdEverydayTime != null">
AND a.fd_everyday_time = #{ekpAlertTable.fdEverydayTime}
</if>
<if test="ekpAlertTable.fdChecktype != null and ekpAlertTable.fdChecktype.trim() != ''">
AND a.fd_checktype = #{ekpAlertTable.fdChecktype}
</if>
<if test="ekpAlertTable.fdMonthday != null">
AND a.fd_monthday = #{ekpAlertTable.fdMonthday}
</if>
</if>
</sql>
<!--ekpAlertTable简单分页查询-->
<select id="getEkpAlertTablePage" resultMap="ekpAlertTableMap">
SELECT
<include refid="Base_Column_List"/>
FROM ekp_alert_table a
<where>
1=1
<include refid="ekpAlertTable_where"/>
</where>
</select>
<select id="getBudgetWarningVos" resultMap="budgetWarningMap">
select
a.fd_ke_mu as 'km',
DATE_FORMAT(NOW(),"%Y-%m-%d %H:%i") as 'at',
ROUND((sum(a.fd_money) - sum(ifnull(b.fd_money,0))),2) as 'ye'
,ROUND(sum(ifnull(b.fd_money,0))/sum(a.fd_money)*100,2) as 'bl',
a.fd_cheng_ben_two as 'cbzx',c.txr
from (select sum(a.fd_money) fd_money,a.fd_cheng_ben_two,a.fd_ke_mu,a.fd_fee_type,a.fd_id from view_xing_zheng_yu_suan_all a where a.fd_date_month like concat(DATE_FORMAT(now(),'%Y-'),'%') GROUP BY a.fd_ke_mu,a.fd_cheng_ben_two) a
left join (
select
ifnull(sum(a.fd_money),0) fd_money,fd_ke_mu,fd_cheng_ben_two
from view_xing_zheng_yu_suan a where DATE_FORMAT(a.fd_date,'%Y') = DATE_FORMAT(now(),'%Y')
GROUP BY fd_ke_mu,fd_cheng_ben_two
) b on b.fd_ke_mu = a.fd_ke_mu and b.fd_cheng_ben_two = a.fd_cheng_ben_two
LEFT JOIN (
select GROUP_CONCAT(DISTINCT CONCAT(d.fd_login_name,"_",d.fd_id)) as 'txr',cb.fd_3c290891cded14 from ekp_3cf9b7112e544ba9fe18 cb
LEFT JOIN ekporg_18ca06406b8e5d35104b t on t.fd_parent_id=cb.fd_id
LEFT JOIN sys_org_person d on t.sys_org_person_id=d.fd_id
GROUP BY cb.fd_id
) c on c.fd_3c290891cded14 = a.fd_cheng_ben_two
where a.fd_ke_mu = #{km}
GROUP BY a.fd_ke_mu,a.fd_cheng_ben_two ORDER BY a.fd_id
</select>
<select id="getEkpAlertTableList" resultMap="ekpAlertTableMap">
SELECT
<include refid="Base_Column_List"/>
FROM ekp_alert_table a
<where>
1=1
AND a.fd_effective_start_date <![CDATA[ <= ]]> NOW()
AND a.fd_effective_end_date >= NOW()
AND a.fd_is_active = '是'
<if test="type ==0 ">
AND fd_checktype = '每月'
</if>
<if test="type ==1 ">
AND fd_checktype = '每日'
</if>
</where>
</select>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!--
~
~ Copyright (c) 2018-2025, lengleng All rights reserved.
~
~ Redistribution and use in source and binary forms, with or without
~ modification, are permitted provided that the following conditions are met:
~
~ Redistributions of source code must retain the above copyright notice,
~ this list of conditions and the following disclaimer.
~ Redistributions in binary form must reproduce the above copyright
~ notice, this list of conditions and the following disclaimer in the
~ documentation and/or other materials provided with the distribution.
~ Neither the name of the yifu4cloud.com developer nor the names of its
~ contributors may be used to endorse or promote products derived from
~ this software without specific prior written permission.
~ Author: lengleng (wangiegie@gmail.com)
~
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yifu.cloud.plus.v1.ekp.mapper.EkpBudgetWarningInfoMapper">
<resultMap id="ekpBudgetWarningInfoMap" type="com.yifu.cloud.plus.v1.ekp.entity.EkpBudgetWarningInfo">
<id property="fdId" column="fd_id"/>
<result property="fdContent" column="fd_content"/>
<result property="fdCreateTime" column="fd_create_time"/>
<result property="fdSubject" column="fd_subject"/>
<result property="fdReadStatus" column="fd_read_status"/>
<result property="fdRecipientName" column="fd_recipient_name"/>
<result property="fdRecipientAccount" column="fd_recipient_account"/>
<result property="fdRecipientId" column="fd_recipient_id"/>
</resultMap>
<sql id="Base_Column_List">
a.fd_id,
a.fd_content,
a.fd_create_time,
a.fd_subject,
a.fd_read_status,
a.fd_recipient_name,
a.fd_recipient_account,
a.fd_recipient_id
</sql>
<sql id="ekpBudgetWarningInfo_where">
<if test="ekpBudgetWarningInfo != null">
<if test="ekpBudgetWarningInfo.fdId != null and ekpBudgetWarningInfo.fdId.trim() != ''">
AND a.fd_id = #{ekpBudgetWarningInfo.fdId}
</if>
<if test="ekpBudgetWarningInfo.fdContent != null and ekpBudgetWarningInfo.fdContent.trim() != ''">
AND a.fd_content = #{ekpBudgetWarningInfo.fdContent}
</if>
<if test="ekpBudgetWarningInfo.fdCreateTime != null">
AND a.fd_create_time = #{ekpBudgetWarningInfo.fdCreateTime}
</if>
<if test="ekpBudgetWarningInfo.fdSubject != null and ekpBudgetWarningInfo.fdSubject.trim() != ''">
AND a.fd_subject = #{ekpBudgetWarningInfo.fdSubject}
</if>
<if test="ekpBudgetWarningInfo.fdReadStatus != null and ekpBudgetWarningInfo.fdReadStatus.trim() != ''">
AND a.fd_read_status = #{ekpBudgetWarningInfo.fdReadStatus}
</if>
<if test="ekpBudgetWarningInfo.fdRecipientName != null and ekpBudgetWarningInfo.fdRecipientName.trim() != ''">
AND a.fd_recipient_name = #{ekpBudgetWarningInfo.fdRecipientName}
</if>
<if test="ekpBudgetWarningInfo.fdRecipientAccount != null and ekpBudgetWarningInfo.fdRecipientAccount.trim() != ''">
AND a.fd_recipient_account = #{ekpBudgetWarningInfo.fdRecipientAccount}
</if>
<if test="ekpBudgetWarningInfo.fdRecipientId != null and ekpBudgetWarningInfo.fdRecipientId.trim() != ''">
AND a.fd_recipient_id = #{ekpBudgetWarningInfo.fdRecipientId}
</if>
</if>
</sql>
<!--ekpBudgetWarningInfo简单分页查询-->
<select id="getEkpBudgetWarningInfoPage" resultMap="ekpBudgetWarningInfoMap">
SELECT
<include refid="Base_Column_List"/>
FROM ekp_budget_warning_info a
<where>
1=1
<include refid="ekpBudgetWarningInfo_where"/>
</where>
</select>
</mapper>
......@@ -148,4 +148,10 @@
where a.fd_3a37fe508071fe = #{deptNo}
limit 1
</select>
<select id="getAllIcbcCardBinInfo" resultType="java.lang.String">
select
bank_code
from ekp_icbc_code_config
</select>
</mapper>
......@@ -29,6 +29,7 @@ import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TEmployeeInsuran
import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.ScheduleService;
import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TEmployeeInsurancePreService;
import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceDetailService;
import com.yifu.cloud.plus.v1.yifu.insurances.util.LocalDateUtil;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
......@@ -226,6 +227,8 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
addParam.setRemark(CommonConstants.EMPTY_STRING);
addParam.setInsurancePreId(insurancePre.getId());
addParam.setCustomerUserName(insurancePre.getCustomerUsername());
addParam.setPolicyStart(LocalDateUtil.parseLocalDate(DateUtil.dateToString(insurancePre.getPolicyStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT)));
addParam.setPolicyEnd(LocalDateUtil.parseLocalDate(DateUtil.dateToString(insurancePre.getPolicyEnd(),DateUtil.ISO_EXPANDED_DATE_FORMAT)));
batchAddParamList.add(addParam);
}
if (CommonConstants.FOUR_INT == insurancePre.getBuyType()) {
......
......@@ -3310,8 +3310,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
listResult.add(param);
continue;
}
param.setPolicyStart(limitOne.getPolicyStart());
param.setPolicyEnd(limitOne.getPolicyEnd());
//自动化派单的取自动化派单的起止日期
if (Common.isEmpty(param.getPolicyStart()) && Common.isEmpty(param.getPolicyEnd())) {
param.setPolicyStart(limitOne.getPolicyStart());
param.setPolicyEnd(limitOne.getPolicyEnd());
}
}
// 保险公司-险种-购买标准 是否存在
......
......@@ -72,4 +72,25 @@ public class EkpTask {
HttpDaprUtil.invokeMethodPost(daprEkpProperties.getAppUrl(),daprEkpProperties.getAppId(),"/icbcIssue/inner/getPdfFile","", Object.class, SecurityConstants.FROM_IN);
log.info("------------定时生成生成昨日的回单文件-定时任务结束------------");
}
/**
* @Author fxj
* @Description 每日预算预警信息
* @Date 16:49 2025/7/21
**/
public void pushBudgetAlertInfoTomanager() {
log.info("------------定时生成每日预算预警信息-定时任务开始------------");
HttpDaprUtil.invokeMethodPost(daprEkpProperties.getAppUrl(),daprEkpProperties.getAppId(),"/ekpalerttable/inner/pushBudgetAlertInfoTomanager","", Object.class, SecurityConstants.FROM_IN);
log.info("------------定时生成生每日预算预警信息-定时任务结束------------");
}
/**
* @Author fxj
* @Description 每月预算预警信息
* @Date 16:49 2025/7/21
**/
public void pushBudgetAlertInfoTomanagerMonth() {
log.info("------------定时生成每月预算预警信息-定时任务开始------------");
HttpDaprUtil.invokeMethodPost(daprEkpProperties.getAppUrl(),daprEkpProperties.getAppId(),"/ekpalerttable/inner/pushBudgetAlertInfoTomanagerMonth","", Object.class, SecurityConstants.FROM_IN);
log.info("------------定时生成每月预算预警信息-定时任务结束------------");
}
}
\ No newline at end of file
......@@ -276,5 +276,15 @@ public class SocialTask {
HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tsocialsoldier/inner/doInnerGetPaymentThree","", Object.class, SecurityConstants.FROM_IN);
log.info("------------7每月6号3点定时任务获取社保士兵实缴3张表-定时任务结束------------");
}
/**
* @Author fxj
* @Description 定时任务每月1日3点定时更新跨月的继续办理的数据为终止办理
* @Date 10:45 2025/7/14
**/
public void doChangeHandleStatusToEnd() {
log.info("------------定时任务每月1日3点定时更新跨月的继续办理的数据为终止办理-定时任务开始------------");
HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),
"/tsocialfriend/inner/doChangeHandleStatusToEnd","", Object.class, SecurityConstants.FROM_IN);
log.info("------------定时任务每月1日3点定时更新跨月的继续办理的数据为终止办理-定时任务结束------------");
}
}
......@@ -52,4 +52,12 @@ public class updateUserTask {
HttpDaprUtil.invokeMethodPost(daprUpmsProperties.getAppUrl(),daprUpmsProperties.getAppId(),"/dept/inner/updateDept","", SysDept.class, SecurityConstants.FROM_IN);
log.info("------------更新部门-定时任务结束------------");
}
public void everyDayPushGzBankBranck() {
log.info("-------------每日1:30 拉取瓜子支行信息-定时任务开始------------");
HttpDaprUtil.invokeMethodPost(daprUpmsProperties.getAppUrl(), daprUpmsProperties.getAppId(),
"/sysguazibankbranch/inner/pushBankBranck", "", Object.class,
SecurityConstants.FROM_IN);
log.info("-------------每日1.30 拉取瓜子支行信息-定时任务结束------------");
}
}
......@@ -57,11 +57,11 @@ public class TAttaInfo extends BaseEntity {
@Schema(description = "资源类型")
private String attaType;
/**
* 1户配置的章;2:派单审核附件,税友单个使用
* 1户配置的章;2:派单审核附件,税友单个使用,社保3医保附件
*/
@NotBlank(message = "关系类型不能为空")
@Length(max = 2, message = "关系类型不能超过2个字符")
@Schema(description = "关系类型(1户配置的章;2:派单审核附件,税友单个使用)")
@Schema(description = "关系类型(1户配置的章;2:派单审核附件,税友单个使用,社保;3医保附件)")
private String relationType;
/**
* 实体id和关系类型共同确定附件所属(9、10、21、22、23、24、25存项目档案id,0、2、26存附属表id)
......
......@@ -1011,11 +1011,20 @@ public class TSocialInfo extends BaseEntity {
* 医保起缴日期顺延到次月
* 2025-3-13 17:22:35 hgw
*/
@ExcelAttribute(name = "医保起缴日期顺延到次月", isDate = true)
@Schema(description = "医保起缴日期顺延到次月" )
@ExcelAttribute(name = "医保顺延时间", isDate = true)
@Schema(description = "医保顺延时间" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保起缴日期顺延到次月" )
@ExcelProperty("医保顺延时间" )
private Date ysdSocialStartDateNext;
/**
* 社保起缴日期顺延到次月
* 2025-7-11 11:42:01 hgw
*/
@ExcelAttribute(name = "社保顺延时间", isDate = true)
@Schema(description = "社保顺延时间" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保顺延时间" )
private Date ygsSocialStartDateNext;
/**
* 养工失反馈-原反馈
*/
......
......@@ -83,8 +83,10 @@ public class SociaFriendYgsAddVo implements Serializable {
// 企业职工社会保险增员花名册 qyzgshbxzyhmc
private String qyzgshbxzyhmc;
// 单个附件list
private List<String> imgList;
// 单个附件list_社保
private List<String> imgListYgs;
// 单个附件list——医保
private List<String> imgListYsd;
// 自动生成解除劳动证明
private String autoLeaveDoc;
// 当前行政经办区——2025-3-31 10:23:02 盛宇与税友沟通,可以默认安徽省,暂时不用这个字段了,后面有特殊要求再加
......
......@@ -179,4 +179,13 @@ public class SocialHandleSearchVo extends TDispatchInfo {
@ExcelIgnore
private String[] socialHandleStatusArr;
/**
* @Author fxj
* @Description 社保反馈文件下载标识
* @Date 12:28 2025/7/17
**/
@ExcelProperty("社保反馈文件下载标识" )
@ExcelIgnore
private String backFileFlag;
}
package com.yifu.cloud.plus.v1.yifu.social.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.excel.annotation.write.style.ContentStyle;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
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 java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* @Author hgw
* @Description 社保士兵自动办理导出
* @Date 2024-5-13 10:56:51
* @Param
* @return
**/
@Data
public class SocialSoldierBackVo implements Serializable {
/**
* 派单ID
*/
@ExcelAttribute(name = "派单ID")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("派单ID")
private String dispatchId;
/**
* 员工姓名
*/
@ExcelAttribute(name = "员工姓名")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("员工姓名")
private String empName;
/**
* 员工身份证
*/
@ExcelAttribute(name = "员工身份证", errorInfo = "员工身份证不能为空", maxLength = 20, needExport = true)
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("员工身份证")
private String empIdcard;
@ExcelAttribute(name = "养老工伤失业-办理状态", readConverterExp = "0=无,1=待办理,2=自动办理中,3=继续办理,4=中止办理,5=人工处理,6=成功,7=提交成功", needExport = true)
@Schema(description = "养老工伤失业-办理状态")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养老工伤失业-办理状态")
private String ygsHandleStatus;
@ExcelAttribute(name = "医保生育大病-办理状态", readConverterExp = "0=无,1=待办理,2=自动办理中,3=继续办理,4=中止办理,5=人工处理,6=成功,7=提交成功", needExport = true)
@Schema(description = "医保生育大病-办理状态")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保生育大病-办理状态")
private String ysdHandleStatus;
@ExcelAttribute(name = "社保明细ID")
@Schema(description = "社保明细ID")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保明细ID")
private String socialId;
/**
* 社保户
*/
@ExcelAttribute(name = "社保户", needExport = true)
@Schema(description = "社保户")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保户")
private String socialHouseholdName;
}
......@@ -525,5 +525,23 @@ public class SocialSoldierExportVo implements Serializable {
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保请求ID")
private String ysdRequestId;
/**
* 医保起缴日期顺延到次月
* 2025-3-13 17:22:35 hgw
*/
@ExcelAttribute(name = "医保顺延时间", isDate = true)
@Schema(description = "医保顺延时间" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保顺延时间" )
private String ysdSocialStartDateNext;
/**
* 社保起缴日期顺延到次月
* 2025-7-11 11:42:01 hgw
*/
@ExcelAttribute(name = "社保顺延时间", isDate = true)
@Schema(description = "社保顺延时间" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保顺延时间" )
private String ygsSocialStartDateNext;
}
......@@ -25,6 +25,7 @@ import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.util.Date;
/**
* 社保士兵列表查询
......@@ -111,5 +112,34 @@ public class TSocialSoldierPageVo extends TDispatchInfo {
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保请求ID" )
private String ysdRequestId;
/**
* 医保起缴日期顺延到次月
* 2025-3-13 17:22:35 hgw
*/
@ExcelAttribute(name = "医保顺延时间", isDate = true)
@Schema(description = "医保顺延时间" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保顺延时间" )
private Date ysdSocialStartDateNext;
/**
* 社保起缴日期顺延到次月
* 2025-7-11 11:42:01 hgw
*/
@ExcelAttribute(name = "社保顺延时间", isDate = true)
@Schema(description = "社保顺延时间" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保顺延时间" )
private Date ygsSocialStartDateNext;
/**
* @Author fxj
* @Description 社保反馈文件下载标识
* @Date 12:28 2025/7/17
**/
@ExcelAttribute(name = "社保反馈文件下载标识", maxLength = 20)
@Schema(description = "社保反馈文件下载标识" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保反馈文件下载标识" )
private String backFileFlag;
}
......@@ -947,4 +947,28 @@ public class TDispatchInfoController {
return tDispatchInfoService.doExportRoster(socialId,type,unitCreditCode);
}
/**
* @Author fxj
* @Description
* @Date 15:20 2025/7/15
**/
@PostMapping("/doExportSocialSoldierAllBackFile")
@Operation(description = "自动化办理查询导出反馈文件")
@SysLog("自动化办理查询导出反馈文件")
public void doExportSocialSoldierAllBackFile(HttpServletResponse response, HttpServletRequest request,
@RequestBody SocialHandleSearchVo searchVo) {
tDispatchInfoService.doExportSocialSoldierAllBackFile(response,searchVo,searchVo.getIdStr());
}
/**
* @Author fxj
* @Description
* @Date 15:20 2025/7/15
**/
@PostMapping("/doExportSocialSoldierBackFileById")
@Operation(description = "自动化办理查询导出反馈文件单个")
@SysLog("自动化办理查询导出反馈文件单个")
public R<String> doExportSocialSoldierBackFileById(@RequestBody SocialHandleSearchVo searchVo) {
return tDispatchInfoService.doExportSocialSoldierBackFileById(searchVo.getIdStr());
}
}
......@@ -166,4 +166,18 @@ public class TSocialFriendController {
}
}
/**
* @Author fxj
* @Description 定时任务每月1日3点定时更新跨月的继续办理的数据为终止办理
* @Date 10:40 2025/7/14
* @Param
* @return
**/
@Operation(description = "定时任务每月1日3点定时更新跨月的继续办理的数据为终止办理")
@PostMapping("/inner/doChangeHandleStatusToEnd")
@SysLog("定时任务每月1日3点定时更新跨月的继续办理的数据为终止办理")
@Inner
public void doChangeHandleStatusToEnd() {
tSocialFriendService.changeSocialHandndleStatus();
}
}
......@@ -70,4 +70,14 @@ public interface SysHouseHoldInfoMapper extends BaseMapper<SysHouseHoldInfo> {
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo>
**/
List<SysHouseHoldInfo> getAttaSrcByAutoDoc();
/**
* @Author fxj
* @Description 获取启用自动化的户信息
* @Date 9:35 2025/7/17
* @Param
* @return
**/
List<SysHouseHoldInfo> getHouseInfoAutoDoc();
}
......@@ -306,4 +306,14 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
List<String> getSingleFlagMap(@Param("idsList")List<String> idsList);
// 获取自动生成减员离职证明的派单ID
List<String> getAutoDocFlagMap(@Param("idsList")List<String> idsList);
/**
* @Author fxj
* @Description 自动化办理查询导出反馈文件
* @Date 15:29 2025/7/15
**/
List<SocialSoldierBackVo> getSocialSoldierAllListBackFile(@Param("tDispatchInfo") SocialHandleSearchVo dispatchInfo,
@Param("idsStr") List<String> idsStr);
int updateBackFileFlag(@Param("idsStr") List<String> idsStr);
}
......@@ -53,6 +53,9 @@ public interface TSocialInfoMapper extends BaseMapper<TSocialInfo> {
List<TSocialInfo> getSocialFriendYgsAll();
List<TSocialInfo> getSocialFriendYsdAll();
List<TSocialInfo> getSocialFriendYgsAllTask();
List<TSocialInfo> getSocialFriendYsdAllTask();
/**
* @param
* @Description: 获取所有需要社保局审核的社保
......
......@@ -187,4 +187,8 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
List<SocialHandleExportVo> getRecordRosterList(SocialHandleSearchVo searchVo, String idStr);
R<URL> doExportRoster(String socialId, String type,String unitCreditCode);
void doExportSocialSoldierAllBackFile(HttpServletResponse response, SocialHandleSearchVo searchVo, String idStr);
R<String> doExportSocialSoldierBackFileById(String idStr);
}
......@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.social.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo;
import org.springframework.transaction.annotation.Transactional;
/**
* 社保士兵
......@@ -37,4 +38,6 @@ public interface TSocialFriendService extends IService<TSocialInfo> {
**/
R<String> getInfoByRequestId();
@Transactional
void changeSocialHandndleStatus();
}
......@@ -70,6 +70,9 @@ public interface TSocialInfoService extends IService<TSocialInfo> {
List<TSocialInfo> getSocialFriendYgsAll();
List<TSocialInfo> getSocialFriendYsdAll();
List<TSocialInfo> getSocialFriendYgsAllTask();
List<TSocialInfo> getSocialFriendYsdAllTask();
/**
* @Description: 获取所有需要审核结果的社保
* @Author: hgw
......
......@@ -375,7 +375,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
private void setImgList(SociaFriendYgsAddVo vo) {
URL url;
InputStream inStream = null;
List<String> imgList = new ArrayList<>();
List<String> imgListYgs = new ArrayList<>();
List<String> imgListYsd = new ArrayList<>();
List<TAttaInfo> attaInfoList = attaInfoMapper.getTAttaInfoListByDoMainId(vo.getDispatchId());
if (attaInfoList != null && !attaInfoList.isEmpty()) {
String base64String;
......@@ -396,7 +397,11 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
imgUrl = socialFriendConfig.uploadPng(restTemplate, attaInfo.getAttaName(), base64String, backLog);
tSocialFriendBackLogService.save(backLog);
if (Common.isNotNull(imgUrl)){
imgList.add(imgUrl);
if (Common.isEmpty(attaInfo.getRelationType()) || CommonConstants.TWO_STRING.equals(attaInfo.getRelationType())) {
imgListYgs.add(imgUrl);
} else {
imgListYsd.add(imgUrl);
}
}
} catch (Exception e){
log.info("税友单个图片上传失败!");
......@@ -412,7 +417,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
}
}
}
vo.setImgList(imgList);
vo.setImgListYgs(imgListYgs);
vo.setImgListYsd(imgListYsd);
}
}
......@@ -450,6 +456,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
TSocialFriendReduceSet reduceSet;
// 是否为生成解除劳动合同书 且是 派减
boolean isAutoLeaveDoc;
// 是否为单个推送(派单审核时定性的)
boolean isSingle;
for (int index = 0 ; index < ysdAddlist.size(); index++) {
vo = ysdAddlist.get(index);
......@@ -503,9 +511,10 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
&& !vo.getSocialHouseholdName().equals(ysdAddlist.get(index+1).getSocialHouseholdName())) {
nextFlag = true;
}
isSingle = Common.isNotNull(vo.getIsSingle()) && CommonConstants.ONE_STRING.equals(vo.getIsSingle());
isAutoLeaveDoc = templateUrl != null && type == 4 && Common.isNotNull(vo.getIsAutoLeaveDoc())
&& CommonConstants.ONE_STRING.equals(vo.getIsAutoLeaveDoc());
if (isAutoLeaveDoc || nextFlag || i % 10 == 0 || index >= ysdAddlist.size()-1) {
if (isAutoLeaveDoc || isSingle || nextFlag || i % 10 == 0 || index >= ysdAddlist.size()-1) {
// 房工接口,获取 企业职工基本医疗保险参保登记表 url
urlR = doExportRoster(vo.getSocialId(), String.valueOf(type), vo.getUnitCreditCode(), listVo);
if (urlR != null && urlR.getCode() == 200 && Common.isNotNull(urlR.getData())) {
......@@ -515,6 +524,10 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
if (isAutoLeaveDoc) {
this.doSetAutoDoc(zhangMap, templateUrl, vo, CommonConstants.NINE_INTEGER);
}
if (isSingle && Common.isNotNull(vo.getDispatchId())) {
// 获取单个附件并推送税友,返回 imgList 到Vo里
this.setImgList(vo);
}
i=0;
nextFlag = false;
requestId = socialFriendConfig.pushFriendByInfo(restTemplate, vo, listVo, type, thisTime, backLogList);
......
......@@ -706,5 +706,26 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
}
}
}
/**
* @Author fxj
* @Description 获取养工失跨月继续办理的数据
* @Date 9:50 2025/7/14
* @Param
* @return
**/
@Override
public List<TSocialInfo> getSocialFriendYgsAllTask() {
return baseMapper.getSocialFriendYgsAllTask();
}
/**
* @Author fxj
* @Description 获取医生大跨月继续办理的数据
* @Date 9:49 2025/7/14
* @Param
* @return
**/
@Override
public List<TSocialInfo> getSocialFriendYsdAllTask() {
return baseMapper.getSocialFriendYsdAllTask();
}
}
......@@ -70,6 +70,8 @@ socialFriend:
urlGetInfoAdd : /gateway/socins/hrss/employee/v2/getRegisterFeedback
urlPushReduce : /gateway/socins/hrss/employee/v2/stop
urlGetInfoReduce : /gateway/socins/hrss/employee/v2/getStopFeedback
urlDownloadEmployeeAsync: /gateway/pts/hrss/sourceFile/downloadEmployeeAsync
urlDownloadEmployeeFeedback: /gateway/pts/hrss/sourceFile/downloadEmployeeFeedback
urlUpload : /gateway/file/upload
#测试
appKey : 89357285571962202409230949030
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment