add compliance partnerList register_time

master
luoyang 6 years ago
parent 77fe420e83
commit 98a301ba4a

@ -168,7 +168,12 @@
<where>
<if test="client_moniker !=null">c.client_moniker=#{client_moniker}</if>
<if test="sub_merchant_id!=null">and c.sub_merchant_id=#{sub_merchant_id}</if>
<if test="create_start_time!=null">
AND c.create_time >= #{create_start_time}
</if>
<if test="create_end_time!=null">
AND c.create_time &lt;= #{create_end_time}
</if>
<if test="approving">
and ((c.approve_result=4 and c.open_status is null) or (c.approve_result=3 and c.open_status is null) or

@ -103,7 +103,7 @@
</div>
</div>
</div>
<div class="list-group" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer' && roleNow!='sitemanager'">
<div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && role!='sitemanager'">
<div class="row">
<div class="col-sm-2 col-lg-2 col-xs-6" id="transaction">
<div class="description-block">

@ -151,6 +151,30 @@
</select>
</div>
</div>
<div class="form-group col-sm-6">
<label class="control-label col-xs-4 col-sm-4">Regist Time
Select</label>
<div class="col-sm-8">
<div style="display: inline-block">
<input class="form-control" id="re-from-input"
ng-model="params.create_start_time"
uib-datepicker-popup size="10" placeholder="From"
is-open="createStartTime.open"
ng-click="createStartTime.open=true"
datepicker-options="{maxDate:params.create_end_time||today}">
</div>
~
<div style="display: inline-block">
<input class="form-control" id="re-to-input"
ng-model="params.create_end_time"
uib-datepicker-popup size="10" placeholder="To"
is-open="createEndTime.open"
ng-click="createEndTime.open=true"
datepicker-options="{minDate:params.create_start_time,maxDate:today}">
</div>
</div>
</div>
<div class="form-horizontal">
<!--status-->
<div class="form-group col-sm-12" ng-if="'10'|withRole">

Loading…
Cancel
Save