Commit efcf6d58 authored by chenyuxi's avatar chenyuxi

feat: 存合同相关offer状态变更日志

parent 405030a2
...@@ -61,7 +61,7 @@ public class LGuaziOfferRecord extends BaseEntity { ...@@ -61,7 +61,7 @@ public class LGuaziOfferRecord extends BaseEntity {
/** /**
* 记录来源 * 记录来源
* (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:发送合同下载短信)")
......
...@@ -44,7 +44,7 @@ public interface LGuaziOfferRecordService extends IService<LGuaziOfferRecord> { ...@@ -44,7 +44,7 @@ public interface LGuaziOfferRecordService extends IService<LGuaziOfferRecord> {
* 传参:记录来源(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);
......
...@@ -117,7 +117,7 @@ public class LGuaziOfferRecordServiceImpl extends ServiceImpl<LGuaziOfferRecordM ...@@ -117,7 +117,7 @@ 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"}; String[] sysCreateArr = {"5", "6","11"};
if (ArrayUtils.contains(sysCreateArr, lGuaziOfferRecordVo.getRecordFrom())) { if (ArrayUtils.contains(sysCreateArr, lGuaziOfferRecordVo.getRecordFrom())) {
lGuaziOfferRecordVo.setCreateBy("0"); lGuaziOfferRecordVo.setCreateBy("0");
lGuaziOfferRecordVo.setCreateName("系统触发"); lGuaziOfferRecordVo.setCreateName("系统触发");
......
...@@ -103,6 +103,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -103,6 +103,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
private final TGzOfferInfoMapper gzOfferInfoMapper; private final TGzOfferInfoMapper gzOfferInfoMapper;
private final LGuaziOfferRecordService lGuaziOfferRecordService;
/** /**
* 员工合同信息表简单分页查询 * 员工合同信息表简单分页查询
* *
...@@ -530,10 +532,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -530,10 +532,10 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
contractPreMapper.updateById(contractPre); contractPreMapper.updateById(contractPre);
} }
} }
//瓜子项目编码:皖A694302 // 瓜子项目编码:皖A694302
if (CommonConstants.GZ_DEPT_NO.equals(tEmployeeContractInfo.getDeptNo())) { if (CommonConstants.GZ_DEPT_NO.equals(tEmployeeContractInfo.getDeptNo())) {
//合同申请瓜子合同状态更新成待签署 //合同申请瓜子合同状态更新成待签署
updateGzOfferStatus(tEmployeeContractInfo.getEmpIdcard(),CommonConstants.TWELVE_STRING,CommonConstants.THIRTEEN_STRING); updateGzOfferStatus(tEmployeeContractInfo.getEmpIdcard(),"97",CommonConstants.THIRTEEN_STRING,user.getId(),user.getNickname());
} }
} else { } else {
// 标准合同、劳动派遣合同、其他。————社保公积金都派减,自动审核通过 // 标准合同、劳动派遣合同、其他。————社保公积金都派减,自动审核通过
...@@ -880,7 +882,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -880,7 +882,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
//瓜子项目编码:皖A694302 //瓜子项目编码:皖A694302
if (CommonConstants.GZ_DEPT_NO.equals(contractInfo.getDeptNo())) { if (CommonConstants.GZ_DEPT_NO.equals(contractInfo.getDeptNo())) {
//审核通过瓜子合同状态更新合同审核通过 //审核通过瓜子合同状态更新合同审核通过
updateGzOfferStatus(contractInfo.getEmpIdcard(),CommonConstants.THIRTEEN_STRING,CommonConstants.EIGHT_STRING); updateGzOfferStatus(contractInfo.getEmpIdcard(),CommonConstants.THIRTEEN_STRING,CommonConstants.EIGHT_STRING,user.getId(),user.getNickname());
} }
} }
if (tEmployeeContractInfo.getAuditStatus() == CommonConstants.dingleDigitIntArray[3]) { if (tEmployeeContractInfo.getAuditStatus() == CommonConstants.dingleDigitIntArray[3]) {
...@@ -978,6 +980,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -978,6 +980,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
@Override @Override
public R<String> filingContract(TEmployeeContractInfo tEmployeeContractInfo) { public R<String> filingContract(TEmployeeContractInfo tEmployeeContractInfo) {
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)) {
...@@ -1005,7 +1008,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1005,7 +1008,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.getEmpIdcard(),CommonConstants.EIGHT_STRING,CommonConstants.NINETY_NINE); updateGzOfferStatus(tEmployeeContractInfo.getEmpIdcard(),CommonConstants.EIGHT_STRING,CommonConstants.NINETY_NINE,"0","系统自动触发");
} }
return R.ok(); return R.ok();
} }
...@@ -1947,7 +1950,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1947,7 +1950,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
//瓜子项目编码:皖A694302 //瓜子项目编码:皖A694302
if (CommonConstants.GZ_DEPT_NO.equals(contract.getDeptNo())) { if (CommonConstants.GZ_DEPT_NO.equals(contract.getDeptNo())) {
//审核通过瓜子合同状态更新成合同审核通过 //审核通过瓜子合同状态更新成合同审核通过
updateGzOfferStatus(contract.getEmpIdcard(),CommonConstants.THIRTEEN_STRING,CommonConstants.EIGHT_STRING); updateGzOfferStatus(contract.getEmpIdcard(),CommonConstants.THIRTEEN_STRING,CommonConstants.EIGHT_STRING,user.getId(),user.getNickname());
} }
} }
if (tEmployeeContractInfo.getAuditStatus() == CommonConstants.dingleDigitIntArray[3]) { if (tEmployeeContractInfo.getAuditStatus() == CommonConstants.dingleDigitIntArray[3]) {
...@@ -2207,7 +2210,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -2207,7 +2210,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
} }
//更新瓜子offer状态 //更新瓜子offer状态
public void updateGzOfferStatus(String idCard,String preStatus,String updStatus) { public void updateGzOfferStatus(String idCard,String preStatus,String updStatus, String userId, String nickname) {
TGzOfferInfo gzOfferInfo = gzOfferInfoMapper.selectOne(Wrappers.<TGzOfferInfo>query() TGzOfferInfo gzOfferInfo = gzOfferInfoMapper.selectOne(Wrappers.<TGzOfferInfo>query()
.lambda().eq(TGzOfferInfo::getNationalId, idCard) .lambda().eq(TGzOfferInfo::getNationalId, idCard)
.eq(TGzOfferInfo::getOfferStatus, preStatus) .eq(TGzOfferInfo::getOfferStatus, preStatus)
...@@ -2215,8 +2218,46 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -2215,8 +2218,46 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(gzOfferInfo)) { if (Common.isNotNull(gzOfferInfo)) {
gzOfferInfo.setOfferStatus(updStatus); gzOfferInfo.setOfferStatus(updStatus);
gzOfferInfo.setUpdateBy(userId);
gzOfferInfo.setUpdateTime(LocalDateTime.now());
gzOfferInfoMapper.updateById(gzOfferInfo); gzOfferInfoMapper.updateById(gzOfferInfo);
//todo 瓜子状态变更增加操作日志
// todo updStatus == 待签署的 生成合同
// 瓜子状态变更增加操作日志
// 13:待签署,8:合同审核通过,99:已归档
// 9:发起合同申请10:合同审核通过;11:(系统触发)合同归档;
String recordFrom = "";
switch (updStatus) {
case "13":
recordFrom = "9";
break;
case "8":
recordFrom = "10";
break;
default:
recordFrom = "11";
break;
}
LGuaziOfferRecordVo lGuaziOfferRecordVo = new LGuaziOfferRecordVo();
// 存变更前后的状态到 状态数组里
List<String> changeStatusList = new ArrayList<>();
changeStatusList.add(preStatus);
changeStatusList.add(updStatus);
if(changeStatusList.size() > 0){
lGuaziOfferRecordVo.setOfferId(gzOfferInfo.getId());
// 记录来源: 档案审核
lGuaziOfferRecordVo.setRecordFrom(recordFrom);
lGuaziOfferRecordVo.setChangeStatusList(changeStatusList);
lGuaziOfferRecordVo.setCreateBy(userId);
lGuaziOfferRecordVo.setCreateName(nickname);
lGuaziOfferRecordService.saveRecordOne(lGuaziOfferRecordVo);
}
} }
} }
......
...@@ -137,6 +137,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -137,6 +137,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
private final EmployeeRegistrationPreService registrationPreService; private final EmployeeRegistrationPreService registrationPreService;
private final LGuaziOfferRecordService lGuaziOfferRecordService;
@Autowired @Autowired
private OSSUtil ossUtil; private OSSUtil ossUtil;
...@@ -2628,7 +2630,23 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2628,7 +2630,23 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if (Common.isNotNull(gzOfferInfo)) { if (Common.isNotNull(gzOfferInfo)) {
gzOfferInfo.setOfferStatus(CommonConstants.EIGHT_STRING); gzOfferInfo.setOfferStatus(CommonConstants.EIGHT_STRING);
gzOfferInfoMapper.updateById(gzOfferInfo); gzOfferInfoMapper.updateById(gzOfferInfo);
//todo 瓜子状态变更增加操作日志
// 瓜子状态变更增加操作日志
LGuaziOfferRecordVo lGuaziOfferRecordVo = new LGuaziOfferRecordVo();
// 存变更前后的状态到 状态数组里
List<String> changeStatusList = new ArrayList<>();
changeStatusList.add(CommonConstants.THIRTEEN_STRING);
changeStatusList.add(CommonConstants.EIGHT_STRING);
if(changeStatusList.size() > 0){
lGuaziOfferRecordVo.setOfferId(gzOfferInfo.getId());
// 记录来源: 档案审核
lGuaziOfferRecordVo.setRecordFrom("10");
lGuaziOfferRecordVo.setChangeStatusList(changeStatusList);
lGuaziOfferRecordVo.setCreateBy("0");
lGuaziOfferRecordVo.setCreateName("系统触发");
lGuaziOfferRecordService.saveRecordOne(lGuaziOfferRecordVo);
}
} }
} }
//审核不同 //审核不同
...@@ -2742,13 +2760,33 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -2742,13 +2760,33 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
//合同申请瓜子合同状态更新成待签署 //合同申请瓜子合同状态更新成待签署
TGzOfferInfo gzOfferInfo = gzOfferInfoMapper.selectOne(Wrappers.<TGzOfferInfo>query() TGzOfferInfo gzOfferInfo = gzOfferInfoMapper.selectOne(Wrappers.<TGzOfferInfo>query()
.lambda().eq(TGzOfferInfo::getNationalId, contract.getEmpIdcard()) .lambda().eq(TGzOfferInfo::getNationalId, contract.getEmpIdcard())
.eq(TGzOfferInfo::getOfferStatus, CommonConstants.TWELVE_STRING) .eq(TGzOfferInfo::getOfferStatus, "97")
.eq(TGzOfferInfo::getDelFlag,CommonConstants.ZERO_STRING) .eq(TGzOfferInfo::getDelFlag,CommonConstants.ZERO_STRING)
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(gzOfferInfo)) { if (Common.isNotNull(gzOfferInfo)) {
gzOfferInfo.setOfferStatus(CommonConstants.THIRTEEN_STRING); gzOfferInfo.setOfferStatus(CommonConstants.THIRTEEN_STRING);
gzOfferInfoMapper.updateById(gzOfferInfo); gzOfferInfoMapper.updateById(gzOfferInfo);
//todo 瓜子状态变更增加操作日志
// todo updStatus == 待签署的 生成合同
// 瓜子状态变更增加操作日志
LGuaziOfferRecordVo lGuaziOfferRecordVo = new LGuaziOfferRecordVo();
// 存变更前后的状态到 状态数组里
List<String> changeStatusList = new ArrayList<>();
changeStatusList.add(gzOfferInfo.getOfferStatus());
changeStatusList.add(CommonConstants.THIRTEEN_STRING);
if(changeStatusList.size() > 0){
lGuaziOfferRecordVo.setOfferId(gzOfferInfo.getId());
// 记录来源: 发起合同申请
lGuaziOfferRecordVo.setRecordFrom("9");
lGuaziOfferRecordVo.setChangeStatusList(changeStatusList);
lGuaziOfferRecordVo.setCreateBy("0");
lGuaziOfferRecordVo.setCreateName("系统触发");
lGuaziOfferRecordService.saveRecordOne(lGuaziOfferRecordVo);
}
} }
} }
audit = new TEmployeeContractAudit(); audit = new TEmployeeContractAudit();
......
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