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

2025-12-19bug修改

Browse Source
This commit is contained in:
dfdg
2025-12-19 18:19:33 +08:00
parent 541d674072
commit 41541c3735
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/bo/BusBillofquantitiesBo.java
View File

@ -9,6 +9,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.math.BigDecimal;
/**
* 工程量清单业务对象 bus_billofquantities
*
@ -72,7 +74,7 @@ public class BusBillofquantitiesBo extends BaseEntity {
/**
* 数量
*/
private Long quantity;
private BigDecimal quantity;
/**
* 备注

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/BusBillofquantitiesVo.java
View File

@ -10,6 +10,7 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@ -84,7 +85,7 @@ public class BusBillofquantitiesVo implements Serializable {
* 数量
*/
@ExcelProperty(value = "数量")
private Long quantity;
private BigDecimal quantity;
/**
* 备注

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsInventoryServiceImpl.java
View File

@ -342,7 +342,11 @@ public class MatMaterialsInventoryServiceImpl extends ServiceImpl<MatMaterialsIn
.select(MatMaterials::getId)
.like(MatMaterials::getMaterialsName, materialsName);
List<Long> materialsIdList = materialsService.listObjs(materialsQueryWrapper, obj -> (Long) obj);
lqw.in(MatMaterialsInventory::getMaterialsId, materialsIdList);
if (CollUtil.isNotEmpty(materialsIdList)){
lqw.in(MatMaterialsInventory::getMaterialsId, materialsIdList);
}else {
lqw.eq(MatMaterialsInventory::getMaterialsId, -1);
}
}
// 模糊查询
lqw.like(StringUtils.isNotBlank(operator), MatMaterialsInventory::getOperator, operator);

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

@ -2682,6 +2682,9 @@ public class PgsProgressCategoryServiceImpl extends ServiceImpl<PgsProgressCateg
}
}
}
if (listValues.isEmpty()){
throw new ServiceException("没有数据");
}
try {
ExcelUtil.exportMultiSheetExcelEnhanced(listValues, names, PgsProgressCategoryVo.class, null, response);
} catch (IOException e) {