#

luxiaotao1123

2020-06-19 e411967d48ce92ade3abea8a1ec2dba66d7e5297

#

 src/main/java/com/zy/asrs/controller/BasCrnStatusController.java

@@ -34,13 +34,15 @@
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false, defaultValue = "stsNo")String orderByField,
                  @RequestParam(required = false, defaultValue = "asc")String orderByType,
                  @RequestParam Map<String, Object> param){
        excludeTrash(param);
        EntityWrapper<BasCrnStatus> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("sts_no", true);
        }
        return R.ok(basCrnStatusService.selectPage(new Page<>(curr, limit), wrapper));
    }


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

@@ -22,7 +22,7 @@
    /**
     * 工作代号
     */
    @ApiModelProperty(value= "工作代号")
    @ApiModelProperty(value= "状态代号")
    @TableId(value = "sts_no", type = IdType.INPUT)
    @TableField("sts_no")
    private String stsNo;

 src/main/webapp/static/js/basCrnStatus/basCrnStatus.js

@@ -20,7 +20,7 @@
        cols: [[
            {type: 'checkbox', fixed: 'left'}
//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
            ,{field: 'stsNo', align: 'center', sort:true ,title: '工作代号'}
            ,{field: 'stsNo', align: 'center', sort:true ,title: '状态代号'}
            ,{field: 'stsDesc', align: 'center',title: '状态描述'}
            ,{field: 'modiUser$', align: 'center',title: '修改人员'}
            ,{field: 'modiTime$', align: 'center',title: '修改时间'}

 src/main/webapp/views/basCrnStatus/basCrnStatus.html

@@ -15,7 +15,7 @@
<!-- 搜索栏 -->
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <label class="layui-form-label">工作代号：</label>
        <label class="layui-form-label">状态代号：</label>
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="sts_no" placeholder="请输入" autocomplete="off">
        </div>

 src/main/webapp/views/basCrnStatus/basCrnStatus_detail.html

@@ -24,7 +24,7 @@
        </div>
    -->
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label"><span class="not-null">*</span>工作代号：</label>
            <label class="layui-form-label"><span class="not-null">*</span>状态代号：</label>
            <div class="layui-input-inline">
                <input id="stsNo" class="layui-input" type="text" onkeyup="check(this.id, 'basCrnStatus')">
            </div>