#

luxiaotao1123

2022-11-24 72f84864736d4fb8edde5ccf057b9d15c241dcb6

#

 src/main/java/com/zy/crm/common/model/SettleDto.java

@@ -60,6 +60,8 @@
                    break;
                case 5:
                    dto.setTitle("审批通过");
                    dto.setUserId(plan.getUserId());
                    dto.setUsername(plan.getUserId$());
                    list.add(dto);
                    break;
                default:

 src/main/java/com/zy/crm/manager/entity/PlanType.java

@@ -73,6 +73,12 @@
    private String html;

    /**
     * 区分 1: 货架  0: 继承
     */
    @ApiModelProperty(value= "区分 1: 货架  0: 继承  ")
    private Integer type;

    /**
     * 状态 1: 正常  0: 禁用
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 禁用  ")
@@ -153,6 +159,18 @@
        return null;
    }

    public String getType$(){
        if (null == this.type){ return null; }
        switch (this.type){
            case 1:
                return "货架";
            case 2:
                return "集成";
            default:
                return String.valueOf(this.type);
        }
    }

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){

 src/main/resources/mapper/PlanTypeMapper.xml

@@ -11,6 +11,7 @@
        <result column="form_id" property="formId" />
        <result column="data" property="data" />
        <result column="html" property="html" />
        <result column="type" property="type" />
        <result column="status" property="status" />
        <result column="create_by" property="createBy" />
        <result column="create_time" property="createTime" />

 src/main/webapp/views/planType/planType.html

@@ -91,6 +91,16 @@
                </div>
            </div>
            <div class="layui-form-item">
                <label class="layui-form-label layui-form-required">区分: </label>
                <div class="layui-input-block">
                    <select name="type" lay-verType="tips" lay-verify="required" required>
                        <option value="">请选择区分</option>
                        <option value="1">货架</option>
                        <option value="2">集成</option>
                    </select>
                </div>
            </div>
            <div class="layui-form-item">
                <label class="layui-form-label">类型标识</label>
                <div class="layui-input-block">
                    <input class="layui-input" name="flag" placeholder="请输入标识"/>
@@ -165,7 +175,8 @@
                {type: 'numbers', title: '#'}
                // ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
                ,{field: 'name', align: 'center',title: '类型名称'}
                ,{field: 'flag', align: 'center',title: '类型标识'}
                ,{field: 'type$', align: 'center',title: '区分'}
                // ,{field: 'flag', align: 'center',title: '类型标识'}
                // ,{field: 'createTime$', align: 'center',title: '添加时间'}
                // ,{field: 'status$', align: 'center',title: '状态'}
                // ,{field: 'createTime$', align: 'center',title: '添加时间'}