|
@@ -479,13 +479,16 @@ public class GovProjectCollectionManage { |
|
|
if(Objects.nonNull(cimplement)){ |
|
|
if(Objects.nonNull(cimplement)){ |
|
|
cimplement.setBaseProjId(baseProjId); |
|
|
cimplement.setBaseProjId(baseProjId); |
|
|
cimplement.setBaseProjName(baseProjName); |
|
|
cimplement.setBaseProjName(baseProjName); |
|
|
cimplement.setBaseBidCode(baseProjId + "-1"); |
|
|
|
|
|
|
|
|
cimplement.setBaseBidCode(baseProjId); |
|
|
|
|
|
cimplement.setBaseBidName(baseProjName); |
|
|
GovBizProjectCimplement oldCimplement = cimplementService.getOne(Wrappers.lambdaQuery(GovBizProjectCimplement.class) |
|
|
GovBizProjectCimplement oldCimplement = cimplementService.getOne(Wrappers.lambdaQuery(GovBizProjectCimplement.class) |
|
|
.eq(GovBizProjectCimplement::getBaseProjId, baseProjId) |
|
|
.eq(GovBizProjectCimplement::getBaseProjId, baseProjId) |
|
|
.last(BizConst.LIMIT_1)); |
|
|
.last(BizConst.LIMIT_1)); |
|
|
|
|
|
|
|
|
GovBizProjectCimplement saveCimplement = BeanUtil.copyProperties(cimplement,GovBizProjectCimplement.class); |
|
|
GovBizProjectCimplement saveCimplement = BeanUtil.copyProperties(cimplement,GovBizProjectCimplement.class); |
|
|
saveCimplement.setBaseProjId(baseProjId); |
|
|
saveCimplement.setBaseProjId(baseProjId); |
|
|
|
|
|
saveCimplement.setBaseBidCode(baseProjId); |
|
|
|
|
|
saveCimplement.setBaseBidName(baseProjName); |
|
|
if(Objects.nonNull(oldCimplement)){ |
|
|
if(Objects.nonNull(oldCimplement)){ |
|
|
saveCimplement.setId(oldCimplement.getId()); |
|
|
saveCimplement.setId(oldCimplement.getId()); |
|
|
}else{ |
|
|
}else{ |
|
@@ -505,14 +508,16 @@ public class GovProjectCollectionManage { |
|
|
if(Objects.nonNull(mimplement)){ |
|
|
if(Objects.nonNull(mimplement)){ |
|
|
mimplement.setBaseProjId(baseProjId); |
|
|
mimplement.setBaseProjId(baseProjId); |
|
|
mimplement.setBaseProjName(baseProjName); |
|
|
mimplement.setBaseProjName(baseProjName); |
|
|
mimplement.setBaseBidCode(baseProjId + "-2"); |
|
|
|
|
|
|
|
|
mimplement.setBaseBidCode(baseProjId); |
|
|
|
|
|
mimplement.setBaseBidName(baseProjName); |
|
|
GovBizProjectMimplement oldMimplement = mimplementService.getOne(Wrappers.lambdaQuery(GovBizProjectMimplement.class) |
|
|
GovBizProjectMimplement oldMimplement = mimplementService.getOne(Wrappers.lambdaQuery(GovBizProjectMimplement.class) |
|
|
.eq(GovBizProjectMimplement::getBaseProjId, baseProjId) |
|
|
.eq(GovBizProjectMimplement::getBaseProjId, baseProjId) |
|
|
.last(BizConst.LIMIT_1)); |
|
|
.last(BizConst.LIMIT_1)); |
|
|
|
|
|
|
|
|
GovBizProjectMimplement saveMimplement = BeanUtil.copyProperties(mimplement,GovBizProjectMimplement.class); |
|
|
GovBizProjectMimplement saveMimplement = BeanUtil.copyProperties(mimplement,GovBizProjectMimplement.class); |
|
|
saveMimplement.setBaseProjId(baseProjId); |
|
|
saveMimplement.setBaseProjId(baseProjId); |
|
|
|
|
|
|
|
|
|
|
|
saveMimplement.setBaseBidCode(baseProjId); |
|
|
|
|
|
saveMimplement.setBaseBidName(baseProjName); |
|
|
if(Objects.nonNull(oldMimplement)){ |
|
|
if(Objects.nonNull(oldMimplement)){ |
|
|
saveMimplement.setId(oldMimplement.getId()); |
|
|
saveMimplement.setId(oldMimplement.getId()); |
|
|
}else{ |
|
|
}else{ |
|
|