任务信息显示码盘信息

pang.jiabao

1 天以前 1195089a2f65e8773ef74f3d369d8f2ff1dd3f34

任务信息显示码盘信息

 src/main/java/com/zy/asrs/entity/TaskWrk.java

@@ -190,6 +190,7 @@
    @TableField("lev")
    private short lev;

    // 码盘完成上报 默认0.未上报，1.已上报
    @TableField("mp_completed_report")
    private Integer mpCompletedReport;

@@ -263,6 +264,20 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
    }

    public String getMp$() {
        if(Cools.isEmpty(this.mp)) {
            return "";
        }
        return this.mp == 1 ? "Y" : "N";
    }

    public String getMpCompletedReport$() {
        if(Cools.isEmpty(this.mpCompletedReport)) {
            return "";
        }
        return this.mpCompletedReport == 1 ? "Y" : "N";
    }

    public String getIoType$() {
        BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
        BasWrkIotype basWrkIotype = service.selectById(this.ioType);

 src/main/java/com/zy/asrs/entity/TaskWrkLog.java

@@ -183,6 +183,20 @@
    @TableField("mp_completed_report")
    private Integer mpCompletedReport;

    public String getMp$() {
        if(Cools.isEmpty(this.mp)) {
            return "";
        }
        return this.mp == 1 ? "Y" : "N";
    }

    public String getMpCompletedReport$() {
        if(Cools.isEmpty(this.mpCompletedReport)) {
            return "";
        }
        return this.mpCompletedReport == 1 ? "Y" : "N";
    }

    public TaskWrkLog() {
    }


 src/main/webapp/views/taskWrk/taskWrk.html

@@ -90,6 +90,12 @@
                        </el-table-column>
                        <el-table-column property="memo" label="备注">
                        </el-table-column>
                        <el-table-column property="mp$" label="码盘否">
                        </el-table-column>
                        <el-table-column property="lev" label="码盘层数">
                        </el-table-column>
                        <el-table-column property="mpCompletedReport$" label="码盘上报">
                        </el-table-column>
                    </el-table>

                    <div style="margin-top: 10px;">

 src/main/webapp/views/taskWrkLog/taskWrkLog.html

@@ -73,6 +73,12 @@
                        </el-table-column>
                        <el-table-column property="type" label="下降高度">
                        </el-table-column>
                        <el-table-column property="mp$" label="码盘否">
                        </el-table-column>
                        <el-table-column property="lev" label="码盘层数">
                        </el-table-column>
                        <el-table-column property="mpCompletedReport$" label="码盘上报">
                        </el-table-column>
                    </el-table>

                    <div style="margin-top: 10px;">