Commit eb7344f0 authored by huyuchen's avatar huyuchen

huych-合同自动化代码提交

parent 504be995
...@@ -124,7 +124,7 @@ public class TEmployeeContractPre extends BaseEntity { ...@@ -124,7 +124,7 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema(description = "签订类型") @Schema(description = "签订类型")
private String situation; private String situation;
@Schema(description = "合同年限, 0 固定期限 1 无固定期限 3.以完成一定工作任务为期限") @Schema(description = "签订期限, 0 固定期限 1 无固定期限 3.以完成一定工作任务为期限")
private String contractTerm; private String contractTerm;
@Schema(description = "合同年限-年") @Schema(description = "合同年限-年")
......
...@@ -216,10 +216,10 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable { ...@@ -216,10 +216,10 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
@ExcelProperty("签订类型") @ExcelProperty("签订类型")
private String situation; private String situation;
/** /**
* 合同年 * 签订期
*/ */
@ExcelAttribute(name = "合同年限") @ExcelAttribute(name = "签订期限")
@Schema(description = "合同年限") @Schema(description = "签订期限")
private String contractTerm; private String contractTerm;
@ExcelAttribute(name = "合同年限-年") @ExcelAttribute(name = "合同年限-年")
......
...@@ -658,6 +658,18 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -658,6 +658,18 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
//1.9.12合同自动化校验逻辑 //1.9.12合同自动化校验逻辑
if (employeeRegistrationPre.getServerItem().contains("合同") && null != employeeRegistrationPre.getEmployeeContractPre()) { if (employeeRegistrationPre.getServerItem().contains("合同") && null != employeeRegistrationPre.getEmployeeContractPre()) {
TEmployeeContractPre employeeContractPreVo = employeeRegistrationPre.getEmployeeContractPre(); TEmployeeContractPre employeeContractPreVo = employeeRegistrationPre.getEmployeeContractPre();
if (Common.isNotNull(employeeContractPreVo.getId())) {
TEmployeeContractPre contractStatus = contractPreMapper.selectById(employeeContractPreVo.getId());
//待确认/待发起/发起失败/线下签待审核/线下签审核不通过/线下签待归档 不能编辑
if (Common.isNotNull(contractStatus) && (CommonConstants.NINE_STRING.equals(contractStatus.getProcessStatus())
|| CommonConstants.TWO_STRING.equals(contractStatus.getProcessStatus())
|| CommonConstants.SIX_STRING.equals(contractStatus.getProcessStatus())
|| CommonConstants.FOUR_STRING.equals(contractStatus.getProcessStatus())
|| CommonConstants.EIGHT_STRING.equals(contractStatus.getProcessStatus()))
) {
return R.failed("流程中的合同待签订数据不可修改!");
}
}
//根据身份证号码和项目编号查询合同 //根据身份证号码和项目编号查询合同
boolean flag = contractInfoMapper.selectCount(Wrappers.<TEmployeeContractInfo>query().lambda() boolean flag = contractInfoMapper.selectCount(Wrappers.<TEmployeeContractInfo>query().lambda()
.eq(TEmployeeContractInfo::getEmpIdcard, employeeRegistrationPre.getEmpIdcard()) .eq(TEmployeeContractInfo::getEmpIdcard, employeeRegistrationPre.getEmpIdcard())
......
...@@ -1014,6 +1014,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -1014,6 +1014,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
TAttaInfo attaInfoPre = new TAttaInfo(); TAttaInfo attaInfoPre = new TAttaInfo();
BeanUtils.copyProperties(attaInfo, attaInfoPre); BeanUtils.copyProperties(attaInfo, attaInfoPre);
attaInfoPre.setDomainId(contractPre.getId()); attaInfoPre.setDomainId(contractPre.getId());
attaInfoPre.setId(null);
tAttaInfoService.save(attaInfoPre); tAttaInfoService.save(attaInfoPre);
} }
} }
......
...@@ -63,8 +63,8 @@ ...@@ -63,8 +63,8 @@
<result property="dispatchPeriodYear" column="DISPATCH_PERIOD_YEAR"/> <result property="dispatchPeriodYear" column="DISPATCH_PERIOD_YEAR"/>
<result property="dispatchPeriodMonth" column="DISPATCH_PERIOD_MONTH"/> <result property="dispatchPeriodMonth" column="DISPATCH_PERIOD_MONTH"/>
<result property="dispatchPeriodStart" column="DISPATCH_PERIOD_START"/> <result property="dispatchPeriodStart" column="DISPATCH_PERIOD_START"/>
<result property="registerId" column="contract_flag"/> <result property="registerId" column="register_id"/>
<result property="contractFlag" column="register_id"/> <result property="contractFlag" column="contract_flag"/>
<result property="revokeReason" column="revoke_reason"/> <result property="revokeReason" column="revoke_reason"/>
<result property="dispatchPeriodEnd" column="DISPATCH_PERIOD_END"/> <result property="dispatchPeriodEnd" column="DISPATCH_PERIOD_END"/>
<result property="workType" column="WORK_TYPE"/> <result property="workType" column="WORK_TYPE"/>
......
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