提交代码

zmk

2024-05-18 cf614786f177f2b426f1c08e9a5870d05e2d203d

提交代码

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

@@ -98,17 +98,15 @@
    @Excel(name = "无法定位的原因")
    private String reason;

    /** 现场拍照1 */
    @Excel(name = "现场拍照1")
    private String pic1;

    /** 现场拍照2 */
    @Excel(name = "现场拍照2")
    private String pic2;
    /** 当前进度  footageCpl/footage */
    private Double rate;

    /** 现场拍照3 */
    @Excel(name = "现场拍照3")
    private String pic3;
    /** 总进尺 */
    private Double footage;

    /** 已完成进尺 */
    private Double footageCpl;

    /** 钻孔状态 */
    @Excel(name = "钻孔状态")
@@ -120,6 +118,31 @@

    /** 是否被异常扫描（0-未扫描，1-已扫描） */
    private String isFlag;

    public Double getRate() {
        return rate;
    }

    public void setRate(Double rate) {
        this.rate = rate;
    }

    public Double getFootage() {
        return footage;
    }

    public void setFootage(Double footage) {
        this.footage = footage;
    }

    public Double getFootageCpl() {
        return footageCpl;
    }

    public void setFootageCpl(Double footageCpl) {
        this.footageCpl = footageCpl;
    }


    public void setIds(String ids) 
    {
@@ -301,33 +324,7 @@
    {
        return reason;
    }
    public void setPic1(String pic1) 
    {
        this.pic1 = pic1;
    }

    public String getPic1() 
    {
        return pic1;
    }
    public void setPic2(String pic2) 
    {
        this.pic2 = pic2;
    }

    public String getPic2() 
    {
        return pic2;
    }
    public void setPic3(String pic3) 
    {
        this.pic3 = pic3;
    }

    public String getPic3() 
    {
        return pic3;
    }
    public void setStatus(String status) 
    {
        this.status = status;
@@ -380,9 +377,9 @@
            .append("position", getPosition())
            .append("locateTime", getLocateTime())
            .append("reason", getReason())
            .append("pic1", getPic1())
            .append("pic2", getPic2())
            .append("pic3", getPic3())
            .append("rate", getRate())
            .append("footage", getFootage())
            .append("footageCpl", getFootageCpl())
            .append("status", getStatus())
            .append("isDeleted", getIsDeleted())
            .append("isFlag", getIsFlag())

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

@@ -27,16 +27,16 @@
        <result property="position"    column="position"    />
        <result property="locateTime"    column="locate_time"    />
        <result property="reason"    column="reason"    />
        <result property="pic1"    column="pic1"    />
        <result property="pic2"    column="pic2"    />
        <result property="pic3"    column="pic3"    />
        <result property="rate"    column="rate"    />
        <result property="footage"    column="footage"    />
        <result property="footageCpl"    column="footage_cpl"    />
        <result property="status"    column="status"    />
        <result property="isDeleted"    column="is_deleted"    />
        <result property="isFlag"    column="is_flag"    />
    </resultMap>

    <sql id="selectHoleVo">
        select ids, project_id, code, create_time, update_time, description, type, elevation, depth, longitude, latitude, survey_x, survey_y, survey_z, survey_latitude, survey_longitude, map_latitude, map_longitude, map_time, position, locate_time, reason, pic1, pic2, pic3, status, is_deleted, is_flag from js_hole
        select ids, project_id, code, create_time, update_time, description, type, elevation, depth, longitude, latitude, survey_x, survey_y, survey_z, survey_latitude, survey_longitude, map_latitude, map_longitude, map_time, position, locate_time, reason, rate, footage, footage_cpl, status, is_deleted, is_flag from js_hole
    </sql>

    <select id="selectHoleList" parameterType="Hole" resultMap="HoleResult">
@@ -61,9 +61,7 @@
            <if test="position != null  and position != ''"> and position = #{position}</if>
            <if test="locateTime != null "> and locate_time = #{locateTime}</if>
            <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
            <if test="pic1 != null  and pic1 != ''"> and pic1 = #{pic1}</if>
            <if test="pic2 != null  and pic2 != ''"> and pic2 = #{pic2}</if>
            <if test="pic3 != null  and pic3 != ''"> and pic3 = #{pic3}</if>

            <if test="status != null  and status != ''"> and status = #{status}</if>
            <if test="isDeleted != null  and isDeleted != ''"> and is_deleted = #{isDeleted}</if>
            <if test="isFlag != null  and isFlag != ''"> and is_flag = #{isFlag}</if>
@@ -126,9 +124,9 @@
            <if test="position != null  and position != ''">position,</if>
            <if test="locateTime != null ">locate_time,</if>
            <if test="reason != null  and reason != ''">reason,</if>
            <if test="pic1 != null  and pic1 != ''">pic1,</if>
            <if test="pic2 != null  and pic2 != ''">pic2,</if>
            <if test="pic3 != null  and pic3 != ''">pic3,</if>
            <if test="rate != null">rate,</if>
            <if test="footage != null">footage,</if>
            <if test="footageCpl != null">footage_cpl,</if>
            <if test="status != null  and status != ''">status,</if>
            <if test="isDeleted != null  and isDeleted != ''">is_deleted,</if>
            <if test="isFlag != null  and isFlag != ''">is_flag,</if>
@@ -156,9 +154,9 @@
            <if test="position != null  and position != ''">#{position},</if>
            <if test="locateTime != null ">#{locateTime},</if>
            <if test="reason != null  and reason != ''">#{reason},</if>
            <if test="pic1 != null  and pic1 != ''">#{pic1},</if>
            <if test="pic2 != null  and pic2 != ''">#{pic2},</if>
            <if test="pic3 != null  and pic3 != ''">#{pic3},</if>
            <if test="rate != null">#{rate},</if>
            <if test="footage != null">#{footage},</if>
            <if test="footageCpl != null">#{footageCpl},</if>
            <if test="status != null  and status != ''">#{status},</if>
            <if test="isDeleted != null  and isDeleted != ''">#{isDeleted},</if>
            <if test="isFlag != null  and isFlag != ''">#{isFlag},</if>
@@ -189,9 +187,9 @@
            <if test="position != null  and position != ''">position = #{position},</if>
            <if test="locateTime != null ">locate_time = #{locateTime},</if>
            <if test="reason != null  and reason != ''">reason = #{reason},</if>
            <if test="pic1 != null  and pic1 != ''">pic1 = #{pic1},</if>
            <if test="pic2 != null  and pic2 != ''">pic2 = #{pic2},</if>
            <if test="pic3 != null  and pic3 != ''">pic3 = #{pic3},</if>
            <if test="rate != null">rate = #{rate},</if>
            <if test="footage != null">footage = #{footage},</if>
            <if test="footageCpl != null">footage_cpl = #{footageCpl},</if>
            <if test="status != null  and status != ''">status = #{status},</if>
            <if test="isDeleted != null  and isDeleted != ''">is_deleted = #{isDeleted},</if>
            <if test="isFlag != null  and isFlag != ''">is_flag = #{isFlag},</if>

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

@@ -38,11 +38,12 @@
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">进度：</label>
                <label class="col-sm-3 control-label">总进尺：</label>
                <div class="col-sm-8">
                    <input name="pic1" class="form-control" type="text" placeholder="请输入进度数字（例：10代表10%）">
                    <input name="footage" class="form-control" type="text" placeholder="请输入总进尺">
                </div>
            </div>

        </form>
    </div>
    <th:block th:include="include :: footer" />

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

@@ -48,9 +48,15 @@
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">进度：</label>
                <label class="col-sm-3 control-label">总进尺（m）：</label>
                <div class="col-sm-8">
                    <input name="pic1" th:field="*{pic1}" class="form-control" type="text" placeholder="请输入进度数字（例：10代表10%）">
                    <input name="footage" th:field="*{footage}" class="form-control" type="text" placeholder="请输入总进尺,单位（m）">
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">已完成进尺（m）：</label>
                <div class="col-sm-8">
                    <input name="footageCpl" th:field="*{footageCpl}" class="form-control" type="text" placeholder="请输入已完成进尺,单位（m）">
                </div>
            </div>
        </form>

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

@@ -110,7 +110,7 @@
                    }
                },
                    {
                        field : 'pic1',
                        field : 'rate',
                        title : '进度',
                    },
                {