承包商和加字段
This commit is contained in:
parent
59a999825b
commit
4ac37d7644
@ -1,14 +1,18 @@
|
||||
package com.zhgd.xmgl.modules.project.entity;
|
||||
|
||||
import com.alibaba.fastjson.annotation.JSONField;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Description: 项目劳务公司关联
|
||||
@ -81,4 +85,89 @@ public class ProjectEnterprise implements Serializable {
|
||||
private java.lang.String ancestors;
|
||||
@ApiModelProperty(value = "父级id")
|
||||
private java.lang.Long parentProjectEnterpriseId;
|
||||
@ApiModelProperty(value = "项目经理")
|
||||
private java.lang.String projectManage;
|
||||
/**
|
||||
* 经度
|
||||
*/
|
||||
@Excel(name = "经度", width = 15)
|
||||
@ApiModelProperty(value = "经度")
|
||||
private java.lang.String longitude;
|
||||
/**
|
||||
* 纬度
|
||||
*/
|
||||
@Excel(name = "纬度", width = 15)
|
||||
@ApiModelProperty(value = "纬度")
|
||||
private java.lang.String latitude;
|
||||
/**
|
||||
* 项目编号
|
||||
*/
|
||||
@Excel(name = "项目编号", width = 15)
|
||||
@ApiModelProperty(value = "项目编号")
|
||||
private java.lang.String projectNumber;
|
||||
/**
|
||||
* 项目面积
|
||||
*/
|
||||
@Excel(name = "项目面积", width = 15)
|
||||
@ApiModelProperty(value = "项目面积")
|
||||
private java.lang.String projectAcreage;
|
||||
/**
|
||||
* 开工日期
|
||||
*/
|
||||
@Excel(name = "开工日期", width = 15)
|
||||
@ApiModelProperty(value = "开工日期")
|
||||
private java.lang.String startWorkDate;
|
||||
|
||||
@ApiModelProperty(value = "项目联系电话")
|
||||
private java.lang.String projectTel;
|
||||
|
||||
/**
|
||||
* 工程类别，1房建，2市政，3安装，4装饰，5公路，6冶炼，7矿山，8化工石油，9水利水电，10电力，11农林，12港口与航道，13航天航空，14通信，15其他
|
||||
*/
|
||||
@Excel(name = "工程类别，1房建，2市政，3安装，4装饰，5公路，6冶炼，7矿山，8化工石油，9水利水电，10电力，11农林，12港口与航道，13航天航空，14通信，15其他", width = 15)
|
||||
@ApiModelProperty(value = "工程类别，1房建，2市政，3安装，4装饰，5公路，6冶炼，7矿山，8化工石油，9水利水电，10电力，11农林，12港口与航道，13航天航空，14通信，15其他")
|
||||
private java.lang.Integer projectType;
|
||||
/**
|
||||
* 结构类型,1装配整体式框级结构，2装配整体式剪力墙结构，3装配整体式框级-现浇剪力墙结构，4装配整体式框级-现浇核心筒结构，5装配整体式部分框支剪力墙结构，6混合结构，7框架结构，8剪力墙结构，9框架-剪力墙结构，10简体结构，11钢结构，12型钢混凝土结构，13砖混结构，14砖木结构
|
||||
*/
|
||||
@Excel(name = "结构类型,1装配整体式框级结构，2装配整体式剪力墙结构，3装配整体式框级-现浇剪力墙结构，4装配整体式框级-现浇核心筒结构，5装配整体式部分框支剪力墙结构，6混合结构，7框架结构，8剪力墙结构，9框架-剪力墙结构，10简体结构，11钢结构，12型钢混凝土结构，13砖混结构，14砖木结构", width = 15)
|
||||
@ApiModelProperty(value = "结构类型,1装配整体式框级结构，2装配整体式剪力墙结构，3装配整体式框级-现浇剪力墙结构，4装配整体式框级-现浇核心筒结构，5装配整体式部分框支剪力墙结构，6混合结构，7框架结构，8剪力墙结构，9框架-剪力墙结构，10简体结构，11钢结构，12型钢混凝土结构，13砖混结构，14砖木结构")
|
||||
private java.lang.Integer structureType;
|
||||
/**
|
||||
* 工程状态，0未开工，1在建，2停工，3验收，4完工
|
||||
*/
|
||||
@Excel(name = "工程状态，0未开工，1在建，2停工，3验收，4完工", width = 15)
|
||||
@ApiModelProperty(value = "工程状态，0未开工，1在建，2停工，3验收，4完工")
|
||||
private java.lang.Integer bulidStatus;
|
||||
/**
|
||||
* 施工阶段，1施工证获取，2土方开挖，3桩基，4支护开始，5垫层完成，6正负零，7工程达到预售条件，8主体施工，9主体封顶，10装饰装修，11景观园林，12主体交付，13预售证获取，14规划验收，15竣工备案完成
|
||||
*/
|
||||
@Excel(name = "施工阶段，1施工证获取，2土方开挖，3桩基，4支护开始，5垫层完成，6正负零，7工程达到预售条件，8主体施工，9主体封顶，10装饰装修，11景观园林，12主体交付，13预售证获取，14规划验收，15竣工备案完成", width = 15)
|
||||
@ApiModelProperty(value = "施工阶段，1施工证获取，2土方开挖，3桩基，4支护开始，5垫层完成，6正负零，7工程达到预售条件，8主体施工，9主体封顶，10装饰装修，11景观园林，12主体交付，13预售证获取，14规划验收，15竣工备案完成")
|
||||
private java.lang.Integer constructionStage;
|
||||
/**
|
||||
* 现场布置图路径
|
||||
*/
|
||||
@Excel(name = "现场布置图路径", width = 15)
|
||||
@ApiModelProperty(value = "现场布置图路径")
|
||||
private java.lang.String layoutImage;
|
||||
@ApiModelProperty(value = "施工地图")
|
||||
private java.lang.String constructionMapUrl;
|
||||
|
||||
@ApiModelProperty(value = "承包商名称")
|
||||
private java.lang.String cbsName;
|
||||
|
||||
@ApiModelProperty(value = "项目施工区域")
|
||||
private java.lang.String projectBuildArea;
|
||||
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@JSONField(format = "yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "竣工日期")
|
||||
private Date completionDate;
|
||||
|
||||
@ApiModelProperty(value = "项目类型（字典）")
|
||||
private java.lang.Integer cbsProjectType;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -74,14 +74,25 @@ public class ProjectFineRecord implements Serializable {
|
||||
private java.lang.String executiveManager ;
|
||||
/**创建时间*/
|
||||
@Excel(name = "创建时间", width = 15)
|
||||
@ApiModelProperty(value="创建时间")
|
||||
private java.lang.String createTime ;
|
||||
/**附件*/
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
private java.lang.String createTime;
|
||||
/**
|
||||
* 附件
|
||||
*/
|
||||
@Excel(name = "附件", width = 15)
|
||||
@ApiModelProperty(value="附件")
|
||||
private java.lang.String fileUrl ;
|
||||
/**备注*/
|
||||
@ApiModelProperty(value = "附件")
|
||||
private java.lang.String fileUrl;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@Excel(name = "备注", width = 15)
|
||||
@ApiModelProperty(value="备注")
|
||||
private java.lang.String remarks ;
|
||||
@ApiModelProperty(value = "备注")
|
||||
private java.lang.String remarks;
|
||||
|
||||
@ApiModelProperty(value = "'安全环保部门签名'")
|
||||
private java.lang.String securityEnvironmentalDepartment;
|
||||
|
||||
@ApiModelProperty(value = "'承包商项目经理签名'")
|
||||
private java.lang.String cbsProjectManagerSign;
|
||||
|
||||
}
|
||||
|
||||
@ -4,6 +4,7 @@ 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.zhgd.xmgl.modules.project.entity.ProjectEnterprise;
|
||||
import com.zhgd.xmgl.modules.project.entity.ProjectEnterprisePerson;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
@ -237,4 +238,8 @@ public class EnterpriseInfo implements Serializable {
|
||||
@TableField(exist = false)
|
||||
private java.lang.Integer projectNum;
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "项目劳务公司关联")
|
||||
private ProjectEnterprise projectEnterprise;
|
||||
|
||||
}
|
||||
|
||||
@ -28,32 +28,12 @@
|
||||
regist_date,
|
||||
business_license_url
|
||||
</sql>
|
||||
<resultMap id="BaseResultMap" type="com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo">
|
||||
<resultMap id="BaseResultMap" type="com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo" autoMapping="true">
|
||||
<result column="id" property="id"/>
|
||||
<result column="enterprise_name" property="enterpriseName"/>
|
||||
<result column="description" property="description"/>
|
||||
<result column="enterprise_address" property="enterpriseAddress"/>
|
||||
<result column="enterprise_legal_person" property="enterpriseLegalPerson"/>
|
||||
<result column="legal_person_id_card" property="legalPersonIdCard"/>
|
||||
<result column="enterprise_safe_allow" property="enterpriseSafeAllow"/>
|
||||
<result column="enterprise_property" property="enterpriseProperty"/>
|
||||
<result column="legal_person_tel" property="legalPersonTel"/>
|
||||
<result column="social_code" property="socialCode"/>
|
||||
<result column="business_number" property="businessNumber"/>
|
||||
<result column="qualification_number" property="qualificationNumber"/>
|
||||
<result column="enterprise_email" property="enterpriseEmail"/>
|
||||
<result column="registered_capital" property="registeredCapital"/>
|
||||
<result column="bankname" property="bankname"/>
|
||||
<result column="bankcardnumber" property="bankcardnumber"/>
|
||||
<result column="bankcode" property="bankcode"/>
|
||||
<result column="enterprise_qualification_url" property="enterpriseQualificationUrl"/>
|
||||
<result column="business_license_end_date" property="businessLicenseEndDate"/>
|
||||
<result column="register_person_name" property="registerPersonName"/>
|
||||
<result column="register_person_phone_tel" property="registerPersonPhoneTel"/>
|
||||
<result column="enterprise_sn" property="enterpriseSn"/>
|
||||
<result column="logo" property="logo"/>
|
||||
<result column="regist_date" property="registDate"/>
|
||||
<result column="business_license_url" property="businessLicenseUrl"/>
|
||||
<association property="projectEnterprise" javaType="com.zhgd.xmgl.modules.project.entity.ProjectEnterprise"
|
||||
columnPrefix="pe_" autoMapping="true">
|
||||
<id column="id" property="id"/>
|
||||
</association>
|
||||
</resultMap>
|
||||
<sql id="getEnterpriseInfoList">
|
||||
SELECT a.*,
|
||||
@ -87,14 +67,43 @@
|
||||
<include refid="getEnterpriseInfoList">
|
||||
</include>
|
||||
</select>
|
||||
<select id="getEnterpriseInfoById" resultType="com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo"
|
||||
<select id="getEnterpriseInfoById" resultMap="BaseResultMap"
|
||||
parameterType="map">
|
||||
SELECT a.*,
|
||||
b.project_sn,
|
||||
c.company_type_name,
|
||||
b.enterprise_type_id,
|
||||
b.project_director_name,
|
||||
b.project_director_phone
|
||||
b.project_director_phone,
|
||||
b.id as pe_id,
|
||||
b.project_sn as pe_project_sn,
|
||||
b.enterprise_id as pe_enterprise_id,
|
||||
b.enterprise_type_id as pe_enterprise_type_id,
|
||||
b.parent_enterprise_id as pe_parent_enterprise_id,
|
||||
b.type as pe_type,
|
||||
b.project_director_name as pe_project_director_name,
|
||||
b.project_director_phone as pe_project_director_phone,
|
||||
b.sort_num as pe_sort_num,
|
||||
b.department_type as pe_department_type,
|
||||
b.ancestors as pe_ancestors,
|
||||
b.parent_project_enterprise_id as pe_parent_project_enterprise_id,
|
||||
b.project_manage as pe_project_manage,
|
||||
b.longitude as pe_longitude,
|
||||
b.latitude as pe_latitude,
|
||||
b.project_number as pe_project_number,
|
||||
b.project_acreage as pe_project_acreage,
|
||||
b.start_work_date as pe_start_work_date,
|
||||
b.project_tel as pe_project_tel,
|
||||
b.project_type as pe_project_type,
|
||||
b.structure_type as pe_structure_type,
|
||||
b.bulid_status as pe_bulid_status,
|
||||
b.construction_stage as pe_construction_stage,
|
||||
b.layout_image as pe_layout_image,
|
||||
b.construction_map_url as pe_construction_map_url,
|
||||
b.cbs_name as pe_cbs_name,
|
||||
b.project_build_area as pe_project_build_area,
|
||||
b.completion_date as pe_completion_date,
|
||||
b.cbs_project_type as pe_cbs_project_type
|
||||
from enterprise_info a
|
||||
INNER JOIN project_enterprise b ON a.id = b.enterprise_id
|
||||
LEFT JOIN enterprise_type c ON b.enterprise_type_id = c.id
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user