diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectEnterprise.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectEnterprise.java index f112ba5b8..6f6264030 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectEnterprise.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProjectEnterprise.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.project.entity; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -168,6 +169,19 @@ public class ProjectEnterprise implements Serializable { @ApiModelProperty(value = "项目类型(字典)") private java.lang.Integer cbsProjectType; + @TableField(exist = false) + @ApiModelProperty(value = "项目类型(字典)名称") + private java.lang.String cbsProjectTypeName; + + @TableField(exist = false) + @ApiModelProperty(value = "施工阶段名称") + private java.lang.String constructionStageName; + @TableField(exist = false) + @ApiModelProperty(value = "结构类型名称") + private java.lang.String structureTypeName; + @TableField(exist = false) + @ApiModelProperty(value = "工程类别名称") + private java.lang.String projectTypeName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectEnterpriseMapper.xml b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectEnterpriseMapper.xml index 487cee6c7..a050a8a40 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectEnterpriseMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectEnterpriseMapper.xml @@ -26,6 +26,58 @@ di.dictionary_encoding = CONCAT( 'project_enterprise_cbs_project_type_', #{param.projectSn} )) > 0,( CONCAT( 'project_enterprise_cbs_project_type_', #{param.projectSn} )),'project_enterprise_cbs_project_type') + + SELECT + * + FROM + dictionary_item + WHERE + dictionary_encoding = + IF + (( + SELECT + COUNT(*) + FROM + dictionary_item di + WHERE + di.dictionary_encoding = CONCAT( 'project_construction_stage_', #{param.projectSn} )) > 0,( + CONCAT( 'project_construction_stage_', #{param.projectSn} )),'project_construction_stage') + + + SELECT + * + FROM + dictionary_item + WHERE + dictionary_encoding = + IF + (( + SELECT + COUNT(*) + FROM + dictionary_item di + WHERE + di.dictionary_encoding = CONCAT( 'project_structure_type_', #{param.projectSn} )) > 0,( + CONCAT( 'project_structure_type_', #{param.projectSn} )),'project_structure_type') + + + SELECT + * + FROM + dictionary_item + WHERE + dictionary_encoding = + IF + (( + SELECT + COUNT(*) + FROM + dictionary_item di + WHERE + di.dictionary_encoding = CONCAT( 'project_type_', #{param.projectSn} )) > 0,( + CONCAT( 'project_type_', #{param.projectSn} )),'project_type') + +