diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSubProject.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSubProject.java index 4fb24e55..c30db0ac 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSubProject.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSubProject.java @@ -50,6 +50,15 @@ public class BsSgcJsjdBuiSubProject extends BaseEntity @ApiModelProperty("单元工程数量") private String unitNumber; + @Excel(name = "关键部分单元工程数量") + @ApiModelProperty("关键部分单元工程数量") + private String keyUnitProject; + + @Excel(name = "重要隐藏单元工程数量") + @ApiModelProperty("重要隐藏单元工程数量") + private String hiddenUnitProjects; + + /** 单位id */ @Excel(name = "单位id") @ApiModelProperty("单位id") diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSubProjectQuality.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSubProjectQuality.java index e9161f4a..3f3c999d 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSubProjectQuality.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSubProjectQuality.java @@ -61,12 +61,16 @@ public class BsSgcJsjdBuiSubProjectQuality extends BaseEntity @ApiModelProperty("单元工程优良率") private String cellProjectRate; - /** 关键部位和重要隐藏单元优良率 */ - @Excel(name = "关键部位和重要隐藏单元优良率") - @ApiModelProperty("关键部位和重要隐藏单元优良率") - private String majorCellRate; + @Excel(name = "关键部位单元优良率") + @ApiModelProperty("关键部位单元优良率") + private String keyComponentUnits; - /** 分部工程质量评定表 */ + @Excel(name = "重要隐藏单元优良率") + @ApiModelProperty(name = "重要隐藏单元优良率") + private String hiddenComponentRate; + + + /** 分部工程质量评定表 */ @Excel(name = "分部工程质量评定表") @ApiModelProperty("分部工程质量评定表") private String divisionalAttachment; diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java index 94f4477f..d3a09887 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java @@ -35,31 +35,37 @@ public class BsSgcjsjdBuiProInfo extends BaseEntity @TableField(exist = false) private String projectName; - /** 项目法人 */ - @Excel(name = "项目法人") - @ApiModelProperty("项目法人") - private String unitLeader; - /** 项目法人 */ @Excel(name = "项目法人") @ApiModelProperty("项目法人") private String projectLegalPerson; - /** 项目法人单位 */ - @Excel(name = "项目法人单位") - @ApiModelProperty("项目法人单位") - private String projectLegalUnit; - - /** 单位负责人电话 */ @Excel(name = "单位负责人电话") @ApiModelProperty("单位负责人电话") private String projectLegalPhone; + @Excel(name = "项目负责人") + @ApiModelProperty("项目负责人") + private String projectSuperintendent; + + @Excel(name = "项目负责人电话") + @ApiModelProperty("项目负责人电话") + private String projectSuperintendentPhone; + + @Excel(name = "单位法定代表人") + @ApiModelProperty("项目法定代表人") + private String projectUnitLegal; + + @Excel(name = "单位法定代表人电话") + @ApiModelProperty("单位法定代表人电话") + private String projectUnitLegalPhone; + /** 工程等别 */ @Excel(name = "工程等别") @ApiModelProperty("工程等别") private String engineeringGrade; + /** 工程用途 */ @Excel(name = "工程用途") @ApiModelProperty("工程用途") diff --git a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdBuiRegulatoryInspections.java b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdBuiRegulatoryInspections.java index 4771b1a0..ef98a458 100644 --- a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdBuiRegulatoryInspections.java +++ b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdBuiRegulatoryInspections.java @@ -85,6 +85,10 @@ public class BsSgcJsjdBuiRegulatoryInspections extends BaseEntity @ApiModelProperty("整改报告") private String proNo; + @Excel(name = "检查菜单类型") + @ApiModelProperty(name = "检查菜单类型") + private String menuType; + @TableField(exist = false) private String projectName; diff --git a/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdBuiRegulatoryInspectionsMapper.java b/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdBuiRegulatoryInspectionsMapper.java index f9340d15..c8eeaca3 100644 --- a/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdBuiRegulatoryInspectionsMapper.java +++ b/jwtech-system/src/main/java/com/kms/warn/mapper/BsSgcJsjdBuiRegulatoryInspectionsMapper.java @@ -24,5 +24,7 @@ public interface BsSgcJsjdBuiRegulatoryInspectionsMapper extends BaseMapper and id=#{id} + + and menu_type=#{menuType} + order by ri.${orderBy} desc LIMIT #{pageNum},#{pageSize}; @@ -65,6 +68,9 @@ and inspection_types = #{inspectionTypes} + + and menu_type=#{menuType} + order by ri.${orderBy} desc LIMIT #{pageNum},#{pageSize};