Commit ac0fdef4 authored by chenyuxi's avatar chenyuxi

feat: 存瓜子offer日志

parent e5372798
...@@ -60,11 +60,11 @@ public class LGuaziOfferRecord extends BaseEntity { ...@@ -60,11 +60,11 @@ public class LGuaziOfferRecord extends BaseEntity {
private String content; private String content;
/** /**
* 记录来源 * 记录来源
* (1:手动更新状态;2:编辑offer信息;3:发送Offer查阅短信;4:发送信息收集短信;5:(系统触发)收集短信发送成功;6:(系统触发)C端采集提交; * (1:手动更新状态;2:编辑offer信息;3:发送Offer查阅短信;4:发送信息收集短信;5:收集短信发送成功;6:(系统触发)C端采集提交;
* 7:档案审核;9:发起合同申请10:合同审核通过;11:(系统触发)合同归档;12:发送合同下载短信) * 7:档案审核;9:发起合同申请10:合同审核通过;11:合同归档;12:发送合同下载短信)
*/ */
@Length(max = 2, message = "记录来源不能超过2个字符") @Length(max = 2, message = "记录来源不能超过2个字符")
@Schema(description = "记录来源(1:手动更新状态;2:编辑offer信息;3:发送Offer查阅短信;4:发送信息收集短信;5:(系统触发)收集短信发送成功;6:(系统触发)C端采集提交;7:档案审核通过;9:发起合同申请10:合同审核通过;11:合同归档;12:发送合同下载短信)") @Schema(description = "记录来源(1:手动更新状态;2:编辑offer信息;3:发送Offer查阅短信;4:发送信息收集短信;5:收集短信发送成功;6:(系统触发)C端采集提交;7:档案审核通过;9:发起合同申请10:合同审核通过;11:合同归档;12:发送合同下载短信)")
private String recordFrom; private String recordFrom;
/** /**
* 删除标记 * 删除标记
......
...@@ -99,4 +99,8 @@ public class TGzEmpInfoSearchVo extends TGzEmpInfo { ...@@ -99,4 +99,8 @@ public class TGzEmpInfoSearchVo extends TGzEmpInfo {
@TableField(exist = false) @TableField(exist = false)
private List<TAttaInfo> attaList; private List<TAttaInfo> attaList;
// 员工声明
@TableField(exist = false)
private TPreEmpDeclaration tPreEmpDeclaration;
} }
...@@ -43,15 +43,15 @@ public interface LGuaziOfferRecordService extends IService<LGuaziOfferRecord> { ...@@ -43,15 +43,15 @@ public interface LGuaziOfferRecordService extends IService<LGuaziOfferRecord> {
* @param lGuaziOfferRecordVo 瓜子offer操作日志包装类 * @param lGuaziOfferRecordVo 瓜子offer操作日志包装类
* 传参:记录来源(recordFrom) * 传参:记录来源(recordFrom)
* 1:手动更新状态;2:编辑offer信息;3:发送Offer查阅短信;4:发送信息收集短信; * 1:手动更新状态;2:编辑offer信息;3:发送Offer查阅短信;4:发送信息收集短信;
* 5:(系统触发)收集短信发送成功更新状态;6:(系统触发)C端采集提交;7:档案审核通过;8:档案审核不通过; * 5:收集短信发送成功更新状态;6:(系统触发)C端采集提交;7:档案审核通过;8:档案审核不通过;
* 9:发起合同申请;10:合同审核通过;11:(系统触发)合同归档;12:发送合同下载短信) * 9:发起合同申请;10:合同审核通过;11:合同归档;12:发送合同下载短信)
*/ */
void saveRecordOne(LGuaziOfferRecordVo lGuaziOfferRecordVo); void saveRecordOne(LGuaziOfferRecordVo lGuaziOfferRecordVo);
/** /**
* 批量增加 操作日志 * 批量增加 操作日志
* 5:(系统触发)收集短信发送成功更新状态; * 5:收集短信发送成功更新状态;
* 3:发送Offer查阅短信; * 3:发送Offer查阅短信;
* 4:发送信息收集短信; * 4:发送信息收集短信;
* 12:发送合同下载短信 * 12:发送合同下载短信
......
...@@ -116,8 +116,8 @@ public class LGuaziOfferRecordServiceImpl extends ServiceImpl<LGuaziOfferRecordM ...@@ -116,8 +116,8 @@ public class LGuaziOfferRecordServiceImpl extends ServiceImpl<LGuaziOfferRecordM
// 记录来源 // 记录来源
// 1:手动更新状态;2:编辑offer信息;3:发送Offer查阅短信;4:发送信息收集短信; // 1:手动更新状态;2:编辑offer信息;3:发送Offer查阅短信;4:发送信息收集短信;
// 5:(系统触发)收集短信发送成功更新状态;6:(系统触发)C端采集提交;7:档案审核 // 5:收集短信发送成功更新状态;6:(系统触发)C端采集提交;7:档案审核
// 9:发起合同申请;10:合同审核通过;11:(系统触发)合同归档;12:发送合同下载短信) // 9:发起合同申请;10:合同审核通过;11:合同归档;12:发送合同下载短信)
// 属于状态更新 // 属于状态更新
String[] statusChangeArr = {"1", "5", "6", "7", "9", "10", "11"}; String[] statusChangeArr = {"1", "5", "6", "7", "9", "10", "11"};
...@@ -175,7 +175,7 @@ public class LGuaziOfferRecordServiceImpl extends ServiceImpl<LGuaziOfferRecordM ...@@ -175,7 +175,7 @@ public class LGuaziOfferRecordServiceImpl extends ServiceImpl<LGuaziOfferRecordM
} }
// 属于系统更新的,记录创建人为 0:系统触发 // 属于系统更新的,记录创建人为 0:系统触发
String[] sysCreateArr = {"5", "6","11"}; String[] sysCreateArr = {"6"};
if (ArrayUtils.contains(sysCreateArr, lGuaziOfferRecordVo.getRecordFrom())) { if (ArrayUtils.contains(sysCreateArr, lGuaziOfferRecordVo.getRecordFrom())) {
lGuaziOfferRecordVo.setCreateBy("0"); lGuaziOfferRecordVo.setCreateBy("0");
lGuaziOfferRecordVo.setCreateName("系统触发"); lGuaziOfferRecordVo.setCreateName("系统触发");
......
...@@ -983,7 +983,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -983,7 +983,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
@Override @Override
public R<String> filingContract(TEmployeeContractInfo tEmployeeContractInfo) { public R<String> filingContract(TEmployeeContractInfo tEmployeeContractInfo) {
YifuUser user = SecurityUtils.getUser();
if (user == null || Common.isEmpty(user.getId())) {
return R.failed(CommonConstants.PLEASE_LOG_IN);
}
if (tEmployeeContractInfo != null) { if (tEmployeeContractInfo != null) {
if ((Common.isNotNull(tEmployeeContractInfo.getContractNo()) && tEmployeeContractInfo.getContractNo().length() > 50) if ((Common.isNotNull(tEmployeeContractInfo.getContractNo()) && tEmployeeContractInfo.getContractNo().length() > 50)
|| (Common.isNotNull(tEmployeeContractInfo.getFileCabinetNo()) && tEmployeeContractInfo.getFileCabinetNo().length() > 50)) { || (Common.isNotNull(tEmployeeContractInfo.getFileCabinetNo()) && tEmployeeContractInfo.getFileCabinetNo().length() > 50)) {
...@@ -1019,7 +1022,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1019,7 +1022,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
//瓜子项目编码:皖A694302 //瓜子项目编码:皖A694302
if (CommonConstants.GZ_DEPT_NO.equals(tEmployeeContractInfo.getDeptNo())) { if (CommonConstants.GZ_DEPT_NO.equals(tEmployeeContractInfo.getDeptNo())) {
//合同归档瓜子合同状态更新已归档 //合同归档瓜子合同状态更新已归档
updateGzOfferStatus(tEmployeeContractInfo,CommonConstants.EIGHT_STRING,CommonConstants.NINETY_NINE,"0","系统自动触发"); updateGzOfferStatus(tEmployeeContractInfo,CommonConstants.EIGHT_STRING,CommonConstants.NINETY_NINE,user.getId(),user.getNickname());
} }
} else { } else {
this.setFileInfo(tEmployeeContractInfo.getId(), ""); this.setFileInfo(tEmployeeContractInfo.getId(), "");
...@@ -2248,7 +2251,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -2248,7 +2251,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
// 瓜子状态变更增加操作日志 // 瓜子状态变更增加操作日志
// 13:待签署,8:合同审核通过,99:已归档 // 13:待签署,8:合同审核通过,99:已归档
// 9:发起合同申请10:合同审核通过;11:(系统触发)合同归档; // 9:发起合同申请10:合同审核通过;11:合同归档;
String recordFrom = ""; String recordFrom = "";
switch (updStatus) { switch (updStatus) {
case "13": case "13":
......
...@@ -2646,11 +2646,11 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2646,11 +2646,11 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if(changeStatusList.size() > 0){ if(changeStatusList.size() > 0){
lGuaziOfferRecordVo.setOfferId(gzOfferInfo.getId()); lGuaziOfferRecordVo.setOfferId(gzOfferInfo.getId());
// 记录来源: 档案审核 // 记录来源: 10:合同审核通过
lGuaziOfferRecordVo.setRecordFrom("10"); lGuaziOfferRecordVo.setRecordFrom(CommonConstants.TEN_STRING);
lGuaziOfferRecordVo.setChangeStatusList(changeStatusList); lGuaziOfferRecordVo.setChangeStatusList(changeStatusList);
lGuaziOfferRecordVo.setCreateBy("0"); lGuaziOfferRecordVo.setCreateBy(vo.getCreateBy());
lGuaziOfferRecordVo.setCreateName("系统触发"); lGuaziOfferRecordVo.setCreateName(vo.getCreateName());
lGuaziOfferRecordService.saveRecordOne(lGuaziOfferRecordVo); lGuaziOfferRecordService.saveRecordOne(lGuaziOfferRecordVo);
} }
} }
...@@ -2782,15 +2782,13 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2782,15 +2782,13 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if(changeStatusList.size() > 0){ if(changeStatusList.size() > 0){
lGuaziOfferRecordVo.setOfferId(gzOfferInfo.getId()); lGuaziOfferRecordVo.setOfferId(gzOfferInfo.getId());
// 记录来源: 发起合同申请 // 记录来源: 9:发起合同申请
lGuaziOfferRecordVo.setRecordFrom("9"); lGuaziOfferRecordVo.setRecordFrom(CommonConstants.NINE_STRING);
lGuaziOfferRecordVo.setChangeStatusList(changeStatusList); lGuaziOfferRecordVo.setChangeStatusList(changeStatusList);
lGuaziOfferRecordVo.setCreateBy("0"); lGuaziOfferRecordVo.setCreateBy(contract.getCreateBy());
lGuaziOfferRecordVo.setCreateName("系统触发"); lGuaziOfferRecordVo.setCreateName(contract.getCreateName());
lGuaziOfferRecordService.saveRecordOne(lGuaziOfferRecordVo); lGuaziOfferRecordService.saveRecordOne(lGuaziOfferRecordVo);
} }
} }
} }
audit = new TEmployeeContractAudit(); audit = new TEmployeeContractAudit();
......
...@@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; ...@@ -28,6 +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.admin.api.vo.AreaMap;
import com.yifu.cloud.plus.v1.yifu.archives.entity.*; 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.mapper.*;
import com.yifu.cloud.plus.v1.yifu.archives.service.LGuaziOfferRecordService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TAttaInfoService; import com.yifu.cloud.plus.v1.yifu.archives.service.TAttaInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TGzEmpInfoService; import com.yifu.cloud.plus.v1.yifu.archives.service.TGzEmpInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.util.IdCardUtil; import com.yifu.cloud.plus.v1.yifu.archives.util.IdCardUtil;
...@@ -89,6 +90,10 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI ...@@ -89,6 +90,10 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
@Autowired @Autowired
private OSSUtil ossUtil; private OSSUtil ossUtil;
private final LGuaziOfferRecordService lGuaziOfferRecordService;
private final TPreEmpDeclarationMapper declarationMapper;
/** /**
* 瓜子档案表简单分页查询 * 瓜子档案表简单分页查询
...@@ -115,9 +120,6 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI ...@@ -115,9 +120,6 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
if(Common.isEmpty(gzOfferInfo)){ if(Common.isEmpty(gzOfferInfo)){
return R.failed("数据异常,禁止操作"); return R.failed("数据异常,禁止操作");
} }
// if(!CommonConstants.NINE_STRING.equals(gzOfferInfo.getOfferStatus())){
// return R.failed("当前Offer不符合档案采集状态,禁止操作");
// }
TGzEmpInfo gzEmpInfo = this.getOne(Wrappers.<TGzEmpInfo>query().lambda() TGzEmpInfo gzEmpInfo = this.getOne(Wrappers.<TGzEmpInfo>query().lambda()
.eq(TGzEmpInfo::getOfferId, offerId) .eq(TGzEmpInfo::getOfferId, offerId)
...@@ -205,6 +207,10 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI ...@@ -205,6 +207,10 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
} }
gzEmpInfoVo.setAttaList(attaInfos); gzEmpInfoVo.setAttaList(attaInfos);
} }
TPreEmpDeclaration tPreEmpDeclaration = declarationMapper.getTPreEmpDeclarationList();
gzEmpInfoVo.setTPreEmpDeclaration(tPreEmpDeclaration);
return R.ok(gzEmpInfoVo); return R.ok(gzEmpInfoVo);
} }
...@@ -449,6 +455,10 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI ...@@ -449,6 +455,10 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
} }
gzOfferInfo.setOfferStatus("12"); gzOfferInfo.setOfferStatus("12");
gzOfferInfoMapper.updateById(gzOfferInfo); gzOfferInfoMapper.updateById(gzOfferInfo);
// 记录状态变更的offer操作日志 记录来源: 6:(系统触发)C端采集提交
this.saveOfferStatusRecord(gzOfferInfo.getId(),CommonConstants.SIX_STRING,
CommonConstants.NINE_STRING,gzOfferInfo.getOfferStatus(),"0","系统触发");
} }
String gzEmpId = tGzEmpInfoVo.getId(); String gzEmpId = tGzEmpInfoVo.getId();
...@@ -545,11 +555,38 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI ...@@ -545,11 +555,38 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
attaInfoService.saveBatch(attaList); attaInfoService.saveBatch(attaList);
} }
// TODO - 宇茜加保存日志,加完后删除TODO
return R.ok(); return R.ok();
} }
/**
* 记录单个状态变更的offer操作日志
* @param offerId offerId
* @param recordFrom 记录来源
* @param beforeStatus 变更前状态
* @param nowStatus 当前状态
* @param userId 触发人ID
* @param nickname 触发人名称
*/
private void saveOfferStatusRecord(Integer offerId, String recordFrom,
String beforeStatus, String nowStatus, String userId, String nickname){
// 记录offer操作日志
LGuaziOfferRecordVo lGuaziOfferRecordVo = new LGuaziOfferRecordVo();
// 存变更前后的状态到 状态数组里
List<String> changeStatusList = new ArrayList<>();
changeStatusList.add(beforeStatus);
changeStatusList.add(nowStatus);
if(changeStatusList.size() > 0){
lGuaziOfferRecordVo.setOfferId(offerId);
// 记录来源
lGuaziOfferRecordVo.setRecordFrom(recordFrom);
lGuaziOfferRecordVo.setChangeStatusList(changeStatusList);
lGuaziOfferRecordVo.setCreateBy(userId);
lGuaziOfferRecordVo.setCreateName(nickname);
lGuaziOfferRecordService.saveRecordOne(lGuaziOfferRecordVo);
}
}
@Override @Override
public boolean saveEmpInfoByGz(TGzOfferInfo offerInfo) { public boolean saveEmpInfoByGz(TGzOfferInfo offerInfo) {
// TODO - 保存到人员档案 // TODO - 保存到人员档案
......
...@@ -309,22 +309,23 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz ...@@ -309,22 +309,23 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
* @return String 后续offer要更新的状态 * @return String 后续offer要更新的状态
*/ */
private String checkSaveContract(String nationalId,Integer offerId, String workLocation){ private String checkSaveContract(String nationalId,Integer offerId, String workLocation){
// 默认是审核通过 // 默认是档案审核通过
String changeStatus = "97"; String changeStatus = "97";
TEmployeeContractInfo contractInfo = employeeContractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda() TEmployeeContractInfo contractInfo = employeeContractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda()
.eq(TEmployeeContractInfo::getDeptNo, CommonConstants.GZ_DEPT_NO) .eq(TEmployeeContractInfo::getDeptNo, CommonConstants.GZ_DEPT_NO)
.eq(TEmployeeContractInfo::getEmpIdcard, nationalId) .eq(TEmployeeContractInfo::getEmpIdcard, nationalId)
.eq(TEmployeeContractInfo::getInUse, CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
if(Common.isNotNull(contractInfo)){ if(Common.isNotNull(contractInfo)){
// 合同已归档 // 合同已归档
if(CommonConstants.ZERO_STRING.equals(contractInfo.getIsFile())){ if(CommonConstants.ZERO_STRING.equals(contractInfo.getIsFile())
&& CommonConstants.ZERO_STRING.equals(contractInfo.getInUse())){
// 生成瓜子档案里的合同信息 // 生成瓜子档案里的合同信息
this.saveContractInfoToGzEmpInfo(contractInfo, offerId, workLocation); this.saveContractInfoToGzEmpInfo(contractInfo, offerId, workLocation);
return "99"; return "99";
} }
// 合同审核通过 // 合同审核通过
if(CommonConstants.TWO_INTEGER.equals(contractInfo.getAuditStatus())){ if(CommonConstants.TWO_INTEGER.equals(contractInfo.getAuditStatus())
&& CommonConstants.ZERO_STRING.equals(contractInfo.getInUse())){
// 生成瓜子档案里的合同信息 // 生成瓜子档案里的合同信息
this.saveContractInfoToGzEmpInfo(contractInfo, offerId, workLocation); this.saveContractInfoToGzEmpInfo(contractInfo, offerId, workLocation);
return CommonConstants.EIGHT_STRING; return CommonConstants.EIGHT_STRING;
...@@ -672,7 +673,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz ...@@ -672,7 +673,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
} }
} }
// 记录状态变更的offer操作日志 记录来源: 5:(系统触发)收集短信发送成功 // 记录状态变更的offer操作日志 记录来源: 5:收集短信发送成功
if(Common.isNotNull(changeOfferIds)){ if(Common.isNotNull(changeOfferIds)){
this.saveBatchOfferStatusRecord(changeOfferIds,CommonConstants.FIVE_STRING, this.saveBatchOfferStatusRecord(changeOfferIds,CommonConstants.FIVE_STRING,
"98","9",user.getId(),user.getNickname()); "98","9",user.getId(),user.getNickname());
...@@ -1033,7 +1034,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz ...@@ -1033,7 +1034,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
if(changeStatusList.size() > 0){ if(changeStatusList.size() > 0){
lGuaziOfferRecordVo.setOfferId(offerId); lGuaziOfferRecordVo.setOfferId(offerId);
// 记录来源: 档案审核 // 记录来源
lGuaziOfferRecordVo.setRecordFrom(recordFrom); lGuaziOfferRecordVo.setRecordFrom(recordFrom);
lGuaziOfferRecordVo.setChangeStatusList(changeStatusList); lGuaziOfferRecordVo.setChangeStatusList(changeStatusList);
lGuaziOfferRecordVo.setCreateBy(userId); lGuaziOfferRecordVo.setCreateBy(userId);
...@@ -1045,7 +1046,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz ...@@ -1045,7 +1046,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
/** /**
* 记录批量状态变更的offer操作日志 * 记录批量状态变更的offer操作日志
* @param offerIds offerId集合 * @param offerIds offerId集合
* @param recordFrom 记录来源:1:手动更新状态;7:档案审核 * @param recordFrom 记录来源
* @param beforeStatus 变更前状态 * @param beforeStatus 变更前状态
* @param nowStatus 当前状态 * @param nowStatus 当前状态
* @param userId 触发人ID * @param userId 触发人ID
......
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