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-09-28 17:04:29 +08:00
parent c66d5f0789
commit 3d3df16817
3 changed files with 8 additions and 9 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/FacPhotovoltaicPanelServiceImpl.java
View File

@ -312,10 +312,10 @@ public class FacPhotovoltaicPanelServiceImpl extends ServiceImpl<FacPhotovoltaic
} }
Long matrixId = matrix.getId();*/ Long matrixId = matrix.getId();*/
// 去掉首字母 (T/G) // 去掉首字母 (T/G)
String withoutPrefix = name.substring(1); String withoutPrefix = name.substring(2);
// 如果包含"."，只取第一个"."前的数字 // 如果包含"."，只取第一个"."前的数字
int dotIndex = withoutPrefix.indexOf("."); int dotIndex = withoutPrefix.indexOf("#");
if (dotIndex != -1) { if (dotIndex != -1) {
withoutPrefix = withoutPrefix.substring(0, dotIndex); withoutPrefix = withoutPrefix.substring(0, dotIndex);
} }

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

@ -308,7 +308,6 @@ public class PgsProgressCategoryServiceImpl extends ServiceImpl<PgsProgressCateg
// 取分组中的第一条记录的排序字段作为当前VO的排序值 // 取分组中的第一条记录的排序字段作为当前VO的排序值
List<PgsProgressCategory> value = entry.getValue(); List<PgsProgressCategory> value = entry.getValue();
PgsProgressCategory first = value.getFirst(); PgsProgressCategory first = value.getFirst();
topVo.setId(first.getId());
topVo.setSort(first.getSort()); topVo.setSort(first.getSort());
// 转换为方阵结构的VO列表 // 转换为方阵结构的VO列表
List<PgsProgressCategoryMatrixStructureTopVo> matrixVoList = value.stream().map(category -> { List<PgsProgressCategoryMatrixStructureTopVo> matrixVoList = value.stream().map(category -> {

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

@ -174,11 +174,11 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl<PgsProgressPla
throw new ServiceException("进度计划信息不存在", HttpStatus.NOT_FOUND); throw new ServiceException("进度计划信息不存在", HttpStatus.NOT_FOUND);
} }
BigDecimal oldFinishedNumber = progressPlan.getFinishedNumber(); BigDecimal oldFinishedNumber = progressPlan.getFinishedNumber();
// 判断完成时间是否大于当前时间 // todo 判断完成时间是否大于当前时间
LocalDate planDate = progressPlanDetail.getDate(); LocalDate planDate = progressPlanDetail.getDate();
if (planDate.isAfter(LocalDate.now())) { /* if (planDate.isAfter(LocalDate.now())) {
throw new ServiceException("完成时间不能大于当前时间", HttpStatus.BAD_REQUEST); throw new ServiceException("完成时间不能大于当前时间", HttpStatus.BAD_REQUEST);
} }*/
Long projectId = progressPlanDetail.getProjectId(); Long projectId = progressPlanDetail.getProjectId();
Long progressCategoryId = progressPlanDetail.getProgressCategoryId(); Long progressCategoryId = progressPlanDetail.getProgressCategoryId();
PgsProgressCategory progressCategory = progressCategoryService.getById(progressCategoryId); PgsProgressCategory progressCategory = progressCategoryService.getById(progressCategoryId);
@ -361,11 +361,11 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl<PgsProgressPla
if (progressPlanDetail == null) { if (progressPlanDetail == null) {
throw new ServiceException("进度计划详情信息不存在", HttpStatus.NOT_FOUND); throw new ServiceException("进度计划详情信息不存在", HttpStatus.NOT_FOUND);
} }
// 判断完成时间是否大于当前时间 // todo 判断完成时间是否大于当前时间
LocalDate date = progressPlanDetail.getDate(); LocalDate date = progressPlanDetail.getDate();
if (date.isAfter(LocalDate.now())) { /* if (date.isAfter(LocalDate.now())) {
throw new ServiceException("完成时间不能大于当前时间", HttpStatus.BAD_REQUEST); throw new ServiceException("完成时间不能大于当前时间", HttpStatus.BAD_REQUEST);
} }*/
// 判断当前详情是否已提交 // 判断当前详情是否已提交
if (progressPlanDetail.getStatus().equals("3")) { if (progressPlanDetail.getStatus().equals("3")) {
throw new ServiceException("当前详情已在施工产值中提交，无法提交", HttpStatus.BAD_REQUEST); throw new ServiceException("当前详情已在施工产值中提交，无法提交", HttpStatus.BAD_REQUEST);