Commit 9c7ccdaa authored by huyuchen's avatar huyuchen

项目档案问题优化

parent 5aa2ca44
...@@ -29,7 +29,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -29,7 +29,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; 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.check.vo.CheckBankNoVo;
import com.yifu.cloud.plus.v1.yifu.archives.constants.ArchivesConstants; import com.yifu.cloud.plus.v1.yifu.archives.constants.ArchivesConstants;
import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeConstants; import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeConstants;
import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeContractConstants; import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeContractConstants;
...@@ -44,7 +43,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ResultConstants; ...@@ -44,7 +43,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ResultConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.*; import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
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.DaprCheckProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties; import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties;
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;
...@@ -893,7 +891,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr ...@@ -893,7 +891,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
insert.setOldContractId(contractInfo.getId()); insert.setOldContractId(contractInfo.getId());
insert.setContractName(contractInfo.getContractName()); insert.setContractName(contractInfo.getContractName());
insert.setContractSubName(contractInfo.getContractSubName()); insert.setContractSubName(contractInfo.getContractSubName());
insert.setReason(contractInfo.getReason()); if (!EmployeeConstants.SITUATION_SEVEN.equals(insert.getSituation())) {
insert.setReason(contractInfo.getReason());
}
insert.setSubjectUnit(contractInfo.getSubjectUnit()); insert.setSubjectUnit(contractInfo.getSubjectUnit());
insert.setContractParty(contractInfo.getContractParty()); insert.setContractParty(contractInfo.getContractParty());
insert.setContractType(contractInfo.getContractType()); insert.setContractType(contractInfo.getContractType());
......
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