Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
lg
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,16 @@
|
||||
package org.dromara.progress.domain.dto.export;
|
||||
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ReportExportDto {
|
||||
private Long projectId;
|
||||
|
||||
/**
|
||||
* 日期 yyyy-mm-dd
|
||||
*/
|
||||
private String date;
|
||||
|
||||
private String person;
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
package org.dromara.progress.domain.vo.export;
|
||||
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class EquipmentEntryData {
|
||||
private String no; // 序号
|
||||
private String project; // 项目
|
||||
private String num; // 数量
|
||||
private String production; // 生产情况
|
||||
private String entry; // 今日进场情况
|
||||
private String totalEntry; // 累计进场情况
|
||||
private String remark; // 备注
|
||||
|
||||
|
||||
// 生成模拟数据
|
||||
public static List<EquipmentEntryData> generateMockData() {
|
||||
List<EquipmentEntryData> dataList = new ArrayList<>();
|
||||
dataList.add(new EquipmentEntryData("1", "光伏支架", "3200组", "正常生产", "50组", "1200组", "符合质量标准"));
|
||||
dataList.add(new EquipmentEntryData("2", "光伏组件", "56000块", "正常生产", "750块", "22000块", "符合质量标准"));
|
||||
dataList.add(new EquipmentEntryData("3", "逆变器", "30台", "生产中", "0台", "10台", "预计下周进场"));
|
||||
return dataList;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
package org.dromara.progress.domain.vo.export;
|
||||
|
||||
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class MaterialEntryData {
|
||||
private String no; // 序号
|
||||
private String materialName;// 材料名称
|
||||
private String designValue; // 设计值
|
||||
private String entryStatus; // 进场情况
|
||||
private String inspection; // 送检记录
|
||||
|
||||
// 生成模拟数据
|
||||
public static List<MaterialEntryData> generateMockData() {
|
||||
List<MaterialEntryData> dataList = new ArrayList<>();
|
||||
dataList.add(new MaterialEntryData("1", "光伏电缆", "5000米", "今日进场1000米，累计3000米", "已送检，合格"));
|
||||
dataList.add(new MaterialEntryData("2", "水泥", "200吨", "今日进场50吨，累计150吨", "已送检，合格"));
|
||||
dataList.add(new MaterialEntryData("3", "钢筋", "100吨", "未进场，预计明日到货", "待送检"));
|
||||
dataList.add(new MaterialEntryData("4", "预埋件", "2000个", "今日进场500个，累计1500个", "已送检，合格"));
|
||||
return dataList;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
package org.dromara.progress.domain.vo.export;
|
||||
|
||||
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class MaterialInspectionData {
|
||||
private String no; // 序号
|
||||
private String materialName;// 材料名称
|
||||
private String usePart; // 用材部位
|
||||
private String inspectionOrg; // 送检机构
|
||||
private String inspectionRecord; // 送检记录
|
||||
|
||||
|
||||
// 生成模拟数据
|
||||
public static List<MaterialInspectionData> generateMockData() {
|
||||
List<MaterialInspectionData> dataList = new ArrayList<>();
|
||||
dataList.add(new MaterialInspectionData("1", "光伏电缆", "方阵连接", "广西质检中心", "2025-11-05送检，2025-11-06合格"));
|
||||
dataList.add(new MaterialInspectionData("2", "水泥", "基础浇筑", "百色市质检所", "2025-11-04送检，2025-11-05合格"));
|
||||
dataList.add(new MaterialInspectionData("3", "钢筋", "支架固定", "广西质检中心", "待送检，预计2025-11-08送检"));
|
||||
dataList.add(new MaterialInspectionData("4", "预埋件", "基础连接", "百色市质检所", "2025-11-03送检，2025-11-04合格"));
|
||||
return dataList;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,58 @@
|
||||
package org.dromara.progress.domain.vo.export;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class ParamData {
|
||||
|
||||
/**
|
||||
* 项目简介
|
||||
*/
|
||||
private String projectIntro;
|
||||
|
||||
/**
|
||||
* 记录人
|
||||
*/
|
||||
private String date;
|
||||
|
||||
/**
|
||||
* 记录人
|
||||
*/
|
||||
private String recorder;
|
||||
|
||||
/**
|
||||
* 气温
|
||||
*/
|
||||
private String temp;
|
||||
/**
|
||||
* 白天天气
|
||||
*/
|
||||
private String dayWeather;
|
||||
/**
|
||||
* 夜晚天气
|
||||
*/
|
||||
private String nightWeather;
|
||||
/**
|
||||
* 现场质量
|
||||
*/
|
||||
private String quality = "质量正常.可控。";
|
||||
/**
|
||||
* 现场安全
|
||||
*/
|
||||
private String safety = "安全正常.可控。";
|
||||
|
||||
/**
|
||||
* 图片地址
|
||||
*/
|
||||
private List<String> imgUrls1;
|
||||
|
||||
/**
|
||||
* 图片地址
|
||||
*/
|
||||
private List<String> imgUrls2;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
package org.dromara.progress.domain.vo.export;
|
||||
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ParticipantData {
|
||||
private String unit; // 参建单位
|
||||
private String leader; // 经理班子人员
|
||||
private String manager; // 主要管理技术人员
|
||||
private String other; // 其他人员
|
||||
private String remark; // 备注
|
||||
|
||||
|
||||
// 生成模拟数据
|
||||
public static List<ParticipantData> generateMockData() {
|
||||
List<ParticipantData> dataList = new ArrayList<>();
|
||||
dataList.add(new ParticipantData("田东公司项目建设管理部", "3人", "8人", "12人", "正常"));
|
||||
dataList.add(new ParticipantData("XX施工单位", "2人", "5人", "30人", "部分人员轮休"));
|
||||
dataList.add(new ParticipantData("XX监理单位", "1人", "2人", "0人", "正常"));
|
||||
return dataList;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
package org.dromara.progress.domain.vo.export;
|
||||
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ProgressData {
|
||||
private int num; // 序号
|
||||
private String project; // 项目
|
||||
private String design; // 设计值
|
||||
private String plan; // 今日施工计划
|
||||
private String complete; // 今日施工完成情况
|
||||
private String total; // 累计完成工程量
|
||||
private String process; // 施工形象及进度
|
||||
|
||||
|
||||
|
||||
public static List<ProgressData> generateMockData() {
|
||||
List<ProgressData> dataList = new ArrayList<>();
|
||||
dataList.add(new ProgressData(1, "土地流转（亩）", "217.36", "50", "45", "180", "已完成82.8%"));
|
||||
dataList.add(new ProgressData(2, "清表（亩）", "217.36", "40", "38", "150", "已完成69%"));
|
||||
dataList.add(new ProgressData(3, "支架安装（组）", "3200", "50", "45", "1200", "已完成37.5%"));
|
||||
dataList.add(new ProgressData(4, "组件安装（块）", "56000", "800", "750", "22000", "已完成39.3%"));
|
||||
return dataList;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
// ProjectData.java
|
||||
package org.dromara.progress.domain.vo.export;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class ProjectData {
|
||||
private List<ProgressData> progressList;
|
||||
private List<ParticipantData> participantList;
|
||||
private List<EquipmentEntryData> equipmentEntryList;
|
||||
private List<MaterialEntryData> materialList;
|
||||
private List<MaterialInspectionData> inspectionList;
|
||||
private String projectName; // 项目名称
|
||||
private String projectDate; // 项目日期
|
||||
|
||||
}
|
||||
|
||||
@ -125,4 +125,25 @@ public class HseViolationRecord extends BaseEntity {
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
/**
|
||||
* 任务批号
|
||||
*/
|
||||
private String jobKey;
|
||||
|
||||
/**
|
||||
* 任务批号
|
||||
*/
|
||||
private Integer version;
|
||||
|
||||
/**
|
||||
* 验证人id
|
||||
*/
|
||||
private Long validatorId;
|
||||
|
||||
/**
|
||||
* 验证人名字
|
||||
*/
|
||||
private String validatorName;
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user