Commit 1dcd80cb authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.12' into MVP1.7.12

parents f8306358 44386555
...@@ -53,7 +53,6 @@ public class TEmployeeContractPre extends BaseEntity { ...@@ -53,7 +53,6 @@ public class TEmployeeContractPre extends BaseEntity {
private String position; private String position;
@Schema(description = "入职日期") @Schema(description = "入职日期")
@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
private Date joinLeaveDate; private Date joinLeaveDate;
@Schema(description = "合同类型,标准合同/劳务协议/实习协议/劳务派遣合同/非全日制/其他合同") @Schema(description = "合同类型,标准合同/劳务协议/实习协议/劳务派遣合同/非全日制/其他合同")
...@@ -97,11 +96,11 @@ public class TEmployeeContractPre extends BaseEntity { ...@@ -97,11 +96,11 @@ public class TEmployeeContractPre extends BaseEntity {
* 预计确认时间 * 预计确认时间
*/ */
@Schema(description = "预计确认时间") @Schema(description = "预计确认时间")
@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
private LocalDateTime expectedConfirmTime; private LocalDateTime expectedConfirmTime;
@Schema(description = "预计发起时间") @Schema(description = "预计发起时间")
@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
private LocalDateTime expectedCollectionTime; private LocalDateTime expectedCollectionTime;
@Schema(description = "合同起始时间") @Schema(description = "合同起始时间")
......
...@@ -64,6 +64,7 @@ public interface TEmployeePreLogService extends IService<TEmployeePreLog> { ...@@ -64,6 +64,7 @@ public interface TEmployeePreLogService extends IService<TEmployeePreLog> {
* @return: void * @return: void
**/ **/
void saveUpdateInsurance(String empPreId, EmployeeRegistrationPre oldInfo void saveUpdateInsurance(String empPreId, EmployeeRegistrationPre oldInfo
, EmployeeRegistrationPre newInfo,String userId, String nickName,Map<String, TEmployeeInsurancePre> oldMap); , EmployeeRegistrationPre newInfo,String userId, String nickName,Map<String, TEmployeeInsurancePre> oldMap
, TEmployeeContractPre contractOld);
} }
...@@ -252,6 +252,32 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -252,6 +252,32 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
} }
} }
@Override
public R updateRegistById(EmployeeRegistrationPre employeeRegistrationPre) {
EmployeeRegistrationPre updatePre = baseMapper.selectById(employeeRegistrationPre.getId());
if (Common.isEmpty(updatePre) || (updatePre.getProcessStatus().equals(CommonConstants.THREE_STRING)
|| updatePre.getProcessStatus().equals(CommonConstants.FOUR_STRING))) {
return R.failed(CommonConstants.NO_DATA_TO_HANDLE);
}
YifuUser user = SecurityUtils.getUser();
employeeRegistrationPre.setProcessStatus(CommonConstants.THREE_STRING);
baseMapper.updateById(employeeRegistrationPre);
//新增操作记录
EmployeeRegistrationUpdateVo receiveVo = new EmployeeRegistrationUpdateVo();
receiveVo.setEmployeeName(user.getNickname());
receiveVo.setDeptNo(updatePre.getDeptNo());
receiveVo.setEmpIdcard(updatePre.getEmpIdcard());
receiveVo.setReason(employeeRegistrationPre.getReason());
receiveVo.setEmployeeId(user.getId());
try {
//调用csp服务更新状态和新增操作记录
cspDaprUtils.updateRegistByPreInfo(receiveVo);
} catch (Exception e) {
log.error("调用csp服务更新数据异常", e);
}
return R.ok();
}
@Override @Override
@Transactional @Transactional
public String saveRegistPreInfo(EmployeeRegistrationPreVo preVo) { public String saveRegistPreInfo(EmployeeRegistrationPreVo preVo) {
...@@ -411,9 +437,13 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -411,9 +437,13 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
if (null != contractXfAfter) { if (null != contractXfAfter) {
pre.setContractSubName(contractXfAfter); pre.setContractSubName(contractXfAfter);
} }
//查询老的合同明细
TEmployeeContractPre contractOld = contractPreMapper.selectOne(Wrappers.<TEmployeeContractPre>query().lambda()
.eq(TEmployeeContractPre::getRegisterId,pre.getId())
.last(CommonConstants.LAST_ONE_SQL));
// 添加日志并修改商险list // 添加日志并修改商险list
tEmployeePreLogService.saveUpdateInsurance(preExit.getId(), preExit tEmployeePreLogService.saveUpdateInsurance(preExit.getId(), preExit
, pre, preVo.getCreateBy(),preVo.getCreateName(), oldMap); , pre, preVo.getCreateBy(),preVo.getCreateName(), oldMap,contractOld);
} }
if (Common.isNotNull(preVo.getExpectedCollectionTime())) { if (Common.isNotNull(preVo.getExpectedCollectionTime())) {
// 事务提交后触发调度 // 事务提交后触发调度
...@@ -432,32 +462,6 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -432,32 +462,6 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
return pre.getId(); return pre.getId();
} }
@Override
public R updateRegistById(EmployeeRegistrationPre employeeRegistrationPre) {
EmployeeRegistrationPre updatePre = baseMapper.selectById(employeeRegistrationPre.getId());
if (Common.isEmpty(updatePre) || (updatePre.getProcessStatus().equals(CommonConstants.THREE_STRING)
|| updatePre.getProcessStatus().equals(CommonConstants.FOUR_STRING))) {
return R.failed(CommonConstants.NO_DATA_TO_HANDLE);
}
YifuUser user = SecurityUtils.getUser();
employeeRegistrationPre.setProcessStatus(CommonConstants.THREE_STRING);
baseMapper.updateById(employeeRegistrationPre);
//新增操作记录
EmployeeRegistrationUpdateVo receiveVo = new EmployeeRegistrationUpdateVo();
receiveVo.setEmployeeName(user.getNickname());
receiveVo.setDeptNo(updatePre.getDeptNo());
receiveVo.setEmpIdcard(updatePre.getEmpIdcard());
receiveVo.setReason(employeeRegistrationPre.getReason());
receiveVo.setEmployeeId(user.getId());
try {
//调用csp服务更新状态和新增操作记录
cspDaprUtils.updateRegistByPreInfo(receiveVo);
} catch (Exception e) {
log.error("调用csp服务更新数据异常", e);
}
return R.ok();
}
/** /**
* @param employeeRegistrationPre * @param employeeRegistrationPre
* @Description: 修改入职确认信息 * @Description: 修改入职确认信息
......
...@@ -37,6 +37,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeePreLogSearchVo; ...@@ -37,6 +37,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeePreLogSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; 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.constant.SecurityConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.LocalDateTimeUtils;
import com.yifu.cloud.plus.v1.yifu.common.core.util.equator.HrEquator; import com.yifu.cloud.plus.v1.yifu.common.core.util.equator.HrEquator;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser; import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprInsurancesProperties; import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprInsurancesProperties;
...@@ -304,8 +305,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -304,8 +305,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
} }
boolean isModifyContract =false; boolean isModifyContract =false;
String differenceContractKey = ""; String differenceContractKey = "";
if (contractOld != null && newInfo.getEmployeeContractPre() != null) {
TEmployeeContractPre employeeContractPre = newInfo.getEmployeeContractPre(); TEmployeeContractPre employeeContractPre = newInfo.getEmployeeContractPre();
if (contractOld != null && employeeContractPre != null) {
//1.9.11 huych 附件类型不比较差异 //1.9.11 huych 附件类型不比较差异
contractOld.setAttaList(null); contractOld.setAttaList(null);
employeeContractPre.setAttaList(null); employeeContractPre.setAttaList(null);
...@@ -323,7 +324,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -323,7 +324,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
detailEmpLog = new TEmployeePreLogDetail(); detailEmpLog = new TEmployeePreLogDetail();
detailEmpLog.setModelType(CommonConstants.TWO_STRING); detailEmpLog.setModelType(CommonConstants.TWO_STRING);
detailEmpLog.setType(CommonConstants.THREE_STRING); detailEmpLog.setType(CommonConstants.THREE_STRING);
this.setLogBaseInfo(empPreId, contractOld, newInfo.getEmployeeContractPre(), user, differenceContractKey, logId, detailEmpLog); this.setLogBaseInfo(empPreId, contractOld, employeeContractPre, user, differenceContractKey, logId, detailEmpLog);
detailList.add(detailEmpLog); detailList.add(detailEmpLog);
} }
// 有修改,则加日志 // 有修改,则加日志
...@@ -342,9 +343,15 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -342,9 +343,15 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
tEmployeePreLogDetailService.saveBatch(detailList); tEmployeePreLogDetailService.saveBatch(detailList);
} }
//保存合同待签订数据 //保存合同待签订数据
if (contractOld != null && newInfo.getEmployeeContractPre() != null) { if (contractOld != null && employeeContractPre != null) {
TEmployeeContractPreVo preVo = new TEmployeeContractPreVo(); TEmployeeContractPreVo preVo = new TEmployeeContractPreVo();
BeanUtils.copyProperties(newInfo.getEmployeeContractPre(),preVo); BeanUtils.copyProperties(employeeContractPre,preVo);
if (Common.isNotNull(employeeContractPre.getExpectedCollectionTime()) ) {
preVo.setExpectedCollectionTime(LocalDateTimeUtils.convertLDTToDate(employeeContractPre.getExpectedCollectionTime()));
}
if (Common.isNotNull(employeeContractPre.getExpectedConfirmTime()) ) {
preVo.setExpectedConfirmTime(LocalDateTimeUtils.convertLDTToDate(employeeContractPre.getExpectedConfirmTime()));
}
contractPreService.saveContractPreInfo(preVo); contractPreService.saveContractPreInfo(preVo);
} }
} }
...@@ -364,7 +371,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -364,7 +371,8 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
@Override @Override
public void saveUpdateInsurance(String empPreId, EmployeeRegistrationPre oldInfo public void saveUpdateInsurance(String empPreId, EmployeeRegistrationPre oldInfo
, EmployeeRegistrationPre newInfo, String userId, String nickName, Map<String, TEmployeeInsurancePre> oldMap) { , EmployeeRegistrationPre newInfo, String userId, String nickName, Map<String, TEmployeeInsurancePre> oldMap
, TEmployeeContractPre contractOld) {
try { try {
//1.9.11 huych 附件类型不比较差异 //1.9.11 huych 附件类型不比较差异
oldInfo.setAttaIdList(null); oldInfo.setAttaIdList(null);
...@@ -426,6 +434,31 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -426,6 +434,31 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
} }
} }
} }
boolean isModifyContract =false;
String differenceContractKey = "";
TEmployeeContractPre employeeContractPre = newInfo.getEmployeeContractPre();
if (contractOld != null && employeeContractPre != null) {
//1.9.11 huych 附件类型不比较差异
contractOld.setAttaList(null);
employeeContractPre.setAttaList(null);
differenceContractKey = HrEquator.comparisonValueIgnoreField(contractOld, employeeContractPre, CONTRACT_IGNORE_FIELD);
if (differenceContractKey.length() > 0) {
isModifyContract = true;
}
}
if (isModifyContract) {
if (Common.isNotNull(diffTitle)) {
diffTitle += "、合同信息";
} else {
diffTitle = "合同信息";
}
detailEmpLog = new TEmployeePreLogDetail();
detailEmpLog.setModelType(CommonConstants.TWO_STRING);
detailEmpLog.setType(CommonConstants.THREE_STRING);
this.setPreLogBaseInfo(empPreId, contractOld, employeeContractPre, userId, nickName,
differenceContractKey, logId, detailEmpLog);
detailList.add(detailEmpLog);
}
// 有修改,则加日志 // 有修改,则加日志
if (Common.isNotNull(diffTitle)) { if (Common.isNotNull(diffTitle)) {
TEmployeePreLog empPreLog = new TEmployeePreLog(); TEmployeePreLog empPreLog = new TEmployeePreLog();
......
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