Commit 5331330a authored by huyuchen's avatar huyuchen

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

parents 0f613045 f1d22b17
package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
/**
* 合同待签订任务记录表
*
* @author huych
* @date 2025-06-11 14:15:53
*/
@Data
@TableName("t_employee_contract_pre_history")
@EqualsAndHashCode(callSuper = true)
@Schema(description = "合同待签订任务记录表-快照-给合同查询用")
public class TEmployeeContractPreHistory extends TEmployeeContractPre {
}
......@@ -147,19 +147,6 @@ public class FascController {
return R.ok();
}
private YifuUser getNewYifuUser() {
Set<String> dbAuthsSet = new HashSet<>();
Collection<? extends GrantedAuthority> authorities = AuthorityUtils
.createAuthorityList(dbAuthsSet.toArray(new String[0]));
return new YifuUser("2", 1L, "", "法大大电子签",
"法大大电子签", "0", SecurityConstants.BCRYPT + "123456",
"12345678911", true, true, true,
true,
"1", authorities, "1",
null, null,
null, null);
}
@Operation(summary = "异步通知", description = "异步通知")
@RequestMapping(value = "/api/fascCallback")
public R<String> notifyUrl(HttpServletRequest request, HttpServletResponse response) throws Exception {
......
......@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPre;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPreHistory;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractInfoMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeContractPreHistoryService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeContractPreService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmpProjectStatusVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeAutoRegistRevokeVo;
......@@ -42,6 +44,7 @@ import java.util.List;
public class TEmployeeContractPreController {
private final TEmployeeContractPreService tEmployeeContractPreService;
private final TEmployeeContractPreHistoryService tEmployeeContractPreHistoryService;
private final MenuUtil menuUtil;
......@@ -81,10 +84,10 @@ public class TEmployeeContractPreController {
**/
@Operation(summary = "通过合同ID查询", description = "通过合同ID查询")
@GetMapping("/getByContractId" )
public R<TEmployeeContractPre> getByContractId(@RequestParam("contractId" ) String contractId) {
public R<TEmployeeContractPreHistory> getByContractId(@RequestParam("contractId" ) String contractId) {
// 2025-10-20 10:29:41 倩倩说不过滤状态,只要是自动化生成的合同,都要看电子签详情
TEmployeeContractPre pre = tEmployeeContractPreService.getOne(Wrappers.<TEmployeeContractPre>lambdaQuery()
.eq(TEmployeeContractPre::getContractId, contractId).last(CommonConstants.LAST_ONE_SQL));
TEmployeeContractPreHistory pre = tEmployeeContractPreHistoryService.getOne(Wrappers.<TEmployeeContractPreHistory>lambdaQuery()
.eq(TEmployeeContractPreHistory::getContractId, contractId).last(CommonConstants.LAST_ONE_SQL));
return R.ok(pre);
}
......
package com.yifu.cloud.plus.v1.yifu.archives.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPreHistory;
import org.apache.ibatis.annotations.Mapper;
/**
* 合同待签订任务记录表
*
* @author huych
* @date 2025-06-11 14:15:53
*/
@Mapper
public interface TEmployeeContractPreHistoryMapper extends BaseMapper<TEmployeeContractPreHistory> {
}
package com.yifu.cloud.plus.v1.yifu.archives.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPreHistory;
/**
* 合同待签订任务记录表
*
* @author huych
* @date 2025-06-11 14:15:53
*/
public interface TEmployeeContractPreHistoryService extends IService<TEmployeeContractPreHistory> {
}
package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPreHistory;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractPreHistoryMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeContractPreHistoryService;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service;
/**
* 合同待签订任务记录表
*
* @author huych
* @date 2025-06-11 14:15:53
*/
@Log4j2
@Service
@RequiredArgsConstructor
public class TEmployeeContractPreHistoryServiceImpl extends ServiceImpl<TEmployeeContractPreHistoryMapper, TEmployeeContractPreHistory> implements TEmployeeContractPreHistoryService {
}
package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
......@@ -12,6 +13,7 @@ import com.fasc.open.api.exception.ApiException;
import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser;
import com.yifu.cloud.plus.v1.yifu.archives.config.WxConfig;
import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractPreHistoryMapper;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractPreMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.*;
import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
......@@ -52,6 +54,7 @@ import java.util.stream.Stream;
@RequiredArgsConstructor
public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContractPreMapper, TEmployeeContractPre> implements TEmployeeContractPreService {
private final TEmployeeContractPreHistoryMapper tEmployeeContractPreHistoryMapper;
private final TSettleDomainService tSettleDomainService;
private final TEmployeeContractAuditService tEmployeeContractAuditService;
......@@ -427,6 +430,13 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
// 合同创建成功,继续调用FascService的submitContract方法
R<String> result = null;
TEmployeeContractPre contract = baseMapper.selectById(contractPre.getId());
// 复制一份快照
if (contract != null && Common.isNotNull(contract.getId())) {
TEmployeeContractPreHistory contractHistory = new TEmployeeContractPreHistory();
BeanUtil.copyProperties(contract, contractHistory);
contractHistory.setId(null);
tEmployeeContractPreHistoryMapper.insert(contractHistory);
}
try {
result = fascService.submitContract(contractPre.getId());
} catch (Exception e) {
......
......@@ -124,7 +124,7 @@ public class DoFascTask {
!CommonConstants.ONE_STRING.equals(pre.getProcessStatus()) &&
Common.isNotNull(pre.getContractId())) {
// 加日志
this.saveAuditLogFail(pre, "撤销签署", terminationNote);
this.saveAuditLogFail(pre, "撤销签署成功", terminationNote);
}
pre.setProcessStatus(CommonConstants.TEN_STRING);
pre.setSignFlag(CommonConstants.ZERO_STRING);
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeContractPreHistoryMapper">
<resultMap id="tEmployeeContractPreMap" type="com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPreHistory">
<id property="id" column="id"/>
<result property="deptName" column="dept_name"/>
<result property="deptNo" column="dept_no"/>
<result property="deptId" column="dept_id"/>
<result property="employeeName" column="employee_name"/>
<result property="empIdcard" column="emp_idcard"/>
<result property="empPhone" column="emp_phone"/>
<result property="position" column="position"/>
<result property="joinLeaveDate" column="join_leave_date"/>
<result property="contractType" column="contract_type"/>
<result property="processStatus" column="process_status"/>
<result property="signatory" column="signatory"/>
<result property="customerUsername" column="customer_username"/>
<result property="customerUserLoginname" column="customer_user_loginname"/>
<result property="signType" column="sign_type"/>
<result property="signFlag" column="sign_flag"/>
<result property="errorInfo" column="error_info"/>
<result property="errorTime" column="error_time"/>
<result property="fadadaTemplate" column="fadada_template"/>
<result property="fadadaTemplateId" column="fadada_template_id"/>
<result property="dataSource" column="data_source"/>
<result property="expectedCollectionTime" column="expected_collection_time"/>
<result property="contractStart" column="contract_start"/>
<result property="contractEnd" column="contract_end"/>
<result property="situation" column="situation"/>
<result property="contractDurationYear" column="contract_duration_year"/>
<result property="contractDurationMonth" column="contract_duration_month"/>
<result property="contractTerm" column="CONTRACT_TERM"/>
<result property="tryPeriodStart" column="try_period_start"/>
<result property="tryPeriodEnd" column="try_period_end"/>
<result property="task" column="TASK"/>
<result property="taskType" column="TASK_TYPE"/>
<result property="taskEndStandard" column="TASK_END_STANDARD"/>
<result property="expectedConfirmTime" column="expected_confirm_time"/>
<result property="configName" column="config_name"/>
<result property="updateFlag" column="update_flag"/>
<result property="tryPeriodType" column="TRY_PERIOD_TYPE"/>
<result property="tryPeriod" column="TRY_PERIOD"/>
<result property="salaryType" column="SALARY_TYPE"/>
<result property="salaryStandardPerHour" column="SALARY_STANDARD_PER_HOUR"/>
<result property="salaryStandardPerPiece" column="SALARY_STANDARD_PER_PIECE"/>
<result property="configId" column="config_id"/>
<result property="workingDept" column="WORKING_DEPT"/>
<result property="workingCompany" column="WORKING_COMPANY"/>
<result property="workingHours" column="working_hours"/>
<result property="workingReward" column="working_reward"/>
<result property="riskBuyDesc" column="RISK_BUY_DESC"/>
<result property="otherWage" column="OTHER_WAGE"/>
<result property="laborCost" column="LABOR_COST"/>
<result property="defaultAmount" column="DEFAULT_AMOUNT"/>
<result property="settlementCycle" column="SETTLEMENT_CYCLE"/>
<result property="paymentTime" column="PAYMENT_TIME"/>
<result property="paymentType" column="PAYMENT_TYPE"/>
<result property="dispatchPeriodYear" column="DISPATCH_PERIOD_YEAR"/>
<result property="dispatchPeriodMonth" column="DISPATCH_PERIOD_MONTH"/>
<result property="dispatchPeriodStart" column="DISPATCH_PERIOD_START"/>
<result property="registerId" column="register_id"/>
<result property="contractFlag" column="contract_flag"/>
<result property="revokeReason" column="revoke_reason"/>
<result property="dispatchPeriodEnd" column="DISPATCH_PERIOD_END"/>
<result property="workType" column="WORK_TYPE"/>
<result property="workDayCount" column="WORK_DAY_COUNT"/>
<result property="workDay" column="WORK_DAY"/>
<result property="workHours" column="WORK_HOURS"/>
<result property="otherWorkDay" column="OTHER_WORK_DAY"/>
<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"/>
<result property="workAddress" column="WORK_ADDRESS"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
<result property="createName" column="create_name"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="contractSubName" column="CONTRACT_SUB_NAME"/>
<result property="requestId" column="request_id"/>
<result property="requestMsg" column="request_msg"/>
<result property="overFlag" column="over_flag"/>
<result property="changeTypeReason" column="change_type_reason"/>
<result property="changeTypeUser" column="change_type_user"/>
<result property="changeTypeTime" column="change_type_time"/>
<result property="archivesIsCreate" column="archives_is_create"/>
</resultMap>
</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