Commit 163c1a3f authored by hongguangwu's avatar hongguangwu

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

# Conflicts:
#	yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TInsuranceUnpurchasePersonService.java
#	yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TInsuranceUnpurchasePersonServiceImpl.java
parents 0e127826 958ac7be
...@@ -35,6 +35,7 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil; ...@@ -35,6 +35,7 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog; import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner; import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils; import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonCardVo;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
...@@ -353,4 +354,17 @@ public class TEmployeeProjectController { ...@@ -353,4 +354,17 @@ public class TEmployeeProjectController {
public R<List<TSettleDomainDataVo>> selectSettleMentData(@RequestBody List<String> deptNoList) { public R<List<TSettleDomainDataVo>> selectSettleMentData(@RequestBody List<String> deptNoList) {
return tEmployeeProjectService.selectSettleMentData(deptNoList); return tEmployeeProjectService.selectSettleMentData(deptNoList);
} }
/**
* @param cardVo
* @Description: 判断员工是否存在在项的项目档案
* @Author: huyc
* @Date: 2025/1/15
* @return:
**/
@Inner
@PostMapping("/inner/selectExitEmpProject")
public Boolean selectExitEmpProject(@RequestBody TInsuranceUnpurchasePersonCardVo cardVo) {
return tEmployeeProjectService.selectExitEmpProject(cardVo);
}
} }
...@@ -26,6 +26,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject; ...@@ -26,6 +26,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
import com.yifu.cloud.plus.v1.yifu.archives.vo.*; import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage; import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonCardVo;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.InputStream; import java.io.InputStream;
...@@ -282,4 +283,6 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> { ...@@ -282,4 +283,6 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
**/ **/
Map<String, TEmployeeProject> getMapByDeptIdAndDelete(String deptId); Map<String, TEmployeeProject> getMapByDeptIdAndDelete(String deptId);
Boolean selectExitEmpProject(TInsuranceUnpurchasePersonCardVo cardVo);
} }
...@@ -52,6 +52,7 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties; ...@@ -52,6 +52,7 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties; import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil; import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils; import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonCardVo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -1942,4 +1943,14 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1942,4 +1943,14 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
return proMap; return proMap;
} }
@Override
public Boolean selectExitEmpProject(TInsuranceUnpurchasePersonCardVo cardVo) {
long count = baseMapper.selectCount(Wrappers.<TEmployeeProject>query().lambda()
.eq(TEmployeeProject::getDeptNo, cardVo.getDeptNo())
.eq(TEmployeeProject::getProjectStatus, CommonConstants.ZERO_INT)
.eq(TEmployeeProject::getEmpIdcard, CommonConstants.ZERO_STRING)
.eq(TEmployeeProject::getDeleteFlag, cardVo.getEmpIdcardNo()));
return count > 0;
}
} }
...@@ -634,6 +634,8 @@ public interface CommonConstants { ...@@ -634,6 +634,8 @@ public interface CommonConstants {
List<String> socialInfoStatus = Stream.of("1","3","5","7").collect(Collectors.toList()); List<String> socialInfoStatus = Stream.of("1","3","5","7").collect(Collectors.toList());
List<String> deptList = Stream.of("安徽一册档案管理有限公司","安徽顾合企业管理咨询有限公司","安徽赤道线数字传媒科技有限公司","劳务业务中心","易服智享&研究院").collect(Collectors.toList());
String USER_DIR = "user.dir"; String USER_DIR = "user.dir";
String DOUBLE_LINE = "//"; String DOUBLE_LINE = "//";
......
...@@ -13,6 +13,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; ...@@ -13,6 +13,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
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.DaprArchivesProperties; import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprArchivesProperties;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchasePersonCardVo;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
...@@ -506,4 +507,15 @@ public class ArchivesDaprUtil { ...@@ -506,4 +507,15 @@ public class ArchivesDaprUtil {
} }
return res; return res;
} }
/**
* @Author huyc
* @Description 判断是否存在正常的项目
* @Date 16:38 2025/1/15
* @Param
* @return
**/
public R<Boolean> selectExitEmpProject(TInsuranceUnpurchasePersonCardVo cardVo) {
return HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/temployeeproject/inner/selectExitEmpProject", JSON.toJSONString(cardVo), Boolean.class, SecurityConstants.FROM_IN);
}
} }
...@@ -157,8 +157,8 @@ public class SocialDaprUtils { ...@@ -157,8 +157,8 @@ public class SocialDaprUtils {
/** /**
* @Author huyc * @Author huyc
* @Description 更新结算信息 * @Description 判断是否存在正常的工伤缴费
* @Date 17:38 2022/12/26 * @Date 16:38 2025/1/15
* @Param * @Param
* @return * @return
**/ **/
......
...@@ -95,7 +95,7 @@ public class TInsuranceUnpurchaseApply extends BaseEntity { ...@@ -95,7 +95,7 @@ public class TInsuranceUnpurchaseApply extends BaseEntity {
private List<String> attaIdList; private List<String> attaIdList;
/** /**
* 暂存,提交,编辑区分 * 暂存,提交区分
*/ */
@TableField(exist = false) @TableField(exist = false)
private String saveFlag; private String saveFlag;
......
package com.yifu.cloud.plus.v1.yifu.salary.entity; package com.yifu.cloud.plus.v1.yifu.salary.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity; import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
...@@ -8,6 +9,8 @@ import io.swagger.v3.oas.annotations.media.Schema; ...@@ -8,6 +9,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.List;
/** /**
* 含风险项目不购买申请明细表 * 含风险项目不购买申请明细表
* *
...@@ -80,4 +83,12 @@ public class TInsuranceUnpurchasePerson extends BaseEntity { ...@@ -80,4 +83,12 @@ public class TInsuranceUnpurchasePerson extends BaseEntity {
@Schema(description ="服务项是否勾选商险 0 是 1 否") @Schema(description ="服务项是否勾选商险 0 是 1 否")
private String insuranceFlag; private String insuranceFlag;
@Schema(description = "申请状态 0 草稿 1待提交 2 待审核 3 审核通过 4 审核不通过")
private String status;
@Schema(description = "工资人员明细")
@TableField(exist = false)
private List<TInsuranceUnpurchasePersonSalary> personInfoList;
} }
...@@ -24,4 +24,7 @@ public class TInsuranceUnpurchasePersonCardVo implements Serializable { ...@@ -24,4 +24,7 @@ public class TInsuranceUnpurchasePersonCardVo implements Serializable {
@Schema(description = "身份证号") @Schema(description = "身份证号")
private String empIdcardNo; private String empIdcardNo;
@Schema(description = "身份证号")
private String deptNo;
} }
...@@ -52,16 +52,16 @@ public class TInsuranceUnpurchasePersonVo implements Serializable { ...@@ -52,16 +52,16 @@ public class TInsuranceUnpurchasePersonVo implements Serializable {
@ExcelProperty("项目编码") @ExcelProperty("项目编码")
private String deptNo; private String deptNo;
@ExcelAttribute(name = "事业部")
@Schema(description = "事业部")
@ExcelProperty("事业部")
private String division;
@ExcelAttribute(name = "事业部条线") @ExcelAttribute(name = "事业部条线")
@Schema(description = "事业部条线") @Schema(description = "事业部条线")
@ExcelProperty("事业部条线") @ExcelProperty("事业部条线")
private String newLine; private String newLine;
@ExcelAttribute(name = "事业部")
@Schema(description = "事业部")
@ExcelProperty("事业部")
private String division;
/** /**
* 姓名 * 姓名
*/ */
......
...@@ -56,7 +56,7 @@ public class TInsuranceUnpurchasePersonController { ...@@ -56,7 +56,7 @@ public class TInsuranceUnpurchasePersonController {
@Operation(summary = "通过id查询", description = "通过id查询") @Operation(summary = "通过id查询", description = "通过id查询")
@GetMapping("/{id}") @GetMapping("/{id}")
public R<TInsuranceUnpurchasePerson> getById(@PathVariable("id" ) String id) { public R<TInsuranceUnpurchasePerson> getById(@PathVariable("id" ) String id) {
return R.ok(tInsuranceUnpurchasePersonService.getById(id)); return tInsuranceUnpurchasePersonService.getPersonInfo(id);
} }
/** /**
......
...@@ -8,7 +8,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R; ...@@ -8,7 +8,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
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.salary.entity.TInsuranceUnpurchaseApply; import com.yifu.cloud.plus.v1.yifu.salary.entity.TInsuranceUnpurchaseApply;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchaseApplySearchVo; import com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchaseApplySearchVo;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.Map; import java.util.Map;
...@@ -64,7 +63,6 @@ public interface TInsuranceUnpurchaseApplyService extends IService<TInsuranceUnp ...@@ -64,7 +63,6 @@ public interface TInsuranceUnpurchaseApplyService extends IService<TInsuranceUnp
R<String> auditAndCommit(TInsuranceUnpurchaseApply insuranceUnpurchaseApply, String approvalResult, String approvalOpinion, YifuUser user) R<String> auditAndCommit(TInsuranceUnpurchaseApply insuranceUnpurchaseApply, String approvalResult, String approvalOpinion, YifuUser user)
throws CheckedException; throws CheckedException;
@Transactional
R addApply(TInsuranceUnpurchaseApply tInsuranceUnpurchaseApply); R addApply(TInsuranceUnpurchaseApply tInsuranceUnpurchaseApply);
R<TInsuranceUnpurchaseApply> getDetailInfoById(String id); R<TInsuranceUnpurchaseApply> getDetailInfoById(String id);
......
...@@ -40,6 +40,8 @@ public interface TInsuranceUnpurchasePersonService extends IService<TInsuranceUn ...@@ -40,6 +40,8 @@ public interface TInsuranceUnpurchasePersonService extends IService<TInsuranceUn
**/ **/
R<String> getSocialWorkInjuryHandleById(String id); R<String> getSocialWorkInjuryHandleById(String id);
R<TInsuranceUnpurchasePerson> getPersonInfo(String id);
void doSocialWorkInjuryHandleAll(); void doSocialWorkInjuryHandleAll();
} }
...@@ -4,6 +4,7 @@ import com.alibaba.excel.EasyExcel; ...@@ -4,6 +4,7 @@ import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.WriteSheet;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
...@@ -12,7 +13,9 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil; ...@@ -12,7 +13,9 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.SocialDaprUtils; import com.yifu.cloud.plus.v1.yifu.common.dapr.util.SocialDaprUtils;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TInsuranceUnpurchasePerson; import com.yifu.cloud.plus.v1.yifu.salary.entity.TInsuranceUnpurchasePerson;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TInsuranceUnpurchasePersonSalary;
import com.yifu.cloud.plus.v1.yifu.salary.mapper.TInsuranceUnpurchasePersonMapper; import com.yifu.cloud.plus.v1.yifu.salary.mapper.TInsuranceUnpurchasePersonMapper;
import com.yifu.cloud.plus.v1.yifu.salary.mapper.TInsuranceUnpurchasePersonSalaryMapper;
import com.yifu.cloud.plus.v1.yifu.salary.service.TInsuranceUnpurchasePersonService; import com.yifu.cloud.plus.v1.yifu.salary.service.TInsuranceUnpurchasePersonService;
import com.yifu.cloud.plus.v1.yifu.salary.vo.*; import com.yifu.cloud.plus.v1.yifu.salary.vo.*;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
...@@ -39,6 +42,8 @@ public class TInsuranceUnpurchasePersonServiceImpl extends ServiceImpl<TInsuranc ...@@ -39,6 +42,8 @@ public class TInsuranceUnpurchasePersonServiceImpl extends ServiceImpl<TInsuranc
@Resource @Resource
private SocialDaprUtils socialDaprUtil; private SocialDaprUtils socialDaprUtil;
@Resource
TInsuranceUnpurchasePersonSalaryMapper salaryMapper;
/** /**
* 含风险项目不购买申请明细表简单分页查询 * 含风险项目不购买申请明细表简单分页查询
...@@ -132,6 +137,21 @@ public class TInsuranceUnpurchasePersonServiceImpl extends ServiceImpl<TInsuranc ...@@ -132,6 +137,21 @@ public class TInsuranceUnpurchasePersonServiceImpl extends ServiceImpl<TInsuranc
return R.ok("成功"); return R.ok("成功");
} }
@Override
public R<TInsuranceUnpurchasePerson> getPersonInfo(String id) {
TInsuranceUnpurchasePerson person = baseMapper.selectById(id);
if (Common.isNotNull(person)) {
List<TInsuranceUnpurchasePersonSalary> personInfoList = salaryMapper.selectList(
Wrappers.<TInsuranceUnpurchasePersonSalary>lambdaQuery()
.eq(TInsuranceUnpurchasePersonSalary::getParentId, id)
.eq(TInsuranceUnpurchasePersonSalary::getDeleteFlag, CommonConstants.ZERO_INT));
person.setPersonInfoList(personInfoList);
} else {
return R.failed(CommonConstants.NO_DATA_TO_HANDLE);
}
return R.ok(person);
}
/** /**
* @Description: 刷新社保状态 * @Description: 刷新社保状态
* @Author: hgw * @Author: hgw
......
package com.yifu.cloud.plus.v1.yifu.salary.service.impl.process; package com.yifu.cloud.plus.v1.yifu.salary.service.impl.process;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser; import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
...@@ -8,10 +9,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.exception.CheckedException; ...@@ -8,10 +9,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.exception.CheckedException;
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.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
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.salary.entity.TAuditRecord;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TAuditNodeProocess;
import com.yifu.cloud.plus.v1.yifu.salary.service.TInsuranceUnpurchaseApplyService;
import com.yifu.cloud.plus.v1.yifu.salary.service.impl.AbastractAuditProcess;
import com.yifu.cloud.plus.v1.yifu.process.constant.ProcessConstants; import com.yifu.cloud.plus.v1.yifu.process.constant.ProcessConstants;
import com.yifu.cloud.plus.v1.yifu.process.entity.TNodePrimission; import com.yifu.cloud.plus.v1.yifu.process.entity.TNodePrimission;
import com.yifu.cloud.plus.v1.yifu.process.entity.TNodeRoute; import com.yifu.cloud.plus.v1.yifu.process.entity.TNodeRoute;
...@@ -19,7 +16,13 @@ import com.yifu.cloud.plus.v1.yifu.process.entity.TNodeRouteCondition; ...@@ -19,7 +16,13 @@ import com.yifu.cloud.plus.v1.yifu.process.entity.TNodeRouteCondition;
import com.yifu.cloud.plus.v1.yifu.process.entity.TProcessNode; import com.yifu.cloud.plus.v1.yifu.process.entity.TProcessNode;
import com.yifu.cloud.plus.v1.yifu.process.util.ProcessAuditUtil; import com.yifu.cloud.plus.v1.yifu.process.util.ProcessAuditUtil;
import com.yifu.cloud.plus.v1.yifu.process.vo.ProcessVo; import com.yifu.cloud.plus.v1.yifu.process.vo.ProcessVo;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TAuditNodeProocess;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TAuditRecord;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TInsuranceUnpurchaseApply; import com.yifu.cloud.plus.v1.yifu.salary.entity.TInsuranceUnpurchaseApply;
import com.yifu.cloud.plus.v1.yifu.salary.entity.TInsuranceUnpurchasePerson;
import com.yifu.cloud.plus.v1.yifu.salary.service.TInsuranceUnpurchaseApplyService;
import com.yifu.cloud.plus.v1.yifu.salary.service.TInsuranceUnpurchasePersonService;
import com.yifu.cloud.plus.v1.yifu.salary.service.impl.AbastractAuditProcess;
import com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchaseApplySearchVo; import com.yifu.cloud.plus.v1.yifu.salary.vo.TInsuranceUnpurchaseApplySearchVo;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -42,6 +45,9 @@ public class TInsuranceUnpurchaseApplyAuditProcess extends AbastractAuditProcess ...@@ -42,6 +45,9 @@ public class TInsuranceUnpurchaseApplyAuditProcess extends AbastractAuditProcess
@Resource @Resource
private TInsuranceUnpurchaseApplyService tInsuranceUnpurchaseApplyService; private TInsuranceUnpurchaseApplyService tInsuranceUnpurchaseApplyService;
@Resource
private TInsuranceUnpurchasePersonService personService;
@Override @Override
public R<String> auditSuccess(TInsuranceUnpurchaseApply entity, TAuditRecord approvalRecord, YifuUser loginUser) { public R<String> auditSuccess(TInsuranceUnpurchaseApply entity, TAuditRecord approvalRecord, YifuUser loginUser) {
// 改实体审核状态为审核通过 // 改实体审核状态为审核通过
...@@ -60,6 +66,12 @@ public class TInsuranceUnpurchaseApplyAuditProcess extends AbastractAuditProcess ...@@ -60,6 +66,12 @@ public class TInsuranceUnpurchaseApplyAuditProcess extends AbastractAuditProcess
auditNodeProocessService.remove(Wrappers.<TAuditNodeProocess>query().lambda().eq(TAuditNodeProocess::getDomainId, entity.getId()) auditNodeProocessService.remove(Wrappers.<TAuditNodeProocess>query().lambda().eq(TAuditNodeProocess::getDomainId, entity.getId())
.in(TAuditNodeProocess::getType, approvalRecord.getAuditType())); .in(TAuditNodeProocess::getType, approvalRecord.getAuditType()));
} }
//huych--更新明细审核状态
LambdaUpdateWrapper<TInsuranceUnpurchasePerson> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TInsuranceUnpurchasePerson::getParnetId,entity.getId())
.set(TInsuranceUnpurchasePerson::getStatus, entity.getStatus());
personService.update(updateWrapper);
} }
return R.ok("审核通过"); return R.ok("审核通过");
......
...@@ -156,12 +156,12 @@ ...@@ -156,12 +156,12 @@
APPLY_NO, APPLY_NO,
DEPT_NAME, DEPT_NAME,
DEPT_NO, DEPT_NO,
DIVISION,
NEW_LINE, NEW_LINE,
DIVISION,
EMP_NAME, EMP_NAME,
EMP_IDCARD_NO, EMP_IDCARD_NO,
if(a.REASON_TYPE = '1','已购买社保','人员已离职') REASON_TYPE, if(a.REASON_TYPE = '1','已购买社保','人员已离职') REASON_TYPE,
if(a.SOCIAL_STATUS='0','是','否') SOCIAL_STATUS, if(a.SOCIAL_STATUS='0','在保','不在保') SOCIAL_STATUS,
SALARY_NUM, SALARY_NUM,
CREATE_NAME, CREATE_NAME,
CREATE_TIME CREATE_TIME
......
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