Commit 9c4ecff6 authored by fangxinjiang's avatar fangxinjiang

拒绝入职及修复BUG-fxj

parent cd2044a3
......@@ -189,4 +189,10 @@ public class EmployeeRegistrationPre extends BaseEntity {
@Schema(description = "合同是否可修改")
@TableField(exist = false)
private Boolean contractUpdateFlag;
/**
* 是否拒绝入职: 0 是 1 否
*/
@Schema(description = "是否拒绝入职: 0 是 1 ")
private String isRefuse;
}
......@@ -362,5 +362,9 @@ public class TEmployeeContractPre extends BaseEntity {
@ExcelAttribute(name = "紧急联系人地址")
private String contactAddress;
// 电子签推送需要的新字段——END
/**
* 是否拒绝入职: 0 是 1 否
*/
@Schema(description = "是否拒绝入职: 0 是 1 ")
private String isRefuse;
}
......@@ -264,6 +264,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}
YifuUser user = SecurityUtils.getUser();
employeeRegistrationPre.setProcessStatus(CommonConstants.THREE_STRING);
employeeRegistrationPre.setIsRefuse(CommonConstants.ZERO_STRING);
baseMapper.updateById(employeeRegistrationPre);
//新增操作记录
EmployeeRegistrationUpdateVo receiveVo = new EmployeeRegistrationUpdateVo();
......@@ -272,18 +273,22 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
receiveVo.setEmpIdcard(updatePre.getEmpIdcard());
receiveVo.setReason(employeeRegistrationPre.getReason());
receiveVo.setEmployeeId(user.getId());
StringBuilder sb = new StringBuilder();
StringBuilder sb = new StringBuilder("档案");
try {
//调用csp服务更新状态和新增操作记录
cspDaprUtils.updateRegistByPreInfo(receiveVo);
//处理社保待办信息
R<Boolean> booleanR = socialDaprUtils.deleteUnProcessSocialPreInfo(updatePre.getId());
R<Boolean> booleanR = socialDaprUtils.updateRefuseSocialPreInfo(updatePre.getId());
if (null != booleanR && booleanR.getData().booleanValue()){
sb.append("社保");
if (sb.length() == 0){
sb.append("社保");
}else {
sb.append("/社保");
}
}
//处理公积金待办信息
booleanR = socialDaprUtils.deleteUnProcessFundPreInfo(updatePre.getId());
booleanR = socialDaprUtils.updateRefuseFundPreInfo(updatePre.getId());
if (null != booleanR && booleanR.getData().booleanValue()){
if (sb.length() == 0){
sb.append("公积金");
......@@ -294,7 +299,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
//处理商险待办信息
BaseSearchVO insuranceSearchVo = new BaseSearchVO();
insuranceSearchVo.setRegisterId(updatePre.getId());
booleanR = insuranceDaprUtil.delInsurancePreByRegisterId(insuranceSearchVo);
booleanR = insuranceDaprUtil.refuseInsurancePreByRegisterId(insuranceSearchVo);
if (null != booleanR && booleanR.getData().booleanValue()){
if (sb.length() == 0){
sb.append("商险");
......@@ -303,8 +308,10 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}
}
//处理合同待办信息
int res = contractPreMapper.delete(Wrappers.<TEmployeeContractPre>query().lambda()
.eq(TEmployeeContractPre::getRegisterId, updatePre.getId()));
LambdaUpdateWrapper<TEmployeeContractPre> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TEmployeeContractPre::getRegisterId, updatePre.getId());
updateWrapper.set(TEmployeeContractPre::getIsRefuse,CommonConstants.ZERO_STRING);
int res = contractPreMapper.update(null,updateWrapper);
if (res > 0){
if (sb.length() == 0){
sb.append("合同");
......@@ -321,7 +328,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
log.setCreateName(user.getNickname());
log.setUpdateTime(LocalDateTime.now());
log.setPreId(employeeRegistrationPre.getId());
log.setDiffTitle("联动删除的待办:"+sb);
log.setDiffTitle("拒绝入职联动删除的待办:"+sb);
log.setMenuInfo("入职建档");
tEmployeePreLogService.save(log);
......
......@@ -119,6 +119,9 @@
</sql>
<sql id="employeeRegistrationPre_where">
<if test="employeeRegistrationPre != null">
<if test="employeeRegistrationPre.isRefuse != null and employeeRegistrationPre.isRefuse.trim() != ''">
AND a.IS_REFUSE = #{employeeRegistrationPre.isRefuse}
</if>
<if test="employeeRegistrationPre.id != null and employeeRegistrationPre.id.trim() != ''">
AND a.id = #{employeeRegistrationPre.id}
</if>
......
......@@ -179,6 +179,9 @@
</sql>
<sql id="tEmployeeContractPre_where">
<if test="tEmployeeContractPre != null">
<if test="tEmployeeContractPre.isRefuse != null and tEmployeeContractPre.isRefuse.trim() != ''">
AND a.IS_REFUSE = #{tEmployeeContractPre.isRefuse}
</if>
<if test="tEmployeeContractPre.id != null and tEmployeeContractPre.id.trim() != ''">
AND a.id = #{tEmployeeContractPre.id}
</if>
......
......@@ -127,6 +127,22 @@ public class InsuranceDaprUtil {
}
return res;
}
/**
* @Author fxj
* @Description 拒绝入职状态更新
* @Date 20:28 2026/1/22
* @Param
* @return
**/
public R<Boolean> refuseInsurancePreByRegisterId(BaseSearchVO paramVo) {
R<Boolean> res = HttpDaprUtil.invokeMethodPost(daprInsurancesProperties.getAppUrl(),daprInsurancesProperties.getAppId()
,"/temployeeinsurancepre/inner/refuseInsurancePreByRegisterId", paramVo, Boolean.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(res)){
return R.failed("拒绝入职更新商险待办数据!");
}
return res;
}
/**
* @param paramVo 查询参数,主要是身份证与项目编码
* @Description: 查询人员的已减完成的商险(返回值,则表示有未减完成的商险
......
......@@ -353,6 +353,18 @@ public class SocialDaprUtils {
, daprProperties.getAppId(),"/tdispatchinfopre/deleteUnProcessSocialPreInfo" , id
, Object.class, SecurityConstants.FROM_IN);
}
/**
* @Author huych
* @Description 拒绝入职更新社保已购买非流程中的数据
* @Date 2025-10-10 15:51:36
* @Param
* @return
**/
public R<Boolean> updateRefuseSocialPreInfo(String id){
return HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl()
, daprProperties.getAppId(),"/tdispatchinfopre/updateRefuseSocialPreInfo" , id
, Object.class, SecurityConstants.FROM_IN);
}
/**
* @Author fxj
......@@ -366,6 +378,11 @@ public class SocialDaprUtils {
"/tdispatchinfopre/deleteUnProcessFundPreInfo", id, Boolean.class, SecurityConstants.FROM_IN);
}
public R<Boolean> updateRefuseFundPreInfo(String id) {
return HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),
"/tdispatchinfopre/updateRefuseFundPreInfo", id, Boolean.class, SecurityConstants.FROM_IN);
}
/**
* @Author fxj
* @Description 获取公积金待购买信息
......
......@@ -159,5 +159,9 @@ public class TEmployeeInsurancePre extends BaseEntity {
@TableField(exist = false)
@Schema(description = "修改类型:1新增;2修改;3删除;4状态346为不可编辑")
private String modelType;
/**
* 是否拒绝入职: 0 是 1 否
*/
@Schema(description = "是否拒绝入职: 0 是 1 ")
private String isRefuse;
}
......@@ -331,6 +331,23 @@ public class TEmployeeInsurancePreController {
return tEmployeeInsurancePreService.delInsurancePreByRegisterId(preVo);
}
/**
* @Author fxj
* @Description 拒绝入职更新商险待办数据
* @Date 11:13 2026/1/27
* @Param
* @return
**/
@Operation(description = "拒绝入职更新商险待办数据")
@Inner
@PostMapping("/inner/refuseInsurancePreByRegisterId")
public Boolean refuseInsurancePreByRegisterId(@RequestBody BaseSearchVO preVo) {
if (null == preVo || preVo.getRegisterId() == null){
return false;
}
return tEmployeeInsurancePreService.refuseInsurancePreByRegisterId(preVo);
}
/**
* 通过id查询商险待签订任务记录表
* @param registId
......
......@@ -95,6 +95,21 @@ public class TInsuranceDetailController {
return R.ok(tInsuranceDetailService.getInsuranceListPage(page, param, mId));
}
/**
* @Author fxj
* @Description
* @Date 11:55 2026/1/27
* @Param
* @return
**/
@Operation(summary = "投保页查询待缴费金额", description = "投保分页查询")
@PostMapping("/getInsuranceListPagePaymentMoney")
public R<Double> getInsuranceListPagePaymentMoney(@RequestBody InsuranceListParam param,
@RequestParam(required = false) String mId) {
param.setPaymentStatus(CommonConstants.ZERO_STRING);
return R.ok(tInsuranceDetailService.getInsuranceListPagePaymentMoney(param, mId));
}
/**
* 投保不分页查询
*
......@@ -1027,6 +1042,10 @@ public class TInsuranceDetailController {
@Operation(summary = "手动拉取缴费状态", description = "手动拉取缴费状态")
@PostMapping("/pullPaymentStatus")
public R pullPaymentStatus() {
return tInsuranceDetailService.pullPaymentStatus(null);
YifuUser user = SecurityUtils.getUser();
if (user == null || Common.isEmpty(user.getId())) {
return R.failed(CommonConstants.PLEASE_LOG_IN);
}
return tInsuranceDetailService.pullPaymentStatus(null,user );
}
}
......@@ -31,6 +31,8 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
*/
IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, @Param("param") InsuranceListParam param);
Double getInsuranceListPagePaymentMoney(@Param("param") InsuranceListParam param);
/**
* 投保不分页查询
*
......
......@@ -135,5 +135,7 @@ public interface TEmployeeInsurancePreService extends IService<TEmployeeInsuranc
Boolean delInsurancePreByRegisterId(BaseSearchVO preVo);
R<TEmployeeInsurancePre> getInfoByRegistId(String registId);
Boolean refuseInsurancePreByRegisterId(BaseSearchVO preVo);
R<TEmployeeInsurancePre> getInfoByRegistId(String registId);
}
......@@ -606,7 +606,9 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
R callBack(TInsuranceDetail detail);
R pullPaymentStatus(String idStr);
R pullPaymentStatus(String idStr,YifuUser user );
R callBackInsuranceBuyHandleStatus(EkpStatusParamVo vo);
Double getInsuranceListPagePaymentMoney(InsuranceListParam param, String mId);
}
......@@ -12,7 +12,6 @@ import com.yifu.cloud.plus.v1.csp.vo.EmployeeRegistrationCustomerUserUpdateVo;
import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysUserListVo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.EmployeeRegistrationPre;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPre;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeRegistrationPreVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainRegistListVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants;
......@@ -1001,7 +1000,13 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
return this.remove(Wrappers.<TEmployeeInsurancePre>query().lambda()
.eq(TEmployeeInsurancePre::getRegisterId, preVo.getRegisterId()));
}
@Override
public Boolean refuseInsurancePreByRegisterId(BaseSearchVO preVo) {
LambdaUpdateWrapper<TEmployeeInsurancePre> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TEmployeeInsurancePre::getRegisterId, preVo.getRegisterId());
updateWrapper.set(TEmployeeInsurancePre::getIsRefuse, CommonConstants.ZERO_STRING);
return this.update(updateWrapper);
}
@Override
public R<TEmployeeInsurancePre> getInfoByRegistId(String registId) {
if (Common.isEmpty(registId)){
......
......@@ -36,6 +36,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.BaseServiceParamListVO;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprArchivesProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.*;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.ekp.constant.EkpConstants;
import com.yifu.cloud.plus.v1.yifu.insurances.config.WxConfig;
......@@ -518,9 +519,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//购买周期
long purchaseCycle = 0;
LocalDate buyStartDate;
//计算预计办理日期:若派单当日为工作日3点20之前,则预计办理日期为派单日期,若为3点20之后或派单日为非工作日,则预计办理日期为派单日后最近的一个工作日
detail.setPreHandleTime(LocalDateUtil.parseLocalDate(DateUtil.formatDate(preDispatchDate)));
if (CommonConstants.ZERO_STRING.equals(detail.getIsJfcd())){
//计算预计办理日期:若派单当日为工作日3点20之前,则预计办理日期为派单日期,若为3点20之后或派单日为非工作日,则预计办理日期为派单日后最近的一个工作日
detail.setPreHandleTime(LocalDateUtil.parseLocalDate(DateUtil.formatDate(preDispatchDate)));
//计算参保开始日期:新增\批增\替换的参保开始日期=MAX("保单开始时间"、"预计办理日期+1日");
if (detail.getPolicyStart().isAfter(detail.getPreHandleTime().plusDays(1))){
buyStartDate = detail.getPolicyStart();
......@@ -550,7 +551,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
long day = LocalDateUtil.betweenDay(buyStartDate.toString().toString(),detail.getPolicyEnd().toString());
//购买周期
detail.setPurchaseCycle(purchaseCycle+"个月|"+day+"天");
detail.setPurchaseCycle(purchaseCycle+"个月/"+day+"天");
//预估缴费状态 0待缴费、1已缴费
detail.setPaymentStatus(CommonConstants.ZERO_STRING);
detail.setBuyHandleStatus(CommonConstants.SIX_INT);
......@@ -1172,6 +1173,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
public InsuranceDetailVO getInsuranceDetailById(String id) {
InsuranceDetailVO insuranceDetailVO = this.baseMapper.getInsuranceDetailById(id);
if (null != insuranceDetailVO){
//见费出单 费用类型也是预估
if (CommonConstants.ZERO_STRING.equals(insuranceDetailVO.getIsJfcd())){
insuranceDetailVO.setPremiumType(CommonConstants.ZERO_INT);
}
long day = LocalDateUtil.betweenDay(insuranceDetailVO.getPolicyStart().toString(),insuranceDetailVO.getPolicyEnd().toString());
long month = LocalDateUtil.betweenMonth(insuranceDetailVO.getPolicyStart().toString(),insuranceDetailVO.getPolicyEnd().toString());
String defaultSettleId = insuranceDetailVO.getDefaultSettleId();
......@@ -9760,13 +9765,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @return
**/
@Override
public R pullPaymentStatus(String idStr) {
public R pullPaymentStatus(String idStr,YifuUser user ) {
List<TInsuranceDetail> list = null;
if (Common.isNotNull(idStr)){
list = baseMapper.selectBatchIds(Arrays.asList(idStr.split(CommonConstants.COMMA_STRING)));
}else {
list = baseMapper.selectList(Wrappers.<TInsuranceDetail>query().lambda()
.eq(TInsuranceDetail::getBuyHandleStatus,CommonConstants.SIX_INT)
.eq(BaseEntity::getCreateBy, user.getId())
.eq(TInsuranceDetail::getIsJfcd,CommonConstants.ZERO_STRING));
}
......@@ -9892,4 +9898,18 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
log.error("收款结算单退单或撤销匹配更新是否见费出单的商险状态为待缴费", e);
}
}
@Override
public Double getInsuranceListPagePaymentMoney(InsuranceListParam param, String mId) {
YifuUser user = SecurityUtils.getUser();
if (!Common.isEmpty(mId)) {
param.setMId(mId);
}
param.setCreateBy(user.getId());
menuUtil.setAuthSql(user, param);
if (Common.isNotNull(param.getAuthSql()) && param.getAuthSql().contains("1=2 CONCAT")) {
param.setAuthSql(param.getAuthSql().replace("1=2 CONCAT", "CONCAT"));
}
return baseMapper.getInsuranceListPagePaymentMoney(param);
}
}
......@@ -673,6 +673,10 @@ public class DoJointInsuranceTask {
pushParam.setFd_3adfe6af71a1cc("预估");
//见费出单 是否全部结算 都是 是
pushParam.setFd_3b13b2ecc164aa("是");
//实际结算月份
pushParam.setFd_3af9d11088facc(null);
//有无预估
pushParam.setFd_3af9d1441ef7b6("有");
}
if (InsurancesConstants.ACTUAL_SETTLE_BILL.equals(param.getSettleType())){
......@@ -684,12 +688,14 @@ public class DoJointInsuranceTask {
ys = BigDecimalUtils.subtractAllowNegative(param.getActualPremium(),param.getEstimatePremium()).doubleValue();
//应支=0
pushParam.setFd_3adfe6e3911ffe(0.00);
//是否全部结算
pushParam.setFd_3b13b2ecc164aa("是");
//实际保费设置为0.0
pushParam.setFd_3adfe6610c0d2c(null == param.getActualPremium()?0.00:param.getActualPremium().doubleValue());
//见费出单 是否全部结算 都是 是
pushParam.setFd_3b13b2ecc164aa("是");
//实际结算月份
pushParam.setFd_3af9d11088facc(null);
//有无预估
pushParam.setFd_3af9d1441ef7b6("有");
}
......
......@@ -107,6 +107,9 @@
</sql>
<sql id="tEmployeeInsurancePre_where">
<if test="tEmployeeInsurancePre != null">
<if test="tEmployeeInsurancePre.isRefuse != null and tEmployeeInsurancePre.isRefuse.trim() != ''">
AND a.IS_REFUSE = #{tEmployeeInsurancePre.isRefuse}
</if>
<if test="tEmployeeInsurancePre.id != null and tEmployeeInsurancePre.id.trim() != ''">
AND a.id = #{tEmployeeInsurancePre.id}
</if>
......
......@@ -131,7 +131,7 @@
a.PAYMENT_STATUS as paymentStatus,
a.PAYMENT_TIME as paymentTime,
a.IS_JFCD as isJfcd,
IF(a.BILLING_TYPE='0',CONCAT(a.PURCHASE_CYCLE,'天'),CONCAT(a.PURCHASE_CYCLE,'个月')) as purchaseCycle,
a.PURCHASE_CYCLE as purchaseCycle,
a.BILLING_TYPE as billingType,
a.PRE_HANDLE_TIME as preHandleTime,
a.ESTIMATE_PREMIUM as estimatePremium
......@@ -242,7 +242,7 @@
a.PAYMENT_TIME as paymentTime,
a.IS_JFCD as isJfcd,
<!-- a.PURCHASE_CYCLE as purchaseCycle, -->
IF(a.BILLING_TYPE='0',CONCAT(a.PURCHASE_CYCLE,'天'),CONCAT(a.PURCHASE_CYCLE,'个月')) as purchaseCycle,
a.PURCHASE_CYCLE as purchaseCycle,
a.PRE_HANDLE_TIME as preHandleTime,
a.ESTIMATE_PREMIUM as estimatePremium,
a.BILLING_TYPE as billingType
......@@ -437,7 +437,7 @@
a.EXPIRE_REMARK,
a.EXPIRE_IGNORE_FLAG,
a.IS_ADRESS as isAdress,a.PAYMENT_STATUS,a.PAYMENT_TIME,a.IS_JFCD,
IF(a.BILLING_TYPE='0',CONCAT(a.PURCHASE_CYCLE,'天'),CONCAT(a.PURCHASE_CYCLE,'个月')) PURCHASE_CYCLE,a.PRE_HANDLE_TIME
a.PURCHASE_CYCLE,a.PRE_HANDLE_TIME
from t_insurance_detail a
left join t_insurance_settle tis on a.DEFAULT_SETTLE_ID = tis.ID
where a.ID = #{id}
......@@ -2543,5 +2543,85 @@
</if>
and b.PRE_ID is not null
</select>
<select id="getInsuranceListPagePaymentMoney" resultType="java.lang.Double">
select
ROUND(SUM(ifnull(a.ESTIMATE_PREMIUM,0.00)),2) as paymentMoney
from t_insurance_detail a
where a.DELETE_FLAG = 0
<if test="param.isEffect != null">
and a.IS_EFFECT = #{param.isEffect}
</if>
<if test="param.id != null">
and a.id = #{param.id}
</if>
<if test="param.unitName != null and param.unitName.trim() != ''">
and a.UNIT_NAME like concat(replace(replace(#{param.unitName},'_','\_'),'%','\%'),'%')
</if>
<if test="param.unitNo != null and param.unitNo.trim() != ''">
and a.UNIT_NO like concat(replace(replace(#{param.unitNo},'_','\_'),'%','\%'),'%')
</if>
<if test="param.deptNo != null and param.deptNo.trim() != ''">
and a.DEPT_NO = #{param.deptNo}
</if>
<if test="param.orderNo != null and param.orderNo.trim() != ''">
and a.ORDER_NO = #{param.orderNo}
</if>
<if test="param.buyHandleStatus != null">
and a.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
</if>
<if test="param.empName != null and param.empName.trim() != ''">
and a.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%')
</if>
<if test="param.empIdcardNo != null and param.empIdcardNo.trim() != ''">
and a.EMP_IDCARD_NO like concat('%',replace(replace(#{param.empIdcardNo},'_','\_'),'%','\%'),'%')
</if>
<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
and a.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName}
</if>
<if test="param.insuranceTypeName != null and param.insuranceTypeName.trim() != ''">
and a.INSURANCE_TYPE_NAME like concat('%',replace(replace(#{param.insuranceTypeName},'_','\_'),'%','\%'),'%')
</if>
<if test="param.buyHandleStatusList != null and param.buyHandleStatusList.size > 0">
and a.BUY_HANDLE_STATUS in
<foreach collection="param.buyHandleStatusList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="param.buyType != null">
and a.BUY_TYPE = #{param.buyType}
</if>
<if test="param.createName != null and param.createName.trim() != ''">
and a.CREATE_NAME like concat('%',#{param.createName},'%')
</if>
<if test="param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''">
and a.CREATE_TIME <![CDATA[ >= ]]> concat(#{param.startDate}, ' 00:00:00') and a.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
</if>
<if test="param.reduceHandleStatus != null">
and a.REDUCE_HANDLE_STATUS = #{param.reduceHandleStatus}
</if>
<if test="param.isAdress != null and param.isAdress.trim() != ''">
and a.IS_ADRESS = #{param.isAdress}
</if>
<if test="param.paymentStatus != null and param.paymentStatus.trim() != ''">
and a.PAYMENT_STATUS = #{param.paymentStatus}
</if>
<if test="param.paymentTimeStart != null and param.paymentTimeStart.trim() != '' ">
and a.PAYMENT_TIME <![CDATA[ >= ]]> #{param.paymentTimeStart}
</if>
<if test="param.paymentTimeEnd != null and param.paymentTimeEnd.trim() != ''">
and a.PAYMENT_TIME <![CDATA[ <= ]]> #{param.paymentTimeEnd}
</if>
<if test="param.isJfcd != null and param.isJfcd.trim() != ''">
and a.IS_JFCD = #{param.isJfcd}
</if>
<if test="param.estimatePremiumStart != null">
and a.ESTIMATE_PREMIUM <![CDATA[ >= ]]> #{param.estimatePremiumStart}
</if>
<if test="param.estimatePremiumEnd != null">
and a.ESTIMATE_PREMIUM <![CDATA[ <= ]]> #{param.estimatePremiumEnd}
</if>
<if test="param.authSql != null and param.authSql.trim() != ''">
${param.authSql}
</if>
</select>
</mapper>
......@@ -677,4 +677,10 @@ public class TDispatchInfoPre extends BaseEntity {
@Schema(description = "起缴日期类型:0 入职日期 1 入职满个月 2 入职满2个月 3 入职满3个月 4 入职满4个月 5 入职满5个月 6 入职满6个月 7 入职满7个月 8 入职满8个月 9 入职满9个月 10 入职满10个月 11 入职满11个月 12 入职满12个月")
private String socialDateType;
/**
* 是否拒绝入职: 0 是 1 否
*/
@Schema(description = "是否拒绝入职: 0 是 1 ")
private String isRefuse;
}
......@@ -57,8 +57,6 @@ public class TDispatchInfoPreController {
//typeSuB 0 社保 1 公积金
if (Common.isEmpty(tDispatchInfoPre.getTypeSub())){
tDispatchInfoPre.setTypeSub(CommonConstants.ZERO_STRING);
}else if (Common.isEmpty(tDispatchInfoPre.getTypeSub())){
tDispatchInfoPre.setTypeSub(tDispatchInfoPre.getTypeSub());
}
return new R<>(tDispatchInfoPreService.getTDispatchInfoPrePage(page, tDispatchInfoPre));
}
......@@ -376,7 +374,19 @@ public class TDispatchInfoPreController {
public Boolean deleteUnProcessFundPreInfo(@RequestBody String id) {
return tDispatchInfoPreService.deleteUnProcessFundPreInfo(id);
}
/**
* @Author fxj
* @Description 拒绝入职更新非流程中的公积金待购买数据
* @Date 11:09 2026/1/27
* @Param
* @return
**/
@Operation(description = "拒绝入职更新非流程中的公积金待购买数据")
@Inner
@PostMapping("/updateRefuseFundPreInfo")
public Boolean updateRefuseFundPreInfo(@RequestBody String id) {
return tDispatchInfoPreService.updateRefuseFundPreInfo(id);
}
/**
* 派单当日9点统一推送确认信息 公积金可以通用
......@@ -414,4 +424,18 @@ public class TDispatchInfoPreController {
public R<TDispatchInfoPre> getInfoByRegistId(@RequestParam("registId" ) String registId, @RequestParam("type" ) String type) {
return tDispatchInfoPreService.getInfoByRegistId(registId,type);
}
/**
* @Author fxj
* @Description 拒绝入职更新非流程中的社保待购买数据
* @Date 11:04 2026/1/27
* @Param
* @return
**/
@Operation(description = "拒绝入职更新非流程中的社保待购买数据")
@Inner
@PostMapping("/updateRefuseSocialPreInfo")
public Boolean updateRefuseSocialPreInfo(@RequestBody String id) {
return tDispatchInfoPreService.updateRefuseSocialPreInfo(id);
}
}
......@@ -109,4 +109,7 @@ public interface TDispatchInfoPreService extends IService<TDispatchInfoPre> {
R<TDispatchInfoPre> getInfoByRegistId(String registId,String type);
Boolean updateRefuseSocialPreInfo(String id);
Boolean updateRefuseFundPreInfo(String id);
}
......@@ -21,7 +21,6 @@ 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;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre;
import com.yifu.cloud.plus.v1.yifu.social.config.WxConfig;
import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfoPre;
import com.yifu.cloud.plus.v1.yifu.social.entity.TFundPreDetail;
......@@ -1068,4 +1067,27 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
.eq(TDispatchInfoPre::getTypeSub,type)
.eq(TDispatchInfoPre::getRegisterId, registId).last(CommonConstants.LAST_ONE_SQL)));
}
@Override
public Boolean updateRefuseSocialPreInfo(String id) {
//更新未处理的社保待购买信息
LambdaUpdateWrapper<TDispatchInfoPre> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(TDispatchInfoPre::getIsRefuse, CommonConstants.ZERO_STRING);
updateWrapper.in(TDispatchInfoPre::getTypeSub,CommonConstants.ZERO_STRING);
updateWrapper.in(TDispatchInfoPre::getProcessStatus, Arrays.asList("0", "1", "2", "4","8"));
updateWrapper.eq(TDispatchInfoPre::getRegisterId, id);
return this.update(updateWrapper);
}
@Override
public Boolean updateRefuseFundPreInfo(String id) {
//删除未处理的公积金待购买信息
LambdaUpdateWrapper<TDispatchInfoPre> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(TDispatchInfoPre::getIsRefuse, CommonConstants.ZERO_STRING);
updateWrapper.in(TDispatchInfoPre::getTypeSub,CommonConstants.ONE_STRING);
updateWrapper.in(TDispatchInfoPre::getProcessStatus, Arrays.asList("0", "1", "2", "4","8"));
updateWrapper.eq(TDispatchInfoPre::getRegisterId, id);
return this.update(updateWrapper);
}
}
......@@ -207,6 +207,9 @@
</sql>
<sql id="tDispatchInfoPre_other_where">
<if test="tDispatchInfoPre != null">
<if test="tDispatchInfoPre.isRefuse != null and tDispatchInfoPre.isRefuse.trim() != ''">
AND a.IS_REFUSE = #{tDispatchInfoPre.isRefuse}
</if>
<if test="tDispatchInfoPre.id != null and tDispatchInfoPre.id.trim() != ''">
AND a.ID = #{tDispatchInfoPre.id}
</if>
......@@ -331,6 +334,9 @@
<sql id="tDispatchInfoPre_where">
<if test="tDispatchInfoPre != null">
<if test="tDispatchInfoPre.isRefuse != null and tDispatchInfoPre.isRefuse.trim() != ''">
AND a.IS_REFUSE = #{tDispatchInfoPre.isRefuse}
</if>
<if test="tDispatchInfoPre.id != null and tDispatchInfoPre.id.trim() != ''">
AND a.ID = #{tDispatchInfoPre.id}
</if>
......
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