修改查询

yj

2021-06-01 7b2e386b48ad6cb12225739fc205c2f318f8a3cd

修改查询

 app/src/main/resources/static/views/lijin/provider-add.html

@@ -69,8 +69,8 @@
                <label for="phone" class="layui-form-label">
                    联系电话</label>
                <div class="layui-input-inline">
                    <input type="text" id="phone" name="phone"  lay-verify="phone"
                           autocomplete="off" class="layui-input"></div>
                    <input type="text" id="phone" name="phone" autocomplete="off" class="layui-input">
                </div>
            </div>

            <div class="layui-form-item">
@@ -94,27 +94,6 @@
        $ = layui.jquery;
        var form = layui.form,
            layer = layui.layer;

        // //自定义验证规则
        // form.verify({
        //     username: function (value) {
        //         if (value.length < 3) {
        //             return '应用名称至少得3个字符啊';
        //         }
        //     },
        //     appcode: [/^([A-Za-z0-9]|\-|_)+$/, '应用标识只能包含 数字、英文字符、_ 、-'],
        //     desc: function (value) {
        //         if (value != null && value.length > 128) {
        //             return '简介最大为128个字符';
        //         }
        //     },
        //     remarks: function (value) {
        //         if (value != null && value.length > 128) {
        //             return '备注最大为128个字符';
        //         }
        //     },
        //
        // });

        //监听提交
        form.on('submit(add)',

 app/src/main/resources/static/views/lijin/provider-list.html

@@ -51,15 +51,16 @@
                <div class="layui-card-body ">
                    <form class="layui-form layui-col-space5" id="searchForm">
                        <div class="layui-inline layui-show-xs-block">
                            <input class="layui-input" autocomplete="off" placeholder="开始日" name="start" id="start"
                                   :value="start">
                            <input class="layui-input" autocomplete="off" placeholder="供应商名称" name="name" id="name"
                                   :value="name">
                        </div>
                        <div class="layui-inline layui-show-xs-block">
                            <input class="layui-input" autocomplete="off" placeholder="截止日" name="end" id="end"
                                   :value="end"></div>
                        <div class="layui-inline layui-show-xs-block">
                            <input type="text" name="appname" placeholder="请输入应用名称" :value="key" autocomplete="off"
                                   class="layui-input"></div>
                            <select id="state" name="state" class="layui-select">
                                <option value="">--选择状态--</option>
                                <option value="1">启用</option>
                                <option value="0">停用</option>
                            </select>
                        </div>
                        <div class="layui-inline layui-show-xs-block">
                            <button class="layui-btn" lay-submit="" lay-filter="sreach">搜索</button>
                        </div>
@@ -105,7 +106,7 @@
</script>

<script type="text/html" id="dateFomat">
    <div>{{layui.util.toDateString(d.updateTime, 'yyyy-MM-dd HH:mm:ss')}}</div>
    <div>{{d.updateTime == null?'':layui.util.toDateString(d.updateTime, 'yyyy-MM-dd HH:mm:ss')}}</div>
</script>



 app/src/main/resources/static/views/lijin/providerAccount-add.html

@@ -44,6 +44,15 @@
                    <input type="text" id="accountName" name="accountName" required="" lay-verify="accountName" autocomplete="off"
                           class="layui-input"></div>
            </div>

            <div class="layui-form-item">
                <label for="pid" class="layui-form-label">
                    <span class="x-red">*</span>pid</label>
                <div class="layui-input-inline">
                    <input type="text" id="pid" name="pid" required="" lay-verify="pid"
                           autocomplete="off" class="layui-input"></div>
            </div>

            <div class="layui-form-item">
                <label for="appKey" class="layui-form-label">
                    <span class="x-red">*</span>appKey</label>

 app/src/main/resources/static/views/lijin/providerAccount-list.html

@@ -52,15 +52,16 @@
                    <form class="layui-form layui-col-space5" id="searchForm">
                        <input type="text" name="providerId" id="providerId" style="display: none;"/>
                        <div class="layui-inline layui-show-xs-block">
                            <input class="layui-input" autocomplete="off" placeholder="开始日" name="start" id="start"
                                   :value="start">
                            <input class="layui-input" autocomplete="off" placeholder="账号名称" name="accountName" id="accountName"
                                   :value="accountName">
                        </div>
                        <div class="layui-inline layui-show-xs-block">
                            <input class="layui-input" autocomplete="off" placeholder="截止日" name="end" id="end"
                                   :value="end"></div>
                        <div class="layui-inline layui-show-xs-block">
                            <input type="text" id="key" name="key" placeholder="请输入应用名称" :value="key" autocomplete="off"
                                   class="layui-input"></div>
                            <select id="state" name="state" class="layui-select">
                                <option value="">--选择状态--</option>
                                <option value="1">启用</option>
                                <option value="0">停用</option>
                            </select>
                        </div>
                        <div class="layui-inline layui-show-xs-block">
                            <button class="layui-btn" lay-submit="" lay-filter="sreach">搜索</button>
                        </div>
@@ -166,7 +167,7 @@
            }
        });

        var url = "/admin/api/lijin/providerLink/listByPage?pageSize=20";
        var url = "/admin/api/lijin/providerAccount/listByPage?pageSize=20";
        if (providerId != null && providerId != undefined) {
            url = url + "&providerId="+ providerId;
        }
@@ -185,12 +186,15 @@
                    {field: 'id', width: 80, sort: true, title: "ID"},
                    {field: 'state', width: 95, title: "状态", templet: "#switchTpl"},
                    {field: 'accountName',edit: 'text', width: 200, sort: true, title: "账号名称"},
                    {field: 'pid', edit: 'text', width: 200, title: "pid"},
                    {field: 'appKey', edit: 'text', width: 200, title: "APPKey"},
                    {field: 'appSecret', edit: 'text', width: 200, title: "APPSecret"},
                    {field: 'maxMoney', edit: 'text', width: 120, title: "每日最大金额"},
                    {field: 'maxNumber', edit: 'text', width: 120,title: "每日最大商品数"},
                    {field: 'todayConsumeMoney', width: 120, title: "今日已用金额"},
                    {field: 'todayConsumeNumber',  width: 120,title: "今日已用商品数"},
                    {field: 'errorCode',  width: 120,title: "错误码"},
                    {field: 'errorMsg',  width: 120,title: "错误内容"},
                    {fixed: 'right', width: 150, title: "操作", toolbar: '#barAction'},
                ]
            ],

 app/src/main/resources/static/views/lijin/providerLink-list.html

@@ -52,15 +52,19 @@
                    <form class="layui-form layui-col-space5" id="searchForm">
                        <input type="text" name="providerId" id="providerId" style="display: none;"/>
                        <div class="layui-inline layui-show-xs-block">
                            <input class="layui-input" autocomplete="off" placeholder="开始日" name="start" id="start"
                                   :value="start">
                            <select id="type" name="type" class="layui-select">
                                <option value="">-请选择类型-</option>
                                <option value="TB">淘宝</option>
                                <option value="JD">京东</option>
                            </select>
                        </div>
                        <div class="layui-inline layui-show-xs-block">
                            <input class="layui-input" autocomplete="off" placeholder="截止日" name="end" id="end"
                                   :value="end"></div>
                        <div class="layui-inline layui-show-xs-block">
                            <input type="text" name="appname" placeholder="请输入应用名称" :value="key" autocomplete="off"
                                   class="layui-input"></div>
                            <select id="state" name="state" class="layui-select">
                                <option>--选择状态--</option>
                                <option value="1">启用</option>
                                <option value="0">停用</option>
                            </select>
                        </div>
                        <div class="layui-inline layui-show-xs-block">
                            <button class="layui-btn" lay-submit="" lay-filter="sreach">搜索</button>
                        </div>
@@ -122,15 +126,19 @@


<script type="text/html" id="effectTimeFomat">
    <div>{{layui.util.toDateString(d.effectTime, 'yyyy-MM-dd HH:mm:ss')}}</div>
    <div>{{d.effectTime == null?'':layui.util.toDateString(d.effectTime, 'yyyy-MM-dd HH:mm:ss')}}</div>
</script>

<script type="text/html" id="expireTimeFomat">
    <div>{{layui.util.toDateString(d.expireTime, 'yyyy-MM-dd HH:mm:ss')}}</div>
    <div>{{d.expireTime == null?'':layui.util.toDateString(d.expireTime, 'yyyy-MM-dd HH:mm:ss')}}</div>
</script>

<script type="text/html" id="dateFomat">
    <div>{{layui.util.toDateString(d.updateTime, 'yyyy-MM-dd HH:mm:ss')}}</div>
    <div>{{d.updateTime == null?'':layui.util.toDateString(d.updateTime, 'yyyy-MM-dd HH:mm:ss')}}</div>
</script>

<script type="text/html" id="typelook">
    <div>{{d.type == 'TB'?'淘宝':'京东'}}</div>
</script>

<script>
@@ -213,9 +221,9 @@
            cols: [
                [{type: 'checkbox', title: "ID"},
                    {field: 'id', width: 80, sort: true, title: "ID"},
                    {field: 'type',  sort: true, width: 100, title: "链接类型", templet:"#typelook"},
                    {field: 'state', width: 95, title: "状态", templet: "#switchState"},
                    {field: 'link',edit: 'text',width: 250, overflow: 'hidden', title: "链接"},
                    {field: 'type', edit: 'text', sort: true, width: 100, title: "链接类型"},
                    {field: 'money', edit: 'text', width: 100, title: "礼金金额"},
                    {field: 'effectTime', edit: 'text', width: 140, title: "生效时间" , templet:"#effectTimeFomat"},
                    {field: 'expireTime', edit: 'text', width: 140,title: "到期时间", templet:"#expireTimeFomat"},

 app/src/main/resources/static/views/vip/combo-list.html

@@ -51,15 +51,16 @@
                <div class="layui-card-body ">
                    <form class="layui-form layui-col-space5" id="searchForm">
                        <div class="layui-inline layui-show-xs-block">
                            <input class="layui-input" autocomplete="off" placeholder="开始日" name="startDate" id="startDate"
                                   :value="start">
                            <input class="layui-input" autocomplete="off" placeholder="套餐名称" name="name" id="name"
                                   :value="name">
                        </div>
                        <div class="layui-inline layui-show-xs-block">
                            <input class="layui-input" autocomplete="off" placeholder="截止日" name="startDate" id="startDate"
                                   :value="end"></div>
                        <div class="layui-inline layui-show-xs-block">
                            <input type="text" name="key" placeholder="请输入应用名称" :value="key" autocomplete="off"
                                   class="layui-input"></div>
                            <select id="state" name="state" class="layui-select">
                                <option value="">--选择状态--</option>
                                <option value="1">启用</option>
                                <option value="0">停用</option>
                            </select>
                        </div>
                        <div class="layui-inline layui-show-xs-block">
                            <button class="layui-btn" lay-submit="" lay-filter="sreach">搜索</button>
                        </div>

 app/src/main/resources/static/views/vip/grade-list.html

@@ -51,15 +51,16 @@
                <div class="layui-card-body ">
                    <form class="layui-form layui-col-space5" id="searchForm">
                        <div class="layui-inline layui-show-xs-block">
                            <input class="layui-input" autocomplete="off" placeholder="开始日" name="start" id="start"
                                   :value="start">
                            <input class="layui-input" autocomplete="off" placeholder="等级名称" name="name" id="name"
                                   :value="name">
                        </div>
                        <div class="layui-inline layui-show-xs-block">
                            <input class="layui-input" autocomplete="off" placeholder="截止日" name="end" id="end"
                                   :value="end"></div>
                        <div class="layui-inline layui-show-xs-block">
                            <input type="text" name="appname" placeholder="请输入应用名称" :value="key" autocomplete="off"
                                   class="layui-input"></div>
                            <select id="state" name="state" class="layui-select">
                                <option value="">--选择状态--</option>
                                <option value="1">启用</option>
                                <option value="0">停用</option>
                            </select>
                        </div>
                        <div class="layui-inline layui-show-xs-block">
                            <button class="layui-btn" lay-submit="" lay-filter="sreach">搜索</button>
                        </div>

 app/src/main/resources/static/views/vip/gradePotence-list.html

@@ -48,25 +48,16 @@
    <div class="layui-row layui-col-space15">
        <div class="layui-col-md12">
            <div class="layui-card">
                <div class="layui-card-body ">
                <!--<div class="layui-card-body ">
                    <form class="layui-form layui-col-space5" id="searchForm">
                        <input type="text" name="gradeId" id="gradeId" style="display: none;"/>

                        <div class="layui-inline layui-show-xs-block">
                            <input class="layui-input" autocomplete="off" placeholder="开始日" name="start" id="start"
                                   :value="start">
                        </div>
                        <div class="layui-inline layui-show-xs-block">
                            <input class="layui-input" autocomplete="off" placeholder="截止日" name="end" id="end"
                                   :value="end"></div>
                        <div class="layui-inline layui-show-xs-block">
                            <input type="text" name="appname" placeholder="请输入应用名称" :value="key" autocomplete="off"
                                   class="layui-input"></div>

                        <div class="layui-inline layui-show-xs-block">
                            <button class="layui-btn" lay-submit="" lay-filter="sreach">搜索</button>
                        </div>
                    </form>
                </div>
                </div>-->
                <div class="layui-card-body ">
                    <table class="layui-table" id="table_list" lay-filter="app">
                    </table>
@@ -105,22 +96,6 @@
</script>



<script>
    layui.use('laydate',
    function () {
        var laydate = layui.laydate;
        //执行一个laydate实例
        laydate.render({
            elem: '#start' //指定元素
        });
        //执行一个laydate实例
        laydate.render({
            elem: '#end' //指定元素
        });
    });
</script>

<script>

    var gradeId= GetQueryString("pid"); // 上级did
@@ -134,8 +109,6 @@
        return null;
    }
    $("#gradeId").val(gradeId);




    function openAddViews() {
@@ -277,5 +250,9 @@
        });


    });</script>

    });


</script>
</html>

 app/src/main/resources/static/views/vip/vipCenter-list.html

@@ -57,15 +57,9 @@
                <div class="layui-card-body ">
                    <form class="layui-form layui-col-space5" id="searchForm">
                        <div class="layui-inline layui-show-xs-block">
                            <input class="layui-input" autocomplete="off" placeholder="开始日" name="start" id="start"
                                   :value="start">
                            <input class="layui-input" autocomplete="off" placeholder="用户ID" name="uid" id="uid"
                                   >
                        </div>
                        <div class="layui-inline layui-show-xs-block">
                            <input class="layui-input" autocomplete="off" placeholder="截止日" name="end" id="end"
                                   :value="end"></div>
                        <div class="layui-inline layui-show-xs-block">
                            <input type="text" name="appname" placeholder="请输入应用名称" :value="key" autocomplete="off"
                                   class="layui-input"></div>
                        <div class="layui-inline layui-show-xs-block">
                            <button class="layui-btn" lay-submit="" lay-filter="sreach">搜索</button>
                        </div>
@@ -82,7 +76,7 @@
</body>
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn" onclick="xadmin.open('添加等级','combo-add22.html',500,480)"><i class="layui-icon"></i>添加
        <button class="layui-btn" onclick="xadmin.open('添加等级','vipCenter-add.html',500,480)"><i class="layui-icon"></i>添加
        </button>
    </div>
</script>

 service-lijin/src/main/java/com/ks/lijin/query/ProviderLinkQuery.java

@@ -10,7 +10,10 @@
    //状态
    public Integer state;


    public String type;

    // 名称
    public String name;
    public String link;

}

 service-lijin/src/main/java/com/ks/lijin/service/remote/LiJinProviderAccountServiceImpl.java

@@ -22,6 +22,7 @@
        ProviderAccountQuery query = new ProviderAccountQuery();
        query.id = obj.getId();
        query.state = obj.getState();
        query.name = obj.getAccountName();
        query.providerId = obj.getProviderId();
        query.appKey = obj.getAppKey();
        query.appSecret = obj.getAppSecret();
@@ -34,6 +35,7 @@
        ProviderAccountQuery query = new ProviderAccountQuery();
        query.id = obj.getId();
        query.state = obj.getState();
        query.name = obj.getAccountName();
        query.providerId = obj.getProviderId();
        query.appKey = obj.getAppKey();
        query.appSecret = obj.getAppSecret();

 service-lijin/src/main/java/com/ks/lijin/service/remote/LiJinProviderLinkServiceImpl.java

@@ -25,8 +25,10 @@
    @Override
    public long count(LiJinProviderLink obj) {
        ProviderLinkQuery query = new ProviderLinkQuery();
//        query.appId = appId;
//        query.uid = uid;
        query.link = obj.getLink();
        query.type = obj.getType();
        query.state = obj.getState();
        query.id = obj.getId();
        return liJinProviderLinkMapper.count(query);
    }

@@ -34,9 +36,10 @@
    @Override
    public List<LiJinProviderLink> listByPage(int page, int pageSize, LiJinProviderLink obj) {
        ProviderLinkQuery query = new ProviderLinkQuery();
//        query.appId = appId;
//        query.uid = uid;
//        query.drawStateList = Arrays.asList(new Integer[]{LuckyActivityJoinRecord.DRAW_STATE_UNOPEN});
        query.link = obj.getLink();
        query.type = obj.getType();
        query.state = obj.getState();
        query.id = obj.getId();
        query.start = (page - 1) * pageSize;
        query.count = pageSize;
        return liJinProviderLinkMapper.listByPage(query);

 service-lijin/src/main/java/com/ks/lijin/service/remote/LiJinProviderServiceImpl.java

@@ -21,8 +21,9 @@
    @Override
    public long count(LiJinProvider provider) {
        ProviderQuery query = new ProviderQuery();
//        query.appId = appId;
//        query.uid = uid;
        query.id = provider.getId();
        query.name = provider.getName();
        query.state = provider.getState();
        return liJinProviderMapper.count(query);
    }

@@ -30,9 +31,9 @@
    @Override
    public List<LiJinProvider> listByPage(int page, int pageSize, LiJinProvider provider) {
        ProviderQuery query = new ProviderQuery();
//        query.appId = appId;
//        query.uid = uid;
//        query.drawStateList = Arrays.asList(new Integer[]{LuckyActivityJoinRecord.DRAW_STATE_UNOPEN});
        query.id = provider.getId();
        query.name = provider.getName();
        query.state = provider.getState();
        query.start = (page - 1) * pageSize;
        query.count = pageSize;
        return liJinProviderMapper.listByPage(query);

 service-lijin/src/main/resources/mapper/LiJinProviderLinkMapper.xml

@@ -73,7 +73,8 @@
  <!-- 非模板 -->
  <sql id="listWhere">
    <if test="query.id!=null">and lk_id=#{query.id}</if>
    <if test="query.name!=null">and lk_link=#{query.name}</if>
    <if test="query.link!=null and query.link!='' ">and lk_link like "%"#{query.link}"%"</if>
    <if test="query.type!=null and query.type!=''">and lk_type=#{query.type}</if>
    <if test="query.state!=null">and lk_state=#{query.state}</if>
  </sql>


 service-lijin/src/main/resources/mapper/LiJinProviderMapper.xml

@@ -73,7 +73,7 @@
  <!-- 非模板 -->
  <sql id="listWhere">
    <if test="query.id!=null">and pv_id=#{query.id}</if>
    <if test="query.name!=null">and pv_name=#{query.name}</if>
    <if test="query.name!=null and query.name!='' ">and pv_name like "%"#{query.name}"%"</if>
    <if test="query.state!=null">and pv_state=#{query.state}</if>
  </sql>


 service-lijin/src/main/resources/mapper/LiJinProviderTaoKeAccountMapper.xml

@@ -101,7 +101,7 @@
    <!-- 非模板 -->
    <sql id="listWhere">
        <if test="query.id!=null">and ac_id=#{query.id}</if>
        <if test="query.name!=null">and ac_account_name=#{query.name}</if>
        <if test="query.name!=null and query.name!='' ">and ac_account_name like "%"#{query.name}"%"</if>
        <if test="query.providerId!=null">and ac_provider_id=#{query.providerId}</if>
        <if test="query.state!=null">and ac_state=#{query.state}</if>
        <if test="query.appKey!=null">and ac_app_key=#{query.appKey}</if>

 service-vip/src/main/java/com/ks/vip/query/VipGradePotenceQuery.java

@@ -3,10 +3,14 @@

import com.ks.lijin.query.BaseDaoQuery;

import java.util.Date;

public class VipGradePotenceQuery extends BaseDaoQuery {
    // id
    public Long id;

    public Date effectiveTime;

    // gradeId
    public Long gradeId;


 service-vip/src/main/java/com/ks/vip/service/remote/VipComboServiceImpl.java

@@ -47,8 +47,10 @@
    @Override
    public long count(VipCombo t) {
        VipComboQuery query = new VipComboQuery();
//        query.appId = appId;
//        query.uid = uid;
        query.state = t.getState();
        query.id = t.getId();
        query.name = t.getName();
        query.gradeId = t.getGradeId();
        return vipComboMapper.count(query);
    }

@@ -56,9 +58,10 @@
    @Override
    public List<VipCombo> listByPage(int page, int pageSize, VipCombo t) {
        VipComboQuery query = new VipComboQuery();
//        query.appId = appId;
//        query.uid = uid;
//        query.drawStateList = Arrays.asList(new Integer[]{LuckyActivityJoinRecord.DRAW_STATE_UNOPEN});
        query.state = t.getState();
        query.id = t.getId();
        query.name = t.getName();
        query.gradeId = t.getGradeId();
        query.start = (page - 1) * pageSize;
        query.count = pageSize;
        return vipComboMapper.listByPage(query);

 service-vip/src/main/java/com/ks/vip/service/remote/VipGradePotenceServiceImpl.java

@@ -53,8 +53,9 @@
    @Override
    public long count(VipGradePotence t) {
        VipGradePotenceQuery query = new VipGradePotenceQuery();
//        query.appId = appId;
//        query.uid = uid;
        query.id = t.getId();
        query.effectiveTime = t.getEffectiveTime();
        query.gradeId = t.getGradeId();
        return vipGradePotenceMapper.count(query);
    }

@@ -62,9 +63,9 @@
    @Override
    public List<VipGradePotence> listByPage(int page, int pageSize, VipGradePotence t) {
        VipGradePotenceQuery query = new VipGradePotenceQuery();
//        query.appId = appId;
//        query.uid = uid;
//        query.drawStateList = Arrays.asList(new Integer[]{LuckyActivityJoinRecord.DRAW_STATE_UNOPEN});
        query.id = t.getId();
        query.effectiveTime = t.getEffectiveTime();
        query.gradeId = t.getGradeId();
        query.start = (page - 1) * pageSize;
        query.count = pageSize;
        return vipGradePotenceMapper.listByPage(query);

 service-vip/src/main/resources/mapper/VipCenterMapper.xml

@@ -73,7 +73,7 @@


  <sql id="listWhere">
    <if test="query.uid!=null">and v_uid=#{query.uid}</if>
    <if test="query.uid!=null and query.uid!=''">and v_uid=#{query.uid}</if>
    <if test="query.gradeId!=null">and v_grade_id=#{query.gradeId}</if>
    <if test="query.state!=null">and v_state=#{query.state}</if>
  </sql>

 service-vip/src/main/resources/mapper/VipComboMapper.xml

@@ -78,7 +78,7 @@
  <!-- 非模板 -->
  <sql id="listWhere">
    <if test="query.id!=null">and cb_id=#{query.id}</if>
    <if test="query.name!=null">and cb_name=#{query.name}</if>
    <if test="query.name!=null and query.name!='' ">and cb_name like "%"#{query.name}"%"</if>
    <if test="query.state!=null">and cb_state=#{query.state}</if>
    <if test="query.gradeId!=null">and cb_grade_id=#{query.gradeId}</if>
  </sql>

 service-vip/src/main/resources/mapper/VipGradeMapper.xml

@@ -66,7 +66,7 @@
  <!-- 非模板 -->
  <sql id="listWhere">
    <if test="query.id!=null">and g_id=#{query.id}</if>
    <if test="query.name!=null">and g_name=#{query.name}</if>
    <if test="query.name!=null and query.name!=''">and g_name like "%"#{query.name}"%" </if>
    <if test="query.identity!=null">and g_identity=#{query.identity}</if>
    <if test="query.state!=null">and g_state=#{query.state}</if>
  </sql>

 service-vip/src/main/resources/mapper/VipGradePotenceMapper.xml

@@ -69,6 +69,7 @@
  <!-- 非模板 -->
  <sql id="listWhere">
    <if test="query.id!=null">and pc_id=#{query.id}</if>
    <if test="query.effectiveTime!=null">and pc_effective_time >=#{query.effectiveTime}</if>
    <if test="query.gradeId!=null">and pc_grade_id=#{query.gradeId}</if>
  </sql>