diff --git a/ruoyi-ui/src/views/project/checkDetection/index.vue b/ruoyi-ui/src/views/project/checkDetection/index.vue index a65e5731..55d71971 100644 --- a/ruoyi-ui/src/views/project/checkDetection/index.vue +++ b/ruoyi-ui/src/views/project/checkDetection/index.vue @@ -61,6 +61,15 @@ 搜索 重置 + 导出 @@ -725,7 +734,7 @@ export default { { ...this.queryParams, }, - `checkDetection_${new Date().getTime()}.xlsx` + `材料取样复试_${new Date().getTime()}.xlsx` ); }, /** 选择见证人*/ diff --git a/ruoyi-ui/src/views/project/materialSeal/index.vue b/ruoyi-ui/src/views/project/materialSeal/index.vue index 065b9475..f972e9e5 100644 --- a/ruoyi-ui/src/views/project/materialSeal/index.vue +++ b/ruoyi-ui/src/views/project/materialSeal/index.vue @@ -58,6 +58,15 @@ 搜索 重置 + 导出 @@ -586,7 +595,7 @@ export default { { ...this.queryParams, }, - `materialSeal_${new Date().getTime()}.xlsx` + `材料封样_${new Date().getTime()}.xlsx` ); }, /** 选择见证人*/ diff --git a/ruoyi-ui/src/views/project/projectChecking/index.vue b/ruoyi-ui/src/views/project/projectChecking/index.vue index f1183a4e..3eee2366 100644 --- a/ruoyi-ui/src/views/project/projectChecking/index.vue +++ b/ruoyi-ui/src/views/project/projectChecking/index.vue @@ -64,6 +64,15 @@ 搜索 重置 + 导出 @@ -618,7 +627,7 @@ export default { { ...this.queryParams, }, - `projectChecking_${new Date().getTime()}.xlsx` + `举牌验收_${new Date().getTime()}.xlsx` ); }, /** 选择质量专员*/ diff --git a/ruoyi-ui/src/views/project/projectMeasure/index.vue b/ruoyi-ui/src/views/project/projectMeasure/index.vue index 8519ae7a..22cb6ca4 100644 --- a/ruoyi-ui/src/views/project/projectMeasure/index.vue +++ b/ruoyi-ui/src/views/project/projectMeasure/index.vue @@ -63,6 +63,15 @@ 搜索 重置 + 导出 @@ -605,7 +614,7 @@ export default { { ...this.queryParams, }, - `projectMeasure_${new Date().getTime()}.xlsx` + `实测实量_${new Date().getTime()}.xlsx` ); }, /** 选择质量专员*/ diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectCheckDetection.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectCheckDetection.java index a91ca371..0c2db97a 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectCheckDetection.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectCheckDetection.java @@ -21,15 +21,19 @@ public class SurProjectCheckDetection extends BaseEntity private Long id; /** 项目主键 */ - @Excel(name = "项目主键") private Long projectId; /** 单位主键 */ - @Excel(name = "单位主键") private Long deptId; + @Excel(name = "项目名称") + private String projectName; + + @Excel(name = "单位名称") + private String deptName; + /** 送检类型 */ - @Excel(name = "送检类型") + @Excel(name = "送检类型",dictType = "check_detection_check_type") private String checkType; /** 材料名称 */ @@ -45,19 +49,16 @@ public class SurProjectCheckDetection extends BaseEntity private String sampleNum; /** 提供合格证 */ - @Excel(name = "提供合格证") + @Excel(name = "是否提供合格证",dictType = "sys_yes_no") private String qualifiedFlag; /** 代表数量 */ - @Excel(name = "代表数量") private String represenNum; /** 取样人 */ - @Excel(name = "取样人") private String sampleUser; /** 取样人名称 */ - @Excel(name = "取样人名称") private String sampleUserName; /** 见证人 */ @@ -78,19 +79,15 @@ public class SurProjectCheckDetection extends BaseEntity private Date checkTime; /** 送检状态 */ - @Excel(name = "送检状态") private String checkState; /** 检测结果 */ - @Excel(name = "检测结果") private String detectionResult; /** 检测报告 */ - @Excel(name = "检测报告") private String detectionFile; /** 数据状态 */ - @Excel(name = "数据状态") private String isDel; private String attachment; @@ -121,13 +118,12 @@ public class SurProjectCheckDetection extends BaseEntity } private String specimenPhoto; + /** 审核状态 */ - @Excel(name = "审核状态") + @Excel(name = "审核状态",dictType = "project_check_status") private String approveStatus; private String checkTypeName; - private String projectName; - private String deptName; private String createByName; private String updateByName; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java index 9da21449..c123989b 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java @@ -63,7 +63,6 @@ public class SurProjectChecking extends BaseEntity private Long checkingNum; /** 验收结果 */ - @Excel(name = "验收结果") private String checkResult; /** 验收描述 */ @@ -87,11 +86,9 @@ public class SurProjectChecking extends BaseEntity private String superviseUserName; /** 分包单位用户 */ - @Excel(name = "分包单位用户") private String groupDeptUser; /** 分包单位用户名称 */ - @Excel(name = "分包单位用户名称") private String groupDeptUserName; /** 验收时间 */ @@ -100,19 +97,16 @@ public class SurProjectChecking extends BaseEntity private Date checkingDate; /** 验收附件 */ - @Excel(name = "验收附件") private String checkingFiles; /** 数据状态 */ - @Excel(name = "数据状态") private Long isDel; /** 审核状态 */ - @Excel(name = "审核状态") + @Excel(name = "审核状态",dictType = "project_check_status") private String approveStatus; - @Excel(name = "验收类型") private String dataTypeLvl1; public String getDataTypeLvl1() { @@ -131,7 +125,6 @@ public class SurProjectChecking extends BaseEntity this.dataTypeLvl2 = dataTypeLvl2; } - @Excel(name = "子验收类型") private String dataTypeLvl2; public void setId(Long id) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMaterialSeal.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMaterialSeal.java index bd9ebeb9..334cc318 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMaterialSeal.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMaterialSeal.java @@ -33,11 +33,9 @@ public class SurProjectMaterialSeal extends BaseEntity private String deptName; /** 封样主图 */ - @Excel(name = "封样主图") private String mainImage; /** 图片集合 */ - @Excel(name = "图片集合") private String imageUrls; /** 封样名称 */ @@ -62,25 +60,11 @@ public class SurProjectMaterialSeal extends BaseEntity private Date sealDate; /** 会签单 */ - @Excel(name = "会签单") private String signFiles; /** 变更单 */ - @Excel(name = "变更单") private String alterationFiles; - /** 数据状态 */ - @Excel(name = "数据状态") - private String isDel; - - /** 审核状态 */ - @Excel(name = "审核状态") - private String approveStatus; - - /** 封样状态 */ - @Excel(name = "封样状态") - private String materialResult; - /** 监理人 */ @Excel(name = "监理人") private String witnessUser; @@ -89,6 +73,16 @@ public class SurProjectMaterialSeal extends BaseEntity @Excel(name = "监理人名称") private String witnessUserName; + /** 数据状态 */ + private String isDel; + + /** 审核状态 */ + @Excel(name = "审核状态",dictType = "project_check_status") + private String approveStatus; + + /** 封样状态 */ + private String materialResult; + public void setId(Long id) { this.id = id; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java index 1a8b70f8..e03cd1d3 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java @@ -33,15 +33,13 @@ public class SurProjectMeasure extends BaseEntity private String deptName; /** 测量主图 */ - @Excel(name = "测量主图") private String mainImage; /** 图片集合 */ - @Excel(name = "图片集合") private String imageUrls; /** 测量类型 */ - @Excel(name = "测量类型") + @Excel(name = "测量类型",dictType = "project_measure_type") private String measureType; /** 测量部位 */ @@ -49,7 +47,7 @@ public class SurProjectMeasure extends BaseEntity private String measurePosition; /** 测量内容 */ - @Excel(name = "测量内容") + @Excel(name = "测量内容",dictType = "project_measure_info_type") private String measureInfo; /** 测量时间 */ @@ -62,11 +60,9 @@ public class SurProjectMeasure extends BaseEntity private String measurePointPosition; /** 测量结果 */ - @Excel(name = "测量结果") private String measureResult; /** 测量文件 */ - @Excel(name = "测量文件") private String measureFiles; /** 质量专员 */ @@ -86,11 +82,10 @@ public class SurProjectMeasure extends BaseEntity private String superviseUserName; /** 数据状态 */ - @Excel(name = "数据状态") private String isDel; /** 审核状态 */ - @Excel(name = "审核状态") + @Excel(name = "审核状态",dictType = "project_check_status") private String approveStatus; private String measureTypeName;