yuan
7 years ago
parent
7b4f2241c9
commit
6ca6628c12
@ -0,0 +1,34 @@
|
||||
package au.com.royalpay.payment.manage.application.beans;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
/**
|
||||
* Created by yuan on 2018/6/27.
|
||||
*/
|
||||
public class AddHandleLogDetail {
|
||||
private String client_pre_apply_id;
|
||||
|
||||
private String remark;
|
||||
|
||||
public JSONObject insertObject() {
|
||||
JSONObject res = (JSONObject) JSON.toJSON(this);
|
||||
return res;
|
||||
}
|
||||
|
||||
public String getClient_pre_apply_id() {
|
||||
return client_pre_apply_id;
|
||||
}
|
||||
|
||||
public void setClient_pre_apply_id(String client_pre_apply_id) {
|
||||
this.client_pre_apply_id = client_pre_apply_id;
|
||||
}
|
||||
|
||||
public String getRemark() {
|
||||
return remark;
|
||||
}
|
||||
|
||||
public void setRemark(String remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,42 @@
|
||||
package au.com.royalpay.payment.manage.application.beans;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
/**
|
||||
* Created by yuan on 2018/6/27.
|
||||
*/
|
||||
public class HandleLogQuery {
|
||||
private int page = 1;
|
||||
private int limit = 10;
|
||||
private String client_pre_apply_id;
|
||||
|
||||
public JSONObject insertObject() {
|
||||
JSONObject res = (JSONObject) JSON.toJSON(this);
|
||||
return res;
|
||||
}
|
||||
|
||||
public int getPage() {
|
||||
return page;
|
||||
}
|
||||
|
||||
public void setPage(int page) {
|
||||
this.page = page;
|
||||
}
|
||||
|
||||
public int getLimit() {
|
||||
return limit;
|
||||
}
|
||||
|
||||
public void setLimit(int limit) {
|
||||
this.limit = limit;
|
||||
}
|
||||
|
||||
public String getClient_pre_apply_id() {
|
||||
return client_pre_apply_id;
|
||||
}
|
||||
|
||||
public void setClient_pre_apply_id(String client_pre_apply_id) {
|
||||
this.client_pre_apply_id = client_pre_apply_id;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
package au.com.royalpay.payment.manage.mappers.preapply;
|
||||
|
||||
import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
|
||||
import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
|
||||
import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
|
||||
import com.github.miemiedev.mybatis.paginator.domain.PageList;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@AutoMapper(tablename = "pre_apply_handle_log", pkName = "id")
|
||||
public interface PreApplyHandleLogMapper {
|
||||
@AutoSql(type = SqlType.UPDATE)
|
||||
void update(JSONObject data);
|
||||
|
||||
@AutoSql(type = SqlType.INSERT)
|
||||
void save(JSONObject data);
|
||||
|
||||
@AutoSql(type = SqlType.SELECT)
|
||||
PageList<JSONObject> listHandleLogs(JSONObject params, PageBounds pagination);
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
<section class="content-header">
|
||||
<h1>Handle Detail</h1>
|
||||
</section>
|
||||
|
||||
<div class="content">
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<div class="box-solid">
|
||||
<div class="box box-warning">
|
||||
<div class="box-header">
|
||||
<form role="form" style="margin:0px auto;width: 50%">
|
||||
<div class="form-group">
|
||||
<label>Detail</label>
|
||||
<input ng-model="handleDetail.remark" name="code" class="form-control" type="text"/>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<button class="btn btn-primary btn-block" ng-click="addHandleLog()">commit</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -0,0 +1,106 @@
|
||||
<div class="content">
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<div class="box-solid">
|
||||
<div class="box box-warning">
|
||||
<div class="box-header">
|
||||
<div class="form-inline">
|
||||
<div class="form-group">
|
||||
<label class="control-label" for="short-name-search">Company Name</label>
|
||||
<input type="text" class="form-control" id="short-name-search"
|
||||
ng-model="params.short_name">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<button class="btn btn-primary" type="button" ng-click="loadPartners(1)"><i
|
||||
class="fa fa-search"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="box">
|
||||
<div class="box-header">
|
||||
<h3 class="box-title">Application List</h3>
|
||||
</div>
|
||||
|
||||
<div class="box-body no-padding table-responsive">
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
|
||||
<th>Application Time</th>
|
||||
<th>Company Name</th>
|
||||
<!--<th>ABN/ACN</th>-->
|
||||
<!--<th>Industry</th>-->
|
||||
<th>Suburb</th>
|
||||
<th>Source</th>
|
||||
<th>Approve Status</th>
|
||||
<th>Partner Code</th>
|
||||
<th>Progress</th>
|
||||
<th>Operation</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="partner in partners">
|
||||
<td ng-bind="partner.create_time"></td>
|
||||
<td ng-bind="partner.short_name"></td>
|
||||
<!--<td ng-bind="partner.abn"></td>-->
|
||||
<!--<td ng-bind="partner.industry"></td>-->
|
||||
<td ng-bind="partner.suburb"></td>
|
||||
<td>
|
||||
<span ng-if="partner.source==0">PC</span>
|
||||
<span ng-if="partner.source==1">公众号菜单</span>
|
||||
<span ng-if="partner.source==2">公众号推送</span>
|
||||
<span ng-if="partner.source==3">小程序申请</span>
|
||||
<span ng-if="partner.source==4">App申请</span>
|
||||
</td>
|
||||
<td>
|
||||
<span ng-if="partner.apply_approve_result==0||partner.apply_approve_result==null">Waiting Approving</span>
|
||||
<span ng-if="partner.apply_approve_result==1" style="color: blue"> BD Approaching ({{partner.bd_user_name}})</span>
|
||||
<span ng-if="partner.apply_approve_result==2" style="color: green">Pass ({{partner.bd_user_name}} {{partner.apply_approve_time}})</span>
|
||||
<span ng-if="partner.apply_approve_result==3||partner.apply_approve_result==4" style="color: red">Not Pass</span>
|
||||
</td>
|
||||
<td title="{{partner.client_moniker}}"><a class="text-primary" role="button" title="Detail"
|
||||
ui-sref="partners.detail({clientMoniker:partner.client_moniker})">
|
||||
{{partner.client_moniker}}
|
||||
</a></td>
|
||||
<td ng-bind="partner.remark|limitTo:10" title="{{partner.remark}}"></td>
|
||||
<td>
|
||||
<a class="text-primary" role="button" title="Link" ng-if="partner.apply_approve_result==1" ng-click="linkButton(partner)">
|
||||
<i class="fa fa-cog"></i> Link
|
||||
</a>
|
||||
<a class="text-primary" role="button" title="Detail"
|
||||
ui-sref="partner_apply.detail({client_apply_id:partner.client_apply_id})">
|
||||
<i class="fa fa-search"></i> Detail
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
<div class="box-footer" ng-if="partners.length">
|
||||
<uib-pagination class="pagination"
|
||||
total-items="pagination.totalCount"
|
||||
boundary-links="true"
|
||||
ng-model="pagination.page"
|
||||
items-per-page="pagination.limit"
|
||||
max-size="10"
|
||||
ng-change="loadPartners()"
|
||||
previous-text="‹"
|
||||
next-text="›"
|
||||
first-text="«"
|
||||
last-text="»"></uib-pagination>
|
||||
<div class="row">
|
||||
<div class="col-xs-12">Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -1,133 +0,0 @@
|
||||
|
||||
<section class="content-header">
|
||||
<h1>Partner Application</h1>
|
||||
<ol class="breadcrumb">
|
||||
<li>
|
||||
<i class="fa fa-sitemap"></i> Payment
|
||||
</li>
|
||||
<li class="active">Partner Applications</li>
|
||||
</ol>
|
||||
</section>
|
||||
|
||||
<div class="content">
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<div class="nav-tabs-custom">
|
||||
<ul class="nav nav-tabs">
|
||||
<li ui-sref-active-eq="active">
|
||||
<a ui-sref="partner_application">Partner Application</a>
|
||||
</li>
|
||||
|
||||
<li ui-sref-active="active" ng-if="('10'|withRole) || ('1'|withRole)">
|
||||
<a ui-sref="partner_application.simple_application">Application & Open</a>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="tab-content" ui-view>
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<div class="box-solid">
|
||||
<div class="box box-warning">
|
||||
<div class="box-header">
|
||||
<div class="form-inline">
|
||||
<div class="form-group">
|
||||
<label class="control-label" for="short-name-search">Company Name</label>
|
||||
<input type="text" class="form-control" id="short-name-search"
|
||||
ng-model="params.short_name">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<button class="btn btn-primary" type="button" ng-click="loadPartners(1)"><i
|
||||
class="fa fa-search"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="box">
|
||||
<div class="box-header">
|
||||
<h3 class="box-title">Application List</h3>
|
||||
</div>
|
||||
|
||||
<div class="box-body no-padding table-responsive">
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
|
||||
<th>Application Time</th>
|
||||
<th>Company Name</th>
|
||||
<!--<th>ABN/ACN</th>-->
|
||||
<!--<th>Industry</th>-->
|
||||
<th>Suburb</th>
|
||||
<th>Source</th>
|
||||
<th>Approve Status</th>
|
||||
<th>Partner Code</th>
|
||||
<th>Progress</th>
|
||||
<th>Operation</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="partner in partners">
|
||||
<td ng-bind="partner.create_time"></td>
|
||||
<td ng-bind="partner.short_name"></td>
|
||||
<!--<td ng-bind="partner.abn"></td>-->
|
||||
<!--<td ng-bind="partner.industry"></td>-->
|
||||
<td ng-bind="partner.suburb"></td>
|
||||
<td>
|
||||
<span ng-if="partner.source==0">PC</span>
|
||||
<span ng-if="partner.source==1">公众号菜单</span>
|
||||
<span ng-if="partner.source==2">公众号推送</span>
|
||||
<span ng-if="partner.source==3">小程序申请</span>
|
||||
<span ng-if="partner.source==4">App申请</span>
|
||||
</td>
|
||||
<td>
|
||||
<span ng-if="partner.apply_approve_result==0||partner.apply_approve_result==null">Waiting Approving</span>
|
||||
<span ng-if="partner.apply_approve_result==1" style="color: blue"> BD Approaching ({{partner.bd_user_name}})</span>
|
||||
<span ng-if="partner.apply_approve_result==2" style="color: green">Pass ({{partner.bd_user_name}} {{partner.apply_approve_time}})</span>
|
||||
<span ng-if="partner.apply_approve_result==3||partner.apply_approve_result==4" style="color: red">Not Pass</span>
|
||||
</td>
|
||||
<td title="{{partner.client_moniker}}"><a class="text-primary" role="button" title="Detail"
|
||||
ui-sref="partners.detail({clientMoniker:partner.client_moniker})">
|
||||
{{partner.client_moniker}}
|
||||
</a></td>
|
||||
<td ng-bind="partner.remark|limitTo:10" title="{{partner.remark}}"></td>
|
||||
<td>
|
||||
<a class="text-primary" role="button" title="Link" ng-if="partner.apply_approve_result==1" ng-click="linkButton(partner)">
|
||||
<i class="fa fa-cog"></i> Link
|
||||
</a>
|
||||
<a class="text-primary" role="button" title="Detail"
|
||||
ui-sref="detail({client_apply_id:partner.client_apply_id})">
|
||||
<i class="fa fa-search"></i> Detail
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
<div class="box-footer" ng-if="partners.length">
|
||||
<uib-pagination class="pagination"
|
||||
total-items="pagination.totalCount"
|
||||
boundary-links="true"
|
||||
ng-model="pagination.page"
|
||||
items-per-page="pagination.limit"
|
||||
max-size="10"
|
||||
ng-change="loadPartners()"
|
||||
previous-text="‹"
|
||||
next-text="›"
|
||||
first-text="«"
|
||||
last-text="»"></uib-pagination>
|
||||
<div class="row">
|
||||
<div class="col-xs-12">Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -0,0 +1,41 @@
|
||||
|
||||
<section class="content-header">
|
||||
<h1>Partner Application</h1>
|
||||
<ol class="breadcrumb">
|
||||
<li>
|
||||
<i class="fa fa-sitemap"></i> Payment
|
||||
</li>
|
||||
<li class="active">Partner Applications</li>
|
||||
</ol>
|
||||
</section>
|
||||
|
||||
<div class="content">
|
||||
<div class="row">
|
||||
<div class="col-sm-12 analysis-nav">
|
||||
<ul class="nav nav-pills">
|
||||
<li ui-sref-active-eq="active">
|
||||
<a ui-sref="partner_apply.partner_application"><span>Partner Application</span></a>
|
||||
</li>
|
||||
<li ui-sref-active="active" ng-if="('10'|withRole) || ('1'|withRole)">
|
||||
<a ui-sref="partner_apply.simple_application"> <span>Application & Open</span></a>
|
||||
</li>
|
||||
<li ui-sref-active-eq="active">
|
||||
<a ui-sref="partner_apply.citypartner_reg"><i class="fa fa-tv"></i> <span>City Partners</span></a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<div class="nav-tabs-custom">
|
||||
<div class="tab-content" ui-view>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in new issue