绑定holeCode

suerwei

2024-05-21 f9d8ff7173608dd073c15dd362267245d3bd063e

绑定holeCode

 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/ProjectData.java

@@ -7,131 +7,137 @@

/**
 * 项目资料对象 js_project_data
 * 
 *
 * @author cxy
 * @date 2024-05-16
 */
public class ProjectData extends BaseEntity
{
public class ProjectData extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /** 主键 */
    /**
     * 主键
     */
    private String id;

    /** 项目id */
    /**
     * 项目id
     */
    private String projectId;

    /** 钻孔id */
    private String holeId;
    /**
     * 钻孔Code
     */
    private String holeCode;

    /** 资料名称 */
    /**
     * 资料名称
     */
    @Excel(name = "资料名称")
    private String name;

    /** 资料类型 */
    /**
     * 资料类型
     */
    @Excel(name = "资料类型")
    private String dataType;

    /** 资料路径 */
    /**
     * 资料路径
     */
    private String dataUrl;

    /** 文件类型 */
    /**
     * 文件类型
     */
    @Excel(name = "文件类型")
    private String fileType;

    /** 标签 */
    /**
     * 标签
     */
    @Excel(name = "标签")
    private String labels;

    public void setId(String id) 
    {
    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public String getId() 
    {
        return id;
    public String getProjectId() {
        return projectId;
    }
    public void setProjectId(String projectId) 
    {

    public void setProjectId(String projectId) {
        this.projectId = projectId;
    }

    public String getProjectId() 
    {
        return projectId;
    }
    public void setHoleId(String holeId) 
    {
        this.holeId = holeId;
    public String getHoleCode() {
        return holeCode;
    }

    public String getHoleId() 
    {
        return holeId;
    public void setHoleCode(String holeCode) {
        this.holeCode = holeCode;
    }
    public void setName(String name) 
    {

    public void setName(String name) {
        this.name = name;
    }

    public String getName() 
    {
    public String getName() {
        return name;
    }
    public void setDataType(String dataType) 
    {

    public void setDataType(String dataType) {
        this.dataType = dataType;
    }

    public String getDataType() 
    {
    public String getDataType() {
        return dataType;
    }
    public void setDataUrl(String dataUrl) 
    {

    public void setDataUrl(String dataUrl) {
        this.dataUrl = dataUrl;
    }

    public String getDataUrl() 
    {
    public String getDataUrl() {
        return dataUrl;
    }
    public void setFileType(String fileType) 
    {

    public void setFileType(String fileType) {
        this.fileType = fileType;
    }

    public String getFileType() 
    {
    public String getFileType() {
        return fileType;
    }
    public void setLabels(String labels) 
    {

    public void setLabels(String labels) {
        this.labels = labels;
    }

    public String getLabels() 
    {
    public String getLabels() {
        return labels;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("projectId", getProjectId())
            .append("holeId", getHoleId())
            .append("name", getName())
            .append("dataType", getDataType())
            .append("dataUrl", getDataUrl())
            .append("fileType", getFileType())
            .append("labels", getLabels())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .append("remark", getRemark())
            .toString();
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                .append("id", getId())
                .append("projectId", getProjectId())
                .append("holeCode", getHoleCode())
                .append("name", getName())
                .append("dataType", getDataType())
                .append("dataUrl", getDataUrl())
                .append("fileType", getFileType())
                .append("labels", getLabels())
                .append("createBy", getCreateBy())
                .append("createTime", getCreateTime())
                .append("updateBy", getUpdateBy())
                .append("updateTime", getUpdateTime())
                .append("remark", getRemark())
                .toString();
    }
}

 javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectDataMapper.xml

@@ -7,7 +7,7 @@
    <resultMap type="ProjectData" id="ProjectDataResult">
        <result property="id"    column="id"    />
        <result property="projectId"    column="project_id"    />
        <result property="holeId"    column="hole_id"    />
        <result property="holeCode"    column="hole_code"    />
        <result property="name"    column="name"    />
        <result property="dataType"    column="data_type"    />
        <result property="dataUrl"    column="data_url"    />
@@ -21,14 +21,14 @@
    </resultMap>

    <sql id="selectProjectDataVo">
        select id, project_id, hole_id, name, data_type, data_url, file_type, labels, create_by, create_time, update_by, update_time, remark from js_project_data
        select id, project_id, hole_code, name, data_type, data_url, file_type, labels, create_by, create_time, update_by, update_time, remark from js_project_data
    </sql>

    <select id="selectProjectDataList" parameterType="ProjectData" resultMap="ProjectDataResult">
        <include refid="selectProjectDataVo"/>
        <where>
            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
            <if test="holeId != null  and holeId != ''"> and hole_id = #{holeId}</if>
            <if test="holeCode != null  and holeCode != ''"> and hole_code = #{holeCode}</if>
            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
            <if test="dataType != null  and dataType != ''"> and data_type = #{dataType}</if>
            <if test="fileType != null  and fileType != ''"> and file_type = #{fileType}</if>
@@ -46,7 +46,7 @@
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null  and id != ''">id,</if>
            <if test="projectId != null  and projectId != ''">project_id,</if>
            <if test="holeId != null  and holeId != ''">hole_id,</if>
            <if test="holeCode != null  and holeCode != ''">hole_code,</if>
            <if test="name != null  and name != ''">name,</if>
            <if test="dataType != null  and dataType != ''">data_type,</if>
            <if test="dataUrl != null  and dataUrl != ''">data_url,</if>
@@ -61,7 +61,7 @@
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null  and id != ''">#{id},</if>
            <if test="projectId != null  and projectId != ''">#{projectId},</if>
            <if test="holeId != null  and holeId != ''">#{holeId},</if>
            <if test="holeCode != null  and holeCode != ''">#{holeCode},</if>
            <if test="name != null  and name != ''">#{name},</if>
            <if test="dataType != null  and dataType != ''">#{dataType},</if>
            <if test="dataUrl != null  and dataUrl != ''">#{dataUrl},</if>
@@ -79,7 +79,7 @@
        update js_project_data
        <trim prefix="SET" suffixOverrides=",">
            <if test="projectId != null  and projectId != ''">project_id = #{projectId},</if>
            <if test="holeId != null  and holeId != ''">hole_id = #{holeId},</if>
            <if test="holeCode != null  and holeCode != ''">hole_code = #{holeCode},</if>
            <if test="name != null  and name != ''">name = #{name},</if>
            <if test="dataType != null  and dataType != ''">data_type = #{dataType},</if>
            <if test="dataUrl != null  and dataUrl != ''">data_url = #{dataUrl},</if>

 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/add.html

@@ -6,12 +6,18 @@
<body class="white-bg">
    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
        <form class="form-horizontal m" id="form-projectData-add">
            <div class="form-group">    
            <div class="form-group">
                <label class="col-sm-3 control-label">资料名称：</label>
                <div class="col-sm-8">
                    <input name="name" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">钻孔编号：</label>
                <div class="col-sm-8">
                    <input name="holeCode" class="form-control" type="text">
                </div>
            </div>
<!--            <div class="form-group">-->
<!--                <label class="col-sm-3 control-label">资料类型：</label>-->
<!--                <div class="col-sm-8">-->

 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/edit.html

@@ -7,12 +7,18 @@
    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
        <form class="form-horizontal m" id="form-projectData-edit" th:object="${projectData}">
            <input name="id" th:field="*{id}" type="hidden">
            <div class="form-group">    
            <div class="form-group">
                <label class="col-sm-3 control-label">资料名称：</label>
                <div class="col-sm-8">
                    <input name="name" th:field="*{name}" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">钻孔编号：</label>
                <div class="col-sm-8">
                    <input name="holeCode" th:field="*{holeCode}" class="form-control" type="text">
                </div>
            </div>
<!--            <div class="form-group">    -->
<!--                <label class="col-sm-3 control-label">资料类型：</label>-->
<!--                <div class="col-sm-8">-->

 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData.html

@@ -15,6 +15,10 @@
                                <input type="text" name="name"/>
                            </li>
                            <li>
                                <p>钻孔编号：</p>
                                <input type="text" name="holeCode"/>
                            </li>
                            <li>
                                <p>标签：</p>
                                <input type="text" name="labels"/>
                            </li>
@@ -76,6 +80,10 @@
                    field : 'name',
                    title : '资料名称'
                },
                    {
                        field : 'holeCode',
                        title : '钻孔编号'
                    },
                {
                    field : 'labels', 
                    title : '标签'

 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData2.html

@@ -15,6 +15,10 @@
                                <input type="text" name="name"/>
                            </li>
                            <li>
                                <p>钻孔编号：</p>
                                <input type="text" name="holeCode"/>
                            </li>
                            <li>
                                <p>业务类型：</p>
                                <select name="fileType" th:with="type=${@dict.getType('project_data_file_type')}">
                                    <option value="">所有</option>
@@ -82,6 +86,10 @@
                    field : 'name',
                    title : '资料名称'
                },
                    {
                        field : 'holeCode',
                        title : '钻孔编号'
                    },
                {
                    field : 'fileType',
                    title : '业务类型',