Commit 6f4e5f03 authored by chenyuxi's avatar chenyuxi

feat: 瓜子档案里加合同工作地点描述

parent 4e2f6000
......@@ -418,6 +418,15 @@ public class TGzEmpInfo extends BaseEntity {
@ExcelProperty("合同工作地")
@Schema(description = "合同工作地")
private String workLocation;
/**
* 合同工作地描述
*/
@ExcelAttribute(name = "合同工作地描述", maxLength = 200)
@Length(max = 200, message = "合同工作地描述不能超过200个字符")
@ExcelProperty("合同工作地描述")
@Schema(description = "合同工作地描述")
private String workLocationDescr;
/**
* 状态
*/
......
......@@ -230,6 +230,8 @@ public class TGzEmpInfoExportMain implements Serializable {
private String neeProviderId;
@ExcelProperty("合同工作地")
private String workLocation;
@ExcelProperty("合同工作地描述")
private String workLocationDescr;
@ExcelAttribute(name = "合同状态", isDataId = true, readConverterExp = "A=有效")
@ExcelProperty("合同状态")
private String contractState;
......
......@@ -103,4 +103,5 @@ public class TGzEmpInfoSearchVo extends TGzEmpInfo {
@TableField(exist = false)
private TPreEmpDeclaration tPreEmpDeclaration;
}
......@@ -35,6 +35,6 @@ public interface TGzContractService {
* @param offerId offerId
* @param workLocation 工作地点
*/
void saveContractInfoToGzEmpInfo(TEmployeeContractInfo contractInfo, Integer offerId, String workLocation);
void saveContractInfoToGzEmpInfo(TEmployeeContractInfo contractInfo, Integer offerId, String workLocation, String workLocationDescr);
}
......@@ -2284,7 +2284,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
// updStatus == 8:合同审核通过 生成瓜子档案里的合同信息
if(CommonConstants.EIGHT_STRING.equals(updStatus)){
tGzContractService.saveContractInfoToGzEmpInfo(contractInfo, gzOfferInfo.getId(), gzOfferInfo.getWorkLocation());
tGzContractService.saveContractInfoToGzEmpInfo(contractInfo, gzOfferInfo.getId(), gzOfferInfo.getWorkLocation(),gzOfferInfo.getWorkLocationDescr());
}
// 瓜子状态变更增加操作日志
......
......@@ -2634,7 +2634,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
gzOfferInfoMapper.updateById(gzOfferInfo);
// 合同审核通过 生成瓜子档案里的合同信息
tGzContractService.saveContractInfoToGzEmpInfo(c, gzOfferInfo.getId(), gzOfferInfo.getWorkLocation());
tGzContractService.saveContractInfoToGzEmpInfo(c, gzOfferInfo.getId(), gzOfferInfo.getWorkLocation(),gzOfferInfo.getWorkLocationDescr());
// 瓜子状态变更增加操作日志
......
......@@ -52,7 +52,7 @@ public class TGzContractServiceImpl implements TGzContractService {
* @param workLocation 工作地点
*/
@Override
public void saveContractInfoToGzEmpInfo(TEmployeeContractInfo contractInfo, Integer offerId, String workLocation) {
public void saveContractInfoToGzEmpInfo(TEmployeeContractInfo contractInfo, Integer offerId, String workLocation, String workLocationDescr) {
// 获取档案信息
TGzEmpInfo gzEmpInfo = tGzEmpInfoMapper.getInfoByOfferId(offerId);
if (Common.isNotNull(gzEmpInfo)) {
......@@ -99,6 +99,7 @@ public class TGzContractServiceImpl implements TGzContractService {
gzEmpInfo.setNeeProviderId(CommonConstants.GZ_NEE_PROVIDER_ID);
gzEmpInfo.setWorkLocation(workLocation);
gzEmpInfo.setWorkLocationDescr(workLocationDescr);
gzEmpInfo.setContractState("A");
// 存合同信息
......
......@@ -253,6 +253,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
}
}
gzEmpInfoVo.setAttaList(attaInfos);
}
TPreEmpDeclaration declaration = tPreEmpDeclarationService.getTPreEmpDeclarationList();
......
......@@ -290,7 +290,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
// 2、检查 该项目该人员是否有在途或审核通过或已归档的状态为“可用”的合同,
// 若有则根据当前状态更新Offer状态,合同未审核通过:存【13:待签署】;合同审核通过:存【8:合同审核通过】;合同已归档:存【99:已归档】,
// 存合同信息;
String changeStatus = this.checkSaveContract(findInfo.getNationalId(),findInfo.getId(), findInfo.getWorkLocation());
String changeStatus = this.checkSaveContract(findInfo.getNationalId(),findInfo.getId(), findInfo.getWorkLocation(), findInfo.getWorkLocationDescr());
tGzOfferInfo.setOfferStatus(changeStatus);
}
......@@ -318,7 +318,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
* @param workLocation 工作地点
* @return String 后续offer要更新的状态
*/
private String checkSaveContract(String nationalId,Integer offerId, String workLocation){
private String checkSaveContract(String nationalId,Integer offerId, String workLocation, String workLocationDescr){
// 默认是档案审核通过
String changeStatus = "97";
TEmployeeContractInfo contractInfo = employeeContractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda()
......@@ -330,14 +330,14 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
if(CommonConstants.ZERO_STRING.equals(contractInfo.getIsFile())
&& CommonConstants.ZERO_STRING.equals(contractInfo.getInUse())){
// 生成瓜子档案里的合同信息
tGzContractService.saveContractInfoToGzEmpInfo(contractInfo, offerId, workLocation);
tGzContractService.saveContractInfoToGzEmpInfo(contractInfo, offerId, workLocation, workLocationDescr);
return "99";
}
// 合同审核通过
if(CommonConstants.TWO_INTEGER.equals(contractInfo.getAuditStatus())
&& CommonConstants.ZERO_STRING.equals(contractInfo.getInUse())){
// 生成瓜子档案里的合同信息
tGzContractService.saveContractInfoToGzEmpInfo(contractInfo, offerId, workLocation);
tGzContractService.saveContractInfoToGzEmpInfo(contractInfo, offerId, workLocation, workLocationDescr);
return CommonConstants.EIGHT_STRING;
}
// 合同已提交待审核
......
......@@ -76,6 +76,7 @@
<result property="prcExpDt" column="prc_exp_dt"/>
<result property="neeProviderId" column="nee_provider_id"/>
<result property="workLocation" column="work_location"/>
<result property="workLocationDescr" column="work_location_descr"/>
<result property="contractState" column="contract_state"/>
<result property="hukouType" column="hukou_type"/>
<result property="hukouProvince" column="hukou_province"/>
......@@ -155,6 +156,7 @@
a.prc_exp_dt,
a.nee_provider_id,
a.work_location,
a.work_location_descr,
a.contract_state,
a.hukou_type,
a.hukou_province,
......@@ -477,6 +479,7 @@
date_format(a.prc_exp_dt, '%Y-%m-%d') prc_exp_dt,
a.nee_provider_id,
a.work_location,
a.work_location_descr,
a.contract_state,
a.hukou_type,
a.hukou_province,
......
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