diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectCombineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectCombineServiceImpl.java index 5b0155b2..676e7230 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectCombineServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectCombineServiceImpl.java @@ -61,6 +61,7 @@ public class BmProjectCombineServiceImpl implements IBmProjectCombineService List baiList = projectMapper.selectCLAIList(oldProject); if (CollectionUtils.isNotEmpty(baiList)) { for (BmProjectCombine bai : baiList){ + bai.setNewProId(oldProject.getNewProId()); projectMapper.updateCLAI(bai); bai.setCreateBy(createBy); bai.setTableName("clz_lease_apply_info"); @@ -75,6 +76,7 @@ public class BmProjectCombineServiceImpl implements IBmProjectCombineService List baiList = projectMapper.selectLAIList(oldProject); if (CollectionUtils.isNotEmpty(baiList)) { for (BmProjectCombine bai : baiList){ + bai.setNewProId(oldProject.getNewProId()); projectMapper.updateLAI(bai); bai.setCreateBy(createBy); bai.setTableName("lease_apply_info"); @@ -89,6 +91,7 @@ public class BmProjectCombineServiceImpl implements IBmProjectCombineService List baiList = projectMapper.selectCBAIList(oldProject); if (CollectionUtils.isNotEmpty(baiList)) { for (BmProjectCombine bai : baiList){ + bai.setNewProId(oldProject.getNewProId()); projectMapper.updateCBAI(bai); bai.setCreateBy(createBy); bai.setTableName("clz_bm_agreement_info"); @@ -103,6 +106,7 @@ public class BmProjectCombineServiceImpl implements IBmProjectCombineService List baiList = projectMapper.selectBAIList(oldProject); if (CollectionUtils.isNotEmpty(baiList)) { for (BmProjectCombine bai : baiList){ + bai.setNewProId(oldProject.getNewProId()); projectMapper.updateBAI(bai); bai.setCreateBy(createBy); bai.setTableName("bm_agreement_info"); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectCombineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectCombineMapper.xml index c2ee3da9..68122a81 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectCombineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectCombineMapper.xml @@ -38,8 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into sys_combine_project - tabel_name, - tabel_id, + table_name, + table_id, pre_pro_id, new_pro_id, create_by,