Commit 7537c978 authored by fangxinjiang's avatar fangxinjiang

见费出单逻辑-fxj

parent 15794355
......@@ -23,6 +23,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
import com.yifu.cloud.plus.v1.yifu.common.core.util.alisms.AliSmsResult;
import com.yifu.cloud.plus.v1.yifu.common.core.util.alisms.RegistParamVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.alisms.YiFuSmsUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCheckProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprInsurancesProperties;
......@@ -274,6 +275,17 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
try {
//调用csp服务更新状态和新增操作记录
cspDaprUtils.updateRegistByPreInfo(receiveVo);
//处理合同待办信息
contractPreMapper.delete(Wrappers.<TEmployeeContractPre>query().lambda()
.eq(TEmployeeContractPre::getRegisterId, updatePre.getId()));
//处理商险待办信息
BaseSearchVO insuranceSearchVo = new BaseSearchVO();
insuranceSearchVo.setRegisterId(updatePre.getId());
insuranceDaprUtil.getInsurancesStatus(insuranceSearchVo);
//处理社保待办信息
socialDaprUtils.deleteUnProcessSocialPreInfo(updatePre.getId());
//处理公积金待办信息
socialDaprUtils.deleteUnProcessFundPreInfo(updatePre.getId());
} catch (Exception e) {
log.error("调用csp服务更新数据异常", e);
}
......
......@@ -65,4 +65,7 @@ public class BaseSearchVO implements Serializable {
private Date startDate;
//入职登记表ID
private String registerId;
}
......@@ -112,7 +112,21 @@ public class InsuranceDaprUtil {
}
return res;
}
/**
* @Author fxj
* @Description 通过如入职ID删除商险待办数据
* @Date 20:28 2026/1/22
* @Param
* @return
**/
public R<Boolean> delInsurancePreByRegisterId(BaseSearchVO paramVo) {
R<Boolean> res = HttpDaprUtil.invokeMethodPost(daprInsurancesProperties.getAppUrl(),daprInsurancesProperties.getAppId()
,"/temployeeinsurancepre/inner/delInsurancePreByRegisterId", paramVo, Boolean.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(res)){
return R.failed("通过如入职ID删除商险待办数据!");
}
return res;
}
/**
* @param paramVo 查询参数,主要是身份证与项目编码
* @Description: 查询人员的已减完成的商险(返回值,则表示有未减完成的商险
......
......@@ -128,4 +128,8 @@ public class EmployeeRegistration extends BaseEntity {
@Schema(description = "离职处理状态:0待确认1待处理2处理中3已处理")
private String leaveStatus;
@TableField(exist = false)
@Schema(description = "拒绝入职原因")
private String leaveReason;
}
......@@ -132,6 +132,20 @@ public class EmployeeRegistrationController {
return employeeRegistrationService.updateRegist(employeeRegistration);
}
/**
* @Author fxj
* @Description 拒绝入职
* @Date 20:08 2026/1/22
* @Param
* @return
**/
@Operation(summary = "拒绝入职")
@SysLog("拒绝入职")
@PostMapping("/refuseOffer")
public R refuseOffer(@RequestBody EmployeeRegistration employeeRegistration) {
return employeeRegistrationService.refuseOffer(employeeRegistration);
}
/**
* 单个更新,更新入离职日期和手机号码
*
......
......@@ -181,4 +181,5 @@ public interface EmployeeRegistrationService extends IService<EmployeeRegistrati
EkpDeptContractInfoVo selectContractInfoByDetptNo(EkpDeptContractInfoVo vo);
R refuseOffer(EmployeeRegistration employeeRegistration);
}
......@@ -2384,5 +2384,24 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
}
/**
* @Author fxj
* @Description 拒绝入职--入职待确认列表
* @Date 20:14 2026/1/22
* @Param
* @return
**/
@Override
public R refuseOffer(EmployeeRegistration registration) {
YifuUser user = SecurityUtils.getUser();
EmployeeRegistration registrationNow = baseMapper.selectById(registration.getId());
if (Common.isEmpty(registrationNow)) {
return R.failed(RegistConstants.NO_DATA_TO_HANDLE);
}
registrationNow.setProcessStatus(CommonConstants.THREE_STRING);
logService.saveLog(registration.getId(), CommonConstants.ZERO_STRING, RegistConstants.BACK_RECEIVE, LocalDateTime.now(),
user.getNickname(), registration.getLeaveReason());
baseMapper.updateById(registrationNow);
return R.ok();
}
}
......@@ -6,6 +6,7 @@ import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationCustomerUserUpdateVo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.EmployeeRegistrationPre;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
......@@ -312,4 +313,20 @@ public class TEmployeeInsurancePreController {
return tEmployeeInsurancePreService.getExitInsuranceListByEmpPreId(empPreId);
}
/**
* @Author fxj
* @Description 通过如入职ID删除商险待办数据
* @Date 20:31 2026/1/22
* @Param
* @return
**/
@Operation(description = "通过如入职ID删除商险待办数据")
@Inner
@PostMapping("/inner/delInsurancePreByRegisterId")
public Boolean delInsurancePreByRegisterId(@RequestBody BaseSearchVO preVo) {
if (null == preVo || preVo.getRegisterId() == null){
return false;
}
return tEmployeeInsurancePreService.delInsurancePreByRegisterId(preVo);
}
}
......@@ -7,6 +7,7 @@ import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationCustomerUserUpdateVo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.EmployeeRegistrationPre;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
......@@ -131,4 +132,6 @@ public interface TEmployeeInsurancePreService extends IService<TEmployeeInsuranc
**/
List<InsuranceAutoParam> getInsuranceAutoParamList(List<InsuranceAddParam> addParamList, List<InsuranceBatchParam> batchParamList
, List<InsuranceReplaceParam> replaceParamList);
Boolean delInsurancePreByRegisterId(BaseSearchVO preVo);
}
......@@ -21,6 +21,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.LocalDateTimeUtils;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseSearchVO;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
......@@ -812,6 +813,7 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
).collect(Collectors.toList());
}
private InsuranceAutoParam convertAddParam(InsuranceAddParam addParam) {
InsuranceAutoParam autoParam = new InsuranceAutoParam();
// 复制InsuranceAddParam的字段
......@@ -986,5 +988,16 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
vo.setPreList(preList);
return vo;
}
/**
* @Author fxj
* @Description 通过如入职ID删除商险待办数据
* @Date 20:31 2026/1/22
* @Param
* @return
**/
@Override
public Boolean delInsurancePreByRegisterId(BaseSearchVO preVo) {
return this.remove(Wrappers.<TEmployeeInsurancePre>query().lambda()
.eq(TEmployeeInsurancePre::getRegisterId, preVo.getRegisterId()));
}
}
......@@ -73,6 +73,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
import javax.json.JsonObject;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
......@@ -1812,7 +1813,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//红冲预估推送
pushResult = pushEstimate(detail, CommonConstants.THREE_INT);
//已投保 需要处理实缴和差额数据 (已支出或支出中禁止退保)
if (CommonConstants.THREE_STRING.equals(detail.getBuyHandleStatus())){
if (CommonConstants.THREE_INT == detail.getBuyHandleStatus()){
//直接删除实缴及实缴与预估的差额
ekpSettleService.deleteEkpInsuranceDetailAsso(detail.getId());
}
......@@ -8696,6 +8697,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
}
try {
log.info("商险状态更新报文"+JSON.toJSONString(vo));
doJointInsuranceTask.updateInsuranceSettleStatus(vo);
}catch (Exception e) {
log.error("商险结算状态更新异常", e);
......@@ -9794,7 +9796,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
detail = baseMapper.selectById(insuranceId);
//见费出单且是待投保状态 直接回退到 待缴费 并清空缴费时间和缴费状态
if (Common.isNotNull(detail)
&& CommonConstants.ONE_STRING.equals(detail.getBuyHandleStatus())
&& CommonConstants.ONE_INT == detail.getBuyHandleStatus().intValue()
&& CommonConstants.ZERO_STRING.equals(detail.getIsJfcd())) {
detail.setPaymentTime(CommonConstants.EMPTY_STRING);
detail.setPaymentStatus(CommonConstants.ZERO_STRING);
......@@ -9808,8 +9810,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//通过ids 更新自动化测状态processStatus为待投保
LambdaUpdateWrapper<TEmployeeInsurancePre> updateDiyInfoWrapper = new LambdaUpdateWrapper<>();
updateDiyInfoWrapper.in(TEmployeeInsurancePre::getInsurancesId, insuranceIds)
.set(TEmployeeInsurancePre::getProcessStatus,CommonConstants.ONE_STRING);
.set(TEmployeeInsurancePre::getProcessStatus,CommonConstants.SEVEN_STRING);
employeeInsurancePreMapper.update(null, updateDiyInfoWrapper);
LambdaUpdateWrapper<TInsurancePreRenewDetail> updateReNewInfoWrapper = new LambdaUpdateWrapper<>();
updateReNewInfoWrapper.in(TInsurancePreRenewDetail::getInsurancesId, insuranceIds)
.set(TInsurancePreRenewDetail::getProcessStatus,CommonConstants.SEVEN_STRING);
tInsurancePreRenewDetailMapper.update(null, updateReNewInfoWrapper);
}
}
} catch (Exception e) {
......
......@@ -17,7 +17,9 @@ import com.yifu.cloud.plus.v1.yifu.ekp.constant.EkpConstants;
import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.*;
import com.yifu.cloud.plus.v1.yifu.insurances.mapper.ekp.EkpInsurancesInfoMapper;
import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TEmployeeInsurancePreMapper;
import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceDetailMapper;
import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsurancePreRenewDetailMapper;
import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TUpdateStatusErrorMapper;
import com.yifu.cloud.plus.v1.yifu.insurances.service.ekp.EkpSettleService;
import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceEkpService;
......@@ -78,6 +80,12 @@ public class DoJointInsuranceTask {
@Autowired
private EkpInsurancesInfoMapper insurancesInfoMapper;
@Autowired
private TEmployeeInsurancePreMapper tEmployeeInsurancePreMapper;
@Autowired
private TInsurancePreRenewDetailMapper tInsurancePreRenewDetailMapper;
/**
* @Description: 商险明细推送
......@@ -262,6 +270,16 @@ public class DoJointInsuranceTask {
detail.setBuyHandleStatus(CommonConstants.ONE_INT);
detail.setPaymentStatus(CommonConstants.ONE_STRING);
detail.setPaymentTime(DateUtil.formatDatePatten(new Date(),DateUtil.DATETIME_PATTERN_SECOND));
//更新自动化
LambdaUpdateWrapper<TEmployeeInsurancePre> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TEmployeeInsurancePre::getInsurancesId,detail.getId());
updateWrapper.set(TEmployeeInsurancePre::getProcessStatus,CommonConstants.THREE_STRING);
tEmployeeInsurancePreMapper.update(null, updateWrapper);
LambdaUpdateWrapper<TInsurancePreRenewDetail> updateReNewInfoWrapper = new LambdaUpdateWrapper<>();
updateReNewInfoWrapper.eq(TInsurancePreRenewDetail::getInsurancesId, detail.getId())
.set(TInsurancePreRenewDetail::getProcessStatus,CommonConstants.SEVEN_STRING);
tInsurancePreRenewDetailMapper.update(null, updateReNewInfoWrapper);
}
if (CommonConstants.ONE_STRING.equals(detail.getPaymentStatus())
&& "1".equals(viewVo.getIncomeCollectFlag())){
......
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