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

同步进度

Browse Source
This commit is contained in:
lcj
2025-08-22 22:58:10 +08:00
parent 2db941ef97
commit 967d97312e
10 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacBoxTransformerServiceImpl.java
View File

@ -248,7 +248,7 @@ public class FacBoxTransformerServiceImpl extends ServiceImpl<FacBoxTransformerM
progressCategory.setTotal(BigDecimal.valueOf(total)); progressCategory.setTotal(BigDecimal.valueOf(total));
// 如果单价不为 0 则计算产值 // 如果单价不为 0 则计算产值
if (unitPrice.compareTo(BigDecimal.ZERO) != 0) { if (unitPrice.compareTo(BigDecimal.ZERO) != 0) {
progressCategory.setOutputValue(unitPrice.multiply(BigDecimal.valueOf(total))); progressCategory.setOwnerOutputValue(unitPrice.multiply(BigDecimal.valueOf(total)));
} }
} }
boolean result = progressCategoryService.updateBatchById(progressCategoryList); boolean result = progressCategoryService.updateBatchById(progressCategoryList);
@ -307,7 +307,7 @@ public class FacBoxTransformerServiceImpl extends ServiceImpl<FacBoxTransformerM
Optional.ofNullable(progressCategory.getUnitPrice()) Optional.ofNullable(progressCategory.getUnitPrice())
.orElse(BigDecimal.ZERO) .orElse(BigDecimal.ZERO)
));*/ ));*/
progressCategory.setOutputValue(total.multiply( progressCategory.setOwnerOutputValue(total.multiply(
Optional.ofNullable(progressCategory.getOwnerPrice()) Optional.ofNullable(progressCategory.getOwnerPrice())
.orElse(BigDecimal.ZERO) .orElse(BigDecimal.ZERO)
)); ));

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacInverterServiceImpl.java
View File

@ -248,7 +248,7 @@ public class FacInverterServiceImpl extends ServiceImpl<FacInverterMapper, FacIn
progressCategory.setTotal(BigDecimal.valueOf(total)); progressCategory.setTotal(BigDecimal.valueOf(total));
// 如果单价不为 0 则计算产值 // 如果单价不为 0 则计算产值
if (unitPrice.compareTo(BigDecimal.ZERO) != 0) { if (unitPrice.compareTo(BigDecimal.ZERO) != 0) {
progressCategory.setOutputValue(unitPrice.multiply(BigDecimal.valueOf(total))); progressCategory.setOwnerOutputValue(unitPrice.multiply(BigDecimal.valueOf(total)));
} }
} }
boolean result = progressCategoryService.updateBatchById(progressCategoryList); boolean result = progressCategoryService.updateBatchById(progressCategoryList);
@ -303,7 +303,7 @@ public class FacInverterServiceImpl extends ServiceImpl<FacInverterMapper, FacIn
} }
BigDecimal total = BigDecimal.valueOf(newInverterList.size()); BigDecimal total = BigDecimal.valueOf(newInverterList.size());
progressCategory.setTotal(total); progressCategory.setTotal(total);
progressCategory.setOutputValue(total.multiply( progressCategory.setOwnerOutputValue(total.multiply(
Optional.ofNullable(progressCategory.getOwnerPrice()) Optional.ofNullable(progressCategory.getOwnerPrice())
.orElse(BigDecimal.ZERO) .orElse(BigDecimal.ZERO)
)); ));

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelColumnServiceImpl.java
View File

@ -175,7 +175,7 @@ public class FacPhotovoltaicPanelColumnServiceImpl extends ServiceImpl<FacPhotov
} }
BigDecimal total = BigDecimal.valueOf(newColumnList.size()); BigDecimal total = BigDecimal.valueOf(newColumnList.size());
progressCategory.setTotal(total); progressCategory.setTotal(total);
progressCategory.setOutputValue(total.multiply( progressCategory.setOwnerOutputValue(total.multiply(
Optional.ofNullable(progressCategory.getOwnerPrice()) Optional.ofNullable(progressCategory.getOwnerPrice())
.orElse(BigDecimal.ZERO) .orElse(BigDecimal.ZERO)
)); ));

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPartsServiceImpl.java
View File

@ -482,7 +482,7 @@ public class FacPhotovoltaicPanelPartsServiceImpl implements IFacPhotovoltaicPan
progressCategory.setTotal(BigDecimal.valueOf(total)); progressCategory.setTotal(BigDecimal.valueOf(total));
// 如果单价不为 0 则计算产值 // 如果单价不为 0 则计算产值
if (unitPrice != null && unitPrice.compareTo(BigDecimal.ZERO) != 0) { if (unitPrice != null && unitPrice.compareTo(BigDecimal.ZERO) != 0) {
progressCategory.setOutputValue(unitPrice.multiply(BigDecimal.valueOf(total))); progressCategory.setOwnerOutputValue(unitPrice.multiply(BigDecimal.valueOf(total)));
} }
} }
boolean result = progressCategoryService.updateBatchById(progressCategoryList); boolean result = progressCategoryService.updateBatchById(progressCategoryList);

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelPointServiceImpl.java
View File

@ -175,7 +175,7 @@ public class FacPhotovoltaicPanelPointServiceImpl extends ServiceImpl<FacPhotovo
} }
BigDecimal total = BigDecimal.valueOf(newPointList.size()); BigDecimal total = BigDecimal.valueOf(newPointList.size());
progressCategory.setTotal(total); progressCategory.setTotal(total);
progressCategory.setOutputValue(total.multiply( progressCategory.setOwnerOutputValue(total.multiply(
Optional.ofNullable(progressCategory.getOwnerPrice()) Optional.ofNullable(progressCategory.getOwnerPrice())
.orElse(BigDecimal.ZERO) .orElse(BigDecimal.ZERO)
)); ));

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelServiceImpl.java
View File

@ -378,7 +378,7 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
progressCategory.setTotal(BigDecimal.valueOf(total)); progressCategory.setTotal(BigDecimal.valueOf(total));
// 如果单价不为 0 则计算产值 // 如果单价不为 0 则计算产值
if (unitPrice.compareTo(BigDecimal.ZERO) != 0) { if (unitPrice.compareTo(BigDecimal.ZERO) != 0) {
progressCategory.setOutputValue(unitPrice.multiply(BigDecimal.valueOf(total))); progressCategory.setOwnerOutputValue(unitPrice.multiply(BigDecimal.valueOf(total)));
} }
} }
boolean result = progressCategoryService.updateBatchById(progressCategoryList); boolean result = progressCategoryService.updateBatchById(progressCategoryList);
@ -512,7 +512,7 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
Optional.ofNullable(progressCategory.getUnitPrice()) Optional.ofNullable(progressCategory.getUnitPrice())
.orElse(BigDecimal.ZERO) .orElse(BigDecimal.ZERO)
)); */ )); */
progressCategory.setOutputValue(total.multiply( progressCategory.setOwnerOutputValue(total.multiply(
Optional.ofNullable(progressCategory.getOwnerPrice()) Optional.ofNullable(progressCategory.getOwnerPrice())
.orElse(BigDecimal.ZERO) .orElse(BigDecimal.ZERO)
)); ));

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/service/impl/FacPhotovoltaicPanelSupportServiceImpl.java
View File

@ -175,7 +175,7 @@ public class FacPhotovoltaicPanelSupportServiceImpl extends ServiceImpl<FacPhoto
} }
BigDecimal total = BigDecimal.valueOf(newSupportList.size()); BigDecimal total = BigDecimal.valueOf(newSupportList.size());
progressCategory.setTotal(total); progressCategory.setTotal(total);
progressCategory.setOutputValue(total.multiply( progressCategory.setOwnerOutputValue(total.multiply(
Optional.ofNullable(progressCategory.getOwnerPrice()) Optional.ofNullable(progressCategory.getOwnerPrice())
.orElse(BigDecimal.ZERO) .orElse(BigDecimal.ZERO)
)); ));

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/PgsProgressCategory.java
View File

@ -75,9 +75,14 @@ public class PgsProgressCategory extends BaseEntity {
private BigDecimal constructionPrice; private BigDecimal constructionPrice;
/** /**
* 产值金额 * 产值金额(业主)
*/ */
private BigDecimal outputValue; private BigDecimal ownerOutputValue;
/**
* 产值金额(分包)
*/
private BigDecimal constructionOutputValue;
/** /**
* 总数量 * 总数量

12
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/domain/vo/progresscategory/PgsProgressCategoryVo.java
View File

@ -137,10 +137,16 @@ public class PgsProgressCategoryVo implements Serializable {
private BigDecimal constructionPrice; private BigDecimal constructionPrice;
/** /**
* 产值金额 * 产值金额(业主)
*/ */
@ExcelProperty(value = "产值金额") @ExcelProperty(value = "产值金额(业主)")
private BigDecimal outputValue; private BigDecimal ownerOutputValue;
/**
* 产值金额(分包)
*/
@ExcelProperty(value = "产值金额(分包)")
private BigDecimal constructionOutputValue;
/** /**
* 工作类型 * 工作类型

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/service/impl/PgsProgressCategoryServiceImpl.java
View File

@ -201,7 +201,7 @@ public class PgsProgressCategoryServiceImpl extends ServiceImpl<PgsProgressCateg
} }
// 计算产值 // 计算产值
if (unitPrice != null && total != null && unitPrice.compareTo(BigDecimal.ZERO) >= 0 && total.compareTo(BigDecimal.ZERO) >= 0) { if (unitPrice != null && total != null && unitPrice.compareTo(BigDecimal.ZERO) >= 0 && total.compareTo(BigDecimal.ZERO) >= 0) {
progressCategory.setOutputValue(unitPrice.multiply(total)); progressCategory.setOwnerOutputValue(unitPrice.multiply(total));
} }
if (StringUtils.isNotBlank(workType) && PgsProgressCategoryConstant.WORK_TYPE_LIST.contains(workType)) { if (StringUtils.isNotBlank(workType) && PgsProgressCategoryConstant.WORK_TYPE_LIST.contains(workType)) {
List<PgsProgressCategory> progressCategoryList = this.lambdaQuery() List<PgsProgressCategory> progressCategoryList = this.lambdaQuery()
@ -286,7 +286,7 @@ public class PgsProgressCategoryServiceImpl extends ServiceImpl<PgsProgressCateg
progressCategory.setUnit(req.getUnit()); progressCategory.setUnit(req.getUnit());
progressCategory.setOwnerPrice(unitPrice); progressCategory.setOwnerPrice(unitPrice);
// todo progressCategory.setUnitPrice(unitPrice); // todo progressCategory.setUnitPrice(unitPrice);
progressCategory.setOutputValue(outputValue); progressCategory.setOwnerOutputValue(outputValue);
// 写入数据库 // 写入数据库
return this.updateById(progressCategory); return this.updateById(progressCategory);
} }