lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

工程量清单

Browse Source
This commit is contained in:
罗成
2025-08-21 17:24:53 +08:00
parent 8352da03ee
commit 31d7055e3e
2 changed files with 85 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/BusBillofquantitiesVersionsServiceImpl.java
View File

@ -9,7 +9,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.bidding.domain.BusBiddingLimitList;
import org.dromara.bidding.domain.BusBiddingLimitVersions;
import org.dromara.bidding.service.IBusBiddingLimitListService;
import org.dromara.bidding.service.IBusBiddingLimitVersionsService;
import org.dromara.cailiaoshebei.domain.BusTotalsupplyplan;
import org.dromara.cailiaoshebei.domain.BusTotalsupplyplanAudit;
import org.dromara.cailiaoshebei.service.IBusTotalsupplyplanAuditService;
@ -39,8 +41,11 @@ import org.dromara.design.service.IBusBillofquantitiesService;
import org.dromara.design.service.IBusBillofquantitiesVersionsService;
import org.dromara.system.domain.vo.SysOssUploadVo;
import org.dromara.system.service.ISysOssService;
import org.dromara.tender.domain.BusBLimitListVersions;
import org.dromara.tender.domain.BusBillofquantitiesLimitList;
import org.dromara.tender.service.IBusBLimitListVersionsService;
import org.dromara.tender.service.IBusBillofquantitiesLimitListService;
import org.dromara.tender.service.impl.BusBLimitListVersionsServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
@ -70,6 +75,8 @@ public class BusBillofquantitiesVersionsServiceImpl extends ServiceImpl<BusBillo
private final IBusTotalsupplyplanAuditService busTotalsupplyplanAuditService;
private final IBusBillofquantitiesLimitListService busBillofquantitiesLimitListService;
private final IBusBiddingLimitListService busBiddingLimitListService;
private final IBusBLimitListVersionsService busBLimitListVersionsService;
private final IBusBiddingLimitVersionsService busBiddingLimitVersions;
@Autowired
private ISysOssService ossService;
@ -493,6 +500,14 @@ public class BusBillofquantitiesVersionsServiceImpl extends ServiceImpl<BusBillo
if (update && BusinessStatusEnum.FINISH.getStatus().equals(processEvent.getStatus())) {
//根据版本号查询数据
BusBillofquantitiesVersions versions = this.getOne(eq);
//1、新增版本号
BusBiddingLimitVersions busBLimitListVersions = BeanUtil.copyProperties(versions, BusBiddingLimitVersions.class);
busBLimitListVersions.setStatus(null);
busBLimitListVersions.setWorkOrderType("0");
boolean save = busBiddingLimitVersions.save(busBLimitListVersions);
if (!save) {
log.info("新增失败");
}
//1、根据查询数据
LambdaQueryWrapper<BusBillofquantities> lqw = new LambdaQueryWrapper<>();
lqw.eq(BusBillofquantities::getVersions, id);
@ -533,6 +548,14 @@ public class BusBillofquantitiesVersionsServiceImpl extends ServiceImpl<BusBillo
if (update && BusinessStatusEnum.FINISH.getStatus().equals(processEvent.getStatus())) {
//根据版本号查询数据
BusBillofquantitiesVersions versions = this.getOne(eq);
//1、新增版本号
BusBLimitListVersions busBLimitListVersions = BeanUtil.copyProperties(versions, BusBLimitListVersions.class);
busBLimitListVersions.setStatus(null);
busBLimitListVersions.setWorkOrderType("1");
boolean save = busBLimitListVersionsService.save(busBLimitListVersions);
if (!save) {
log.info("新增失败");
}
//1、根据查询数据
LambdaQueryWrapper<BusBillofquantities> lqw = new LambdaQueryWrapper<>();
lqw.eq(BusBillofquantities::getVersions, id);
@ -541,6 +564,7 @@ public class BusBillofquantitiesVersionsServiceImpl extends ServiceImpl<BusBillo
for (BusBillofquantitiesLimitList busTotalsupplyplan : busTotalsupplyplans) {
busTotalsupplyplan.setProjectId(versions.getProjectId());
busTotalsupplyplan.setId(null);
busTotalsupplyplan.setType("1");
}
boolean b = busBillofquantitiesLimitListService.saveBatch(busTotalsupplyplans);
if (!b) {
@ -605,8 +629,37 @@ public class BusBillofquantitiesVersionsServiceImpl extends ServiceImpl<BusBillo
if (!b) {
log.info("新增失败");
}
}
//往成本部的限价清单表中新增数据
if (update && BusinessStatusEnum.FINISH.getStatus().equals(processEvent.getStatus())) {
//根据版本号查询数据
BusBillofquantitiesVersions versions = this.getOne(eq);
//1、新增版本号
BusBLimitListVersions busBLimitListVersions = BeanUtil.copyProperties(versions, BusBLimitListVersions.class);
busBLimitListVersions.setStatus(null);
busBLimitListVersions.setWorkOrderType("2");
boolean save = busBLimitListVersionsService.save(busBLimitListVersions);
if (!save) {
log.info("新增失败");
}
//1、根据查询数据
LambdaQueryWrapper<BusBillofquantities> lqw = new LambdaQueryWrapper<>();
lqw.eq(BusBillofquantities::getVersions, id);
List<BusBillofquantities> list = busBillofquantitiesService.list(lqw);
List<BusBillofquantitiesLimitList> busTotalsupplyplans = BeanUtil.copyToList(list, BusBillofquantitiesLimitList.class);
for (BusBillofquantitiesLimitList busTotalsupplyplan : busTotalsupplyplans) {
busTotalsupplyplan.setProjectId(versions.getProjectId());
busTotalsupplyplan.setId(null);
busTotalsupplyplan.setType("2");
}
boolean b = busBillofquantitiesLimitListService.saveBatch(busTotalsupplyplans);
if (!b) {
log.info("新增失败");
}
}
}
/**
@ -652,7 +705,35 @@ public class BusBillofquantitiesVersionsServiceImpl extends ServiceImpl<BusBillo
.eq(BusBillofquantitiesVersions::getVersions, id);
BusBillofquantitiesVersions busBillofquantitiesVersions = new BusBillofquantitiesVersions();
busBillofquantitiesVersions.setStatus(processEvent.getStatus());
this.update(busBillofquantitiesVersions, eq);
boolean update = this.update(busBillofquantitiesVersions, eq);
//往成本部的限价清单表中新增数据
if (update && BusinessStatusEnum.FINISH.getStatus().equals(processEvent.getStatus())) {
//根据版本号查询数据
BusBillofquantitiesVersions versions = this.getOne(eq);
//1、新增版本号
BusBLimitListVersions busBLimitListVersions = BeanUtil.copyProperties(versions, BusBLimitListVersions.class);
busBLimitListVersions.setStatus(null);
busBLimitListVersions.setWorkOrderType("3");
boolean save = busBLimitListVersionsService.save(busBLimitListVersions);
if (!save) {
log.info("新增失败");
}
//1、根据查询数据
LambdaQueryWrapper<BusBillofquantities> lqw = new LambdaQueryWrapper<>();
lqw.eq(BusBillofquantities::getVersions, id);
List<BusBillofquantities> list = busBillofquantitiesService.list(lqw);
List<BusBillofquantitiesLimitList> busTotalsupplyplans = BeanUtil.copyToList(list, BusBillofquantitiesLimitList.class);
for (BusBillofquantitiesLimitList busTotalsupplyplan : busTotalsupplyplans) {
busTotalsupplyplan.setProjectId(versions.getProjectId());
busTotalsupplyplan.setId(null);
busTotalsupplyplan.setType("3");
}
boolean b = busBillofquantitiesLimitListService.saveBatch(busTotalsupplyplans);
if (!b) {
log.info("新增失败");
}
}
}
/**

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/service/impl/BusFormalitiesAreConsolidatedServiceImpl.java
View File

@ -103,7 +103,8 @@ public class BusFormalitiesAreConsolidatedServiceImpl extends ServiceImpl<BusFor
lqw.eq(bo.getFormalitiesId() != null, BusFormalitiesAreConsolidated::getFormalitiesId, bo.getFormalitiesId());
lqw.eq(bo.getPlanTheStartTime() != null, BusFormalitiesAreConsolidated::getPlanTheStartTime, bo.getPlanTheStartTime());
lqw.eq(StringUtils.isNotBlank(bo.getHead()), BusFormalitiesAreConsolidated::getHead, bo.getHead());
lqw.eq(bo.getActualCompletionTime() != null, BusFormalitiesAreConsolidated::getActualCompletionTime, bo.getActualCompletionTime());
// lqw.eq(bo.getActualCompletionTime() != null, BusFormalitiesAreConsolidated::getActualCompletionTime, bo.getActualCompletionTime());
lqw.apply(bo.getActualCompletionTime() != null,"DATE_FORMAT(actual_completion_time,'%Y-%m-%d')");
lqw.eq(StringUtils.isNotBlank(bo.getProcessingStatus()), BusFormalitiesAreConsolidated::getProcessingStatus, bo.getProcessingStatus());
return lqw;
}