Commit 6c622785 authored by 李灿灿's avatar 李灿灿

Merge branch 'feature-licancan' into 'develop'

Feature licancan

See merge request fangxinjiang/yifu!199
parents 9d046c44 33a5fdec
...@@ -11,6 +11,10 @@ public class InsurancesConstants { ...@@ -11,6 +11,10 @@ public class InsurancesConstants {
* 新增 * 新增
*/ */
public static final String ADD = "“新增”提交申请"; public static final String ADD = "“新增”提交申请";
/**
* 替换导出新增
*/
public static final String ADD_ = "新增";
/** /**
* 离职 * 离职
*/ */
......
...@@ -895,7 +895,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -895,7 +895,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
List<InsuranceExportListVO> list = new ArrayList<>(); List<InsuranceExportListVO> list = new ArrayList<>();
if(CollectionUtils.isNotEmpty(listVOS)){ if(CollectionUtils.isNotEmpty(listVOS)){
for (InsuranceExportListVO listVO : listVOS) { for (InsuranceExportListVO listVO : listVOS) {
listVO.setRemark(InsurancesConstants.ADD); listVO.setRemark(InsurancesConstants.ADD_);
TInsuranceReplace one = tInsuranceReplaceService.getOne(Wrappers.<TInsuranceReplace>query().lambda() TInsuranceReplace one = tInsuranceReplaceService.getOne(Wrappers.<TInsuranceReplace>query().lambda()
.eq(TInsuranceReplace::getToInsuranceDetailId, listVO.getId()) .eq(TInsuranceReplace::getToInsuranceDetailId, listVO.getId())
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
......
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