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-10-17 15:42:05 +08:00
parent 965a0cc90e
commit ec54b4ff52
6 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/OutConstructionValue.java
View File

@ -50,6 +50,11 @@ public class OutConstructionValue extends BaseEntity {
*/
private Long progressCategoryId;
/**
* 分项工程名称
*/
private String progressCategoryName;
/**
* 计划详情id
*/

10
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/domain/vo/OutConstructionValueVo.java
View File

@ -176,4 +176,14 @@ public class OutConstructionValueVo implements Serializable {
* 计量方式（0无 1数量 2百分比）
*/
private String unitType;
/**
* 单位
*/
private String unit;
/**
* 完成数量
*/
private Integer completeNum;
}

9
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/service/impl/OutConstructionValueServiceImpl.java
View File

@ -110,7 +110,6 @@ public class OutConstructionValueServiceImpl extends ServiceImpl<OutConstruction
private LambdaQueryWrapper<OutConstructionValue> buildQueryWrapper(OutConstructionValueBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<OutConstructionValue> lqw = Wrappers.lambdaQuery();
lqw.orderByDesc(OutConstructionValue::getId);
Long projectId = bo.getProjectId();
List<Long> ids = new ArrayList<>();
if (projectId != null) {
@ -150,6 +149,9 @@ public class OutConstructionValueServiceImpl extends ServiceImpl<OutConstruction
lqw.in(OutConstructionValue::getProgressCategoryId, categoryIds);
}
}
lqw.orderByAsc(OutConstructionValue::getProgressCategoryName);
lqw.orderByDesc(OutConstructionValue::getProgressCategoryId);
lqw.orderByDesc(OutConstructionValue::getReportDate);
return lqw;
}
@ -357,6 +359,7 @@ public class OutConstructionValueServiceImpl extends ServiceImpl<OutConstruction
vo.setProgressCategoryName(pgsProgressCategoryVo.getName());
vo.setWorkType(pgsProgressCategoryVo.getWorkType());
vo.setUnitType(pgsProgressCategoryVo.getUnitType());
vo.setUnit(pgsProgressCategoryVo.getUnit());
PgsProgressCategoryVo pgsProgressCategoryVo1 = pgsProgressCategoryService.queryById(pgsProgressCategoryVo.getParentId());
vo.setCategoryId(pgsProgressCategoryVo1.getId());
vo.setCategoryName(pgsProgressCategoryVo1.getName());
@ -368,10 +371,14 @@ public class OutConstructionValueServiceImpl extends ServiceImpl<OutConstruction
if (vo.getMatrixId() != null && vo.getMatrixId() != 0) {
FacMatrix facMatrix = facMatrixService.getById(vo.getMatrixId());
vo.setMatrixName(facMatrix.getMatrixName());
vo.setCategoryName(facMatrix.getMatrixName() + "/" + pgsProgressCategoryVo1.getName());
}
BusProjectVo busProjectVo1 = busProjectService.queryById(pgsProgressCategoryVo.getProjectId());
vo.setSubProjectId(busProjectVo1.getId());
vo.setSubProjectName(busProjectVo1.getProjectName());
// 统计完成数量
vo.setCompleteNum(vo.getArtificialNum() + vo.getUavNum());
}
}

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

@ -971,6 +971,7 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl<PgsProgressPla
value.setRangeId(rangeId);
value.setMatrixId(category.getMatrixId());
value.setProgressCategoryId(progressCategoryId);
value.setProgressCategoryName(category.getName());
value.setDetailId(planDetail.getId());
BigDecimal finishedNumber = planDetail.getFinishedNumber();
BigDecimal aiFill = planDetail.getAiFill();
@ -1049,6 +1050,7 @@ public class PgsProgressPlanDetailServiceImpl extends ServiceImpl<PgsProgressPla
value.setRangeId(range.getId());
value.setMatrixId(category.getMatrixId());
value.setProgressCategoryId(progressCategoryId);
value.setProgressCategoryName(category.getName());
value.setDetailId(planDetail.getId());
BigDecimal finishedNumber = planDetail.getFinishedNumber();
BigDecimal aiFill = planDetail.getAiFill();

10
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/safetyinspection/HseSafetyInspectionGis.java
View File

@ -20,21 +20,11 @@ public class HseSafetyInspectionGis implements Serializable {
*/
private Long id;
/**
* 项目ID
*/
private Long projectId;
/**
* 检查类型
*/
private String checkType;
/**
* 检查项目
*/
private String checkProject;
/**
* 违章类型
*/

14
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java
View File

@ -234,9 +234,13 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl<HseSafetyInspect
.filter(q -> "1".equals(q.getIsReply()))
.filter(q -> !q.getStatus().equals(HseSafetyInspectionStatusEnum.INFORM.getValue()))
.toList();
List<HseSafetyInspectionGis> pass = passList.stream().map(s -> {
List<HseSafetyInspectionGis> pass = passList.stream().map(p -> {
HseSafetyInspectionGis gis = new HseSafetyInspectionGis();
BeanUtils.copyProperties(s, gis);
gis.setId(p.getId());
gis.setCheckType(p.getCheckType());
gis.setViolationType(p.getViolationType());
gis.setInspectionResult(p.getInspectionResult());
gis.setStatus(p.getStatus());
return gis;
}).toList();
gisVo.setTeamMeetingCount((long) teamMeetings.size());
@ -245,7 +249,11 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl<HseSafetyInspect
.toList()
.stream().map(p -> {
HseSafetyInspectionGis gis = new HseSafetyInspectionGis();
BeanUtils.copyProperties(p, gis);
gis.setId(p.getId());
gis.setCheckType(p.getCheckType());
gis.setViolationType(p.getViolationType());
gis.setInspectionResult(p.getInspectionResult());
gis.setStatus(p.getStatus());
return gis;
}).toList();
gisVo.setSafetyInspectionCount((long) inspections.size());