bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bonus:eb127b3daff7de7f9c7ce2c7daf1bab00a37b6d1
Branches Tags
bonus:master
bonus:branch_basic
..
compare: bonus:0644ace5255332978030d6d0e64c989e561d6c8f
Branches Tags
bonus:master
bonus:branch_basic

No commits in common. "eb127b3daff7de7f9c7ce2c7daf1bab00a37b6d1" and "0644ace5255332978030d6d0e64c989e561d6c8f" have entirely different histories.
eb127b3daf ... 0644ace525

2 changed files with 2 additions and 6 deletions
Show Stats Expand all files Collapse all files

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmProjectCombineServiceImpl.java
View File

@ -61,7 +61,6 @@ public class BmProjectCombineServiceImpl implements IBmProjectCombineService
List<BmProjectCombine> baiList = projectMapper.selectCLAIList(oldProject); List<BmProjectCombine> baiList = projectMapper.selectCLAIList(oldProject);
if (CollectionUtils.isNotEmpty(baiList)) { if (CollectionUtils.isNotEmpty(baiList)) {
for (BmProjectCombine bai : baiList){ for (BmProjectCombine bai : baiList){
bai.setNewProId(oldProject.getNewProId());
projectMapper.updateCLAI(bai); projectMapper.updateCLAI(bai);
bai.setCreateBy(createBy); bai.setCreateBy(createBy);
bai.setTableName("clz_lease_apply_info"); bai.setTableName("clz_lease_apply_info");
@ -76,7 +75,6 @@ public class BmProjectCombineServiceImpl implements IBmProjectCombineService
List<BmProjectCombine> baiList = projectMapper.selectLAIList(oldProject); List<BmProjectCombine> baiList = projectMapper.selectLAIList(oldProject);
if (CollectionUtils.isNotEmpty(baiList)) { if (CollectionUtils.isNotEmpty(baiList)) {
for (BmProjectCombine bai : baiList){ for (BmProjectCombine bai : baiList){
bai.setNewProId(oldProject.getNewProId());
projectMapper.updateLAI(bai); projectMapper.updateLAI(bai);
bai.setCreateBy(createBy); bai.setCreateBy(createBy);
bai.setTableName("lease_apply_info"); bai.setTableName("lease_apply_info");
@ -91,7 +89,6 @@ public class BmProjectCombineServiceImpl implements IBmProjectCombineService
List<BmProjectCombine> baiList = projectMapper.selectCBAIList(oldProject); List<BmProjectCombine> baiList = projectMapper.selectCBAIList(oldProject);
if (CollectionUtils.isNotEmpty(baiList)) { if (CollectionUtils.isNotEmpty(baiList)) {
for (BmProjectCombine bai : baiList){ for (BmProjectCombine bai : baiList){
bai.setNewProId(oldProject.getNewProId());
projectMapper.updateCBAI(bai); projectMapper.updateCBAI(bai);
bai.setCreateBy(createBy); bai.setCreateBy(createBy);
bai.setTableName("clz_bm_agreement_info"); bai.setTableName("clz_bm_agreement_info");
@ -106,7 +103,6 @@ public class BmProjectCombineServiceImpl implements IBmProjectCombineService
List<BmProjectCombine> baiList = projectMapper.selectBAIList(oldProject); List<BmProjectCombine> baiList = projectMapper.selectBAIList(oldProject);
if (CollectionUtils.isNotEmpty(baiList)) { if (CollectionUtils.isNotEmpty(baiList)) {
for (BmProjectCombine bai : baiList){ for (BmProjectCombine bai : baiList){
bai.setNewProId(oldProject.getNewProId());
projectMapper.updateBAI(bai); projectMapper.updateBAI(bai);
bai.setCreateBy(createBy); bai.setCreateBy(createBy);
bai.setTableName("bm_agreement_info"); bai.setTableName("bm_agreement_info");

4
bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectCombineMapper.xml
View File

@ -38,8 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertCombine"> <insert id="insertCombine">
insert into sys_combine_project insert into sys_combine_project
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="tableName != null">table_name,</if> <if test="tableName != null">tabel_name,</if>
<if test="tableId != null and tableId != ''">table_id,</if> <if test="tableId != null and tableId != ''">tabel_id,</if>
<if test="oldProId != null">pre_pro_id,</if> <if test="oldProId != null">pre_pro_id,</if>
<if test="newProId != null">new_pro_id,</if> <if test="newProId != null">new_pro_id,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>