Commit b59914f9 authored by huyuchen's avatar huyuchen

huych-合同自动化代码提交

parent fee071c6
......@@ -236,6 +236,15 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema(description = "合同岗位 0 固定岗位 1 等于档案处维护 2 自定义")
private String postType;
@Schema(description = "入职确认选择 0 配置方案内选择、1 自定义 2 配置方案+自定义")
private String confirmEmpSelect;
@Schema(description = "超时未确认是否触发签署任务(电子签) 0 自动触发 1 不触发")
private String timeoutElecSign;
@Schema(description = "合同截止日期类型 ")
private String contractEndType;
@Schema(description = "合同岗位名称")
private String post;
......
......@@ -326,6 +326,22 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
@Schema(description = "计时工资 工资标准 元/月 ")
@ExcelProperty("计时工资 工资标准 元/月 ")
private BigDecimal salaryStandardPerHour;
/**
* 入职确认选择 0 配置方案内选择、1 自定义 2 配置方案+自定义
*/
@ExcelAttribute(name = "入职确认选择", maxLength = 1)
@Length(max = 1, message = "入职确认选择不能超过1个字符")
@ExcelProperty("入职确认选择")
@Schema(description = "入职确认选择 0 配置方案内选择、1 自定义 2 配置方案+自定义")
private String confirmEmpSelect;
/**
* 超时未确认是否触发签署任务(电子签) 0 自动触发 1 不触发
*/
@ExcelAttribute(name = "超时未确认是否触发签署任务(电子签)", maxLength = 1)
@Length(max = 1, message = "超时未确认是否触发签署任务(电子签)不能超过1个字符")
@ExcelProperty("超时未确认是否触发签署任务(电子签)")
@Schema(description = "超时未确认是否触发签署任务(电子签) 0 自动触发 1 不触发")
private String timeoutElecSign;
/**
* 计件工资 工资标准单价/元
*/
......@@ -531,12 +547,16 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
/**
* 工作地点
*/
@Length(max = 200, message = "工作地点 不能超过200 个字符")
@ExcelAttribute(name = "工作地点", maxLength = 200)
@Schema(description = "工作地点")
@ExcelProperty("工作地点")
private String workAddress;
@ExcelAttribute(name = "合同截止日期类型")
@Schema(description = "合同截止日期类型")
@ExcelProperty("合同截止日期类型")
private String contractEndType;
/**
* 入职确认信息id
*/
......
......@@ -71,6 +71,9 @@
<result property="internshipPeriod" column="INTERNSHIP_PERIOD"/>
<result property="internshipPeriodStart" column="INTERNSHIP_PERIOD_START"/>
<result property="internshipPeriodEnd" column="INTERNSHIP_PERIOD_END"/>
<result property="confirmEmpSelect" column="CONFIRM_EMP_SELECT"/>
<result property="timeoutElecSign" column="TIMEOUT_ELEC_SIGN"/>
<result property="contractEndType" column="CONTRACT_END_TYPE"/>
<result property="postType" column="POST_TYPE"/>
<result property="post" column="POST"/>
<result property="contractId" column="contract_id"/>
......@@ -107,6 +110,8 @@
a.situation,
a.contract_duration_year,
a.contract_duration_month,
a.CONFIRM_EMP_SELECT,
a.TIMEOUT_ELEC_SIGN,
a.period_start,
a.period_end,
a.expected_confirm_time,
......
package com.yifu.cloud.plus.v1.yifu.common.dapr.util;
import com.alibaba.fastjson.JSON;
import com.yifu.cloud.plus.v1.ekp.vo.EkpDeptContractInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpIncomePushInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
......@@ -113,4 +114,15 @@ public class EkpDaprUtils {
public R<EkpDivisionInfoVo> getDivisionUsernameList(EkpDivisionInfoVo divisionInfoVo) {
return HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/ekpShenhepeizhi/inner/getDivisionUsernameList",divisionInfoVo, EkpDivisionInfoVo.class, SecurityConstants.FROM_IN);
}
/**
* @Author huyc
* @Description 新增社保明细数据
* @Date 11:48 2025/06/18
* @Param
* @return
**/
public R<EkpDeptContractInfoVo> selectContractInfoByDetptNo(EkpDeptContractInfoVo vo) {
return HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/ekpSocialPush/inner/selectContractInfoByDetptNo", JSON.toJSONString(vo), EkpDeptContractInfoVo.class, SecurityConstants.FROM_IN);
}
}
......@@ -23,6 +23,7 @@ import com.yifu.cloud.plus.v1.csp.service.EmployeeRegistrationService;
import com.yifu.cloud.plus.v1.csp.service.TAttaInfoService;
import com.yifu.cloud.plus.v1.csp.service.TOperationLogService;
import com.yifu.cloud.plus.v1.csp.vo.*;
import com.yifu.cloud.plus.v1.ekp.vo.EkpDeptContractInfoVo;
import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysCspDeptVo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.SysAutoDictItem;
......@@ -92,6 +93,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
@Autowired
private UpmsDaprUtils upmsDaprUtils;
@Autowired
private EkpDaprUtils ekpDaprUtils;
@Autowired
private InsuranceDaprUtil insuranceDaprUtil;
......@@ -723,9 +727,28 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
TEmployeeContractDateVo vo = new TEmployeeContractDateVo();
//合同开始日期、合同截止日期
if (Common.isEmpty(employeeContractPreVo.getContractStart())
&& Common.isEmpty(employeeContractPreVo.getContractEnd())
&& Common.isEmpty(employeeContractPreVo.getContractDuratioYear())
&& Common.isEmpty(employeeContractPreVo.getContractDuratioMonth())
&& Common.isNotNull(employeeContractPreVo.getContractEndType())) {
employeeContractPreVo.setContractStart(employeeContractPreVo.getJoinLeaveDate());
EkpDeptContractInfoVo infoVo = new EkpDeptContractInfoVo();
infoVo.setDeptNo(registration.getDeptNo());
R<EkpDeptContractInfoVo> info = ekpDaprUtils.selectContractInfoByDetptNo(infoVo);
if (Common.isNotNull(info) && Common.isNotNull(info.getData())) {
EkpDeptContractInfoVo returnVo = info.getData();
employeeContractPreVo.setContractEnd(returnVo.getContractEndTime());
employeeContractPreVo.setContractEndType(returnVo.getContractType());
} else {
employeeContractPreVo.setContractEnd(null);
employeeContractPreVo.setContractEndType(null);
}
}
if (Common.isEmpty(employeeContractPreVo.getContractStart())
&& Common.isEmpty(employeeContractPreVo.getContractEnd())
&& Common.isNotNull(employeeContractPreVo.getContractDuratioYear())
&& Common.isNotNull(employeeContractPreVo.getContractDuratioMonth())) {
employeeContractPreVo.setContractStart(employeeContractPreVo.getExpectedCollectionTime());
employeeContractPreVo.setContractStart(employeeContractPreVo.getJoinLeaveDate());
vo.setMonthAfter(Integer.parseInt(employeeContractPreVo.getContractDuratioMonth()));
vo.setYearAfter(Integer.parseInt(employeeContractPreVo.getContractDuratioYear()));
vo.setRegistDate(employeeContractPreVo.getContractStart());
......@@ -735,12 +758,12 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if (Common.isEmpty(employeeContractPreVo.getContractStart())
&& Common.isEmpty(employeeContractPreVo.getContractDuratioYear())
&& Common.isEmpty(employeeContractPreVo.getContractDuratioMonth())) {
employeeContractPreVo.setContractStart(employeeContractPreVo.getExpectedCollectionTime());
employeeContractPreVo.setContractStart(employeeContractPreVo.getJoinLeaveDate());
}
//试用期开始日期、试用期截止日期
if (Common.isEmpty(employeeContractPreVo.getPeriodStart())
&& Common.isNotNull(employeeContractPreVo.getTryPeriodNum())) {
employeeContractPreVo.setPeriodStart(employeeContractPreVo.getExpectedCollectionTime());
employeeContractPreVo.setPeriodStart(employeeContractPreVo.getJoinLeaveDate());
vo.setMonthAfter(Integer.parseInt(employeeContractPreVo.getTryPeriodNum()));
vo.setYearAfter(0);
vo.setRegistDate(employeeContractPreVo.getPeriodStart());
......@@ -750,7 +773,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if (Common.isEmpty(employeeContractPreVo.getDispatchPeriodStart())
&& Common.isNotNull(employeeContractPreVo.getDispatchPeriodYear())
&& Common.isNotNull(employeeContractPreVo.getDispatchPeriodMonth())) {
employeeContractPreVo.setDispatchPeriodStart(employeeContractPreVo.getExpectedCollectionTime());
employeeContractPreVo.setDispatchPeriodStart(employeeContractPreVo.getJoinLeaveDate());
vo.setMonthAfter(Integer.parseInt(employeeContractPreVo.getDispatchPeriodMonth()));
vo.setYearAfter(Integer.parseInt(employeeContractPreVo.getDispatchPeriodYear()));
vo.setRegistDate(employeeContractPreVo.getDispatchPeriodStart());
......@@ -759,7 +782,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
//实习开始日期、实习结束日期
if (Common.isEmpty(employeeContractPreVo.getInternshipPeriodStart())
&& Common.isNotNull(employeeContractPreVo.getInternshipPeriodNum())) {
employeeContractPreVo.setInternshipPeriodStart(employeeContractPreVo.getExpectedCollectionTime());
employeeContractPreVo.setInternshipPeriodStart(employeeContractPreVo.getJoinLeaveDate());
vo.setMonthAfter(Integer.parseInt(employeeContractPreVo.getInternshipPeriodNum()));
vo.setYearAfter(0);
vo.setRegistDate(employeeContractPreVo.getInternshipPeriodStart());
......
package com.yifu.cloud.plus.v1.ekp.vo;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @Author huyc
* @Date 2024/3/1
* @Description 获取项目明细信息
* @Version 1.0
*/
@Data
public class EkpDeptContractInfoVo implements Serializable {
/**
* 合同类型 合同之前、合同之后
**/
private String contractType;
/**
* 合同截至日期
**/
private Date contractEndTime;
/**
* 项目编码
**/
private String deptNo;
}
......@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.ekp.controller;
import com.alibaba.fastjson.JSONObject;
import com.yifu.cloud.plus.v1.ekp.service.EkpSocialInfoService;
import com.yifu.cloud.plus.v1.ekp.vo.EkpDeptContractInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialStatusUpdateVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
......@@ -68,4 +69,29 @@ public class TEkpSocialInfoController {
List<EkpSocialStatusUpdateVo> list= JSONObject.parseArray(jsonStr, EkpSocialStatusUpdateVo.class);
return socialInfoService.updateScoialStatus(list);
}
/**
* @param vo
* @Description: 根据项目编码查询项目信息
* @Author: huyc
* @Date: 2025/6/18
* @return:
**/
@Inner
@PostMapping("/inner/selectContractInfoByDetptNo")
public EkpDeptContractInfoVo selectContractInfoInnerByDetptNo(@RequestBody EkpDeptContractInfoVo vo) {
return socialInfoService.selectContractInfoByDetptNo(vo);
}
/**
* @param vo
* @Description: 根据项目编码查询项目信息
* @Author: huyc
* @Date: 2025/6/18
* @return:
**/
@PostMapping("/selectContractInfoByDetptNo")
public EkpDeptContractInfoVo selectContractInfoByDetptNo(@RequestBody EkpDeptContractInfoVo vo) {
return socialInfoService.selectContractInfoByDetptNo(vo);
}
}
......@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.ekp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpDeptContractInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpDeptInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialSumInfoVo;
import org.apache.ibatis.annotations.Mapper;
......@@ -55,4 +56,6 @@ public interface EkpSocialInfoMapper extends BaseMapper<EkpSocialInfo> {
* @return
*/
List<Map<String,String>> getAccountList();
EkpDeptContractInfoVo selectContractInfoByDetptNo(@Param("deptNo") String deptNo);
}
......@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.ekp.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpDeptContractInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialStatusUpdateVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
......@@ -23,4 +24,6 @@ public interface EkpSocialInfoService extends IService<EkpSocialInfo> {
EkpSocialPushInfoVo pushSocialInfoToEkp(List<EkpPushSocialParam> unPushList);
R updateScoialStatus(List<EkpSocialStatusUpdateVo> list);
EkpDeptContractInfoVo selectContractInfoByDetptNo(EkpDeptContractInfoVo vo);
}
......@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo;
import com.yifu.cloud.plus.v1.ekp.mapper.EkpSocialInfoMapper;
import com.yifu.cloud.plus.v1.ekp.service.EkpSocialInfoService;
import com.yifu.cloud.plus.v1.ekp.vo.EkpDeptInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialStatusUpdateVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialSumInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.*;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.redis.RedisDistributedLock;
import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
......@@ -313,6 +310,14 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
return null;
}
@Override
public EkpDeptContractInfoVo selectContractInfoByDetptNo(EkpDeptContractInfoVo vo) {
if (Common.isNotNull(vo) && Common.isNotNull(vo.getDeptNo())) {
return baseMapper.selectContractInfoByDetptNo(vo.getDeptNo());
}
return null;
}
private void copySocialProperties(EkpPushSocialParam socialParam,EkpSocialInfo socialInfo) {
//订单类型
socialInfo.setFd_3add9dd7833db8(socialParam.getFd_3add9dd7833db8());
......
......@@ -136,4 +136,16 @@
<select id="getAccountList" resultType="Map">
select fd_3b14a2430ac214 as bank_name,fd_3b14a24376d86a as bank_no from ekp_fe8247b4cbb4b27881dd where fd_3b14a24b9adb52='启用' and fd_3b56747b811872='是';
</select>
<!--查询付款账户信息-->
<select id="selectContractInfoByDetptNo" resultType="com.yifu.cloud.plus.v1.ekp.vo.EkpDeptContractInfoVo">
select
a.fd_3b148031607a30 as contractType,
if(a.fd_3b148031607a30 = '合同之后',DATE_FORMAT(b.fd_3ad8da6ba4bd2c, '%Y-%m-%d'),null) as contractEndTime,
a.fd_3a37fe508071fe as deptNo
from ekp_24a8e6a7fc143bb8c48a a
left join ekp_0103c453b2848c3bb31c b on a.fd_3b14803c09db8e = b.fd_id
where a.fd_3a37fe508071fe = #{deptNo}
limit 1
</select>
</mapper>
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