parent
9822eff9a8
commit
7e2e560e54
@ -0,0 +1,46 @@
|
||||
package au.com.royalpay.payment.manage.application.beans;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
/**
|
||||
* Created by yuan on 2018/6/4.
|
||||
*/
|
||||
public class ClientApplyQueryBean {
|
||||
private int page = 1;
|
||||
private int limit = 10;
|
||||
private String agree;
|
||||
|
||||
public JSONObject insertObject() {
|
||||
JSONObject params = new JSONObject();
|
||||
if(StringUtils.isNotEmpty(agree)){
|
||||
params.put("agree",agree);
|
||||
}
|
||||
return params;
|
||||
}
|
||||
|
||||
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 getAgree() {
|
||||
return agree;
|
||||
}
|
||||
|
||||
public void setAgree(String agree) {
|
||||
this.agree = agree;
|
||||
}
|
||||
}
|
@ -0,0 +1,13 @@
|
||||
package au.com.royalpay.payment.manage.application.core;
|
||||
|
||||
import au.com.royalpay.payment.manage.application.beans.ClientApplyQueryBean;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
|
||||
/**
|
||||
* Created by yuan on 2018/6/4.
|
||||
*/
|
||||
public interface SimpleClientApplyManageService {
|
||||
JSONObject listsApplies(JSONObject manager,ClientApplyQueryBean clientApplyQueryBean);
|
||||
|
||||
JSONObject findOneApply(JSONObject manager,String client_pre_apply_id);
|
||||
}
|
@ -0,0 +1,41 @@
|
||||
package au.com.royalpay.payment.manage.application.core.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.application.beans.ClientApplyQueryBean;
|
||||
import au.com.royalpay.payment.manage.application.core.SimpleClientApplyManageService;
|
||||
import au.com.royalpay.payment.manage.mappers.preapply.SysClientPreMapperMapper;
|
||||
import au.com.royalpay.payment.tools.exceptions.BadRequestException;
|
||||
import au.com.royalpay.payment.tools.utils.PageListUtils;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.github.miemiedev.mybatis.paginator.domain.Order;
|
||||
import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
|
||||
import com.github.miemiedev.mybatis.paginator.domain.PageList;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
/**
|
||||
* Created by yuan on 2018/6/4.
|
||||
*/
|
||||
@Service
|
||||
public class SimpleClientApplyManageServiceImpl implements SimpleClientApplyManageService{
|
||||
@Resource
|
||||
private SysClientPreMapperMapper sysClientPreMapperMapper;
|
||||
@Override
|
||||
public JSONObject listsApplies(JSONObject manager, ClientApplyQueryBean clientApplyQueryBean) {
|
||||
if(manager == null){
|
||||
throw new BadRequestException();
|
||||
}
|
||||
JSONObject params = clientApplyQueryBean.insertObject();
|
||||
PageList<JSONObject> applies = sysClientPreMapperMapper.listApplies(params,
|
||||
new PageBounds(clientApplyQueryBean.getPage(), clientApplyQueryBean.getLimit(), Order.formString("create_time.desc")));
|
||||
return PageListUtils.buildPageListResult(applies);
|
||||
}
|
||||
|
||||
@Override
|
||||
public JSONObject findOneApply(JSONObject manager, String client_pre_apply_id) {
|
||||
if(manager == null){
|
||||
throw new BadRequestException();
|
||||
}
|
||||
return sysClientPreMapperMapper.findOneByClientPreApplyId(client_pre_apply_id);
|
||||
}
|
||||
}
|
@ -0,0 +1,30 @@
|
||||
package au.com.royalpay.payment.manage.application.web;
|
||||
|
||||
import au.com.royalpay.payment.manage.application.beans.ClientApplyQueryBean;
|
||||
import au.com.royalpay.payment.manage.application.core.SimpleClientApplyManageService;
|
||||
import au.com.royalpay.payment.manage.mappers.preapply.SysClientPreMapperMapper;
|
||||
import au.com.royalpay.payment.tools.CommonConsts;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
/**
|
||||
* Created by yuan on 2018/6/4.
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/register/manage")
|
||||
public class SimpleClientManageController {
|
||||
@Resource
|
||||
private SimpleClientApplyManageService simpleClientApplyManageService;
|
||||
|
||||
@RequestMapping(method = RequestMethod.GET)
|
||||
public JSONObject listApply(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager,ClientApplyQueryBean clientApplyQueryBean){
|
||||
return simpleClientApplyManageService.listsApplies(manager,clientApplyQueryBean);
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/getOne/{client_pre_apply_id}",method = RequestMethod.GET)
|
||||
public JSONObject findOneApply(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable String client_pre_apply_id){
|
||||
return simpleClientApplyManageService.findOneApply(manager,client_pre_apply_id);
|
||||
}
|
||||
}
|
@ -0,0 +1,249 @@
|
||||
<section class="content-header">
|
||||
<h1>
|
||||
<span ng-if="partner.company_name" ng-bind="partner.company_name"></span>
|
||||
<span ng-if="!partner.company_name">暂无</span>
|
||||
</h1>
|
||||
<ol class="breadcrumb">
|
||||
<li>
|
||||
<i class="fa fa-sitemap"></i> Notice
|
||||
</li>
|
||||
<li><a ui-sref="partner_application.simple_application">Application & Open</a></li>
|
||||
<li class="active">Apply Detail</li>
|
||||
</ol>
|
||||
</section>
|
||||
|
||||
<div class="content">
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<div class="nav-tabs-custom">
|
||||
<div class="tab-content" ui-view>
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
Partner Basic Information
|
||||
<span ng-if="partner.apply_approve_result==3||partner.apply_approve_result==4"
|
||||
style="color: red">(Refused)</span>
|
||||
<span ng-if="partner.apply_approve_result==2 && partner.client_id" style="color: green">(Pass)</span>
|
||||
<span class="form-inline" ng-if="('10'|withRole) && partner.apply_approve_result==1" style="color: blue">
|
||||
({{partner.bd_user_name}} is following)
|
||||
<div class="form-group"
|
||||
style="padding-left: 10px">
|
||||
<div class="form-group">
|
||||
<ui-select ng-model="choosed.selected" theme="bootstrap" reset-search-input="false" title="Choose a BD"
|
||||
append-to-body="true" style="min-width: 150px;max-width: 300px">
|
||||
<ui-select-match placeholder="Select a BD To Follow Up">{{$select.selected.display_name}}</ui-select-match>
|
||||
<ui-select-choices group-by="'org_name'"
|
||||
repeat="bd in bds | filter:$select.search">
|
||||
<div ng-bind-html="bd.display_name | highlight: $select.search"></div>
|
||||
</ui-select-choices>
|
||||
</ui-select>
|
||||
</div>
|
||||
|
||||
<button type="button" class="btn btn-success" ng-class="{'disabled':!choosed.selected}"
|
||||
ng-click="chooseBD(choosed.selected)">Change BD</button>
|
||||
</div>
|
||||
</span>
|
||||
<span style="float: right;margin-top: -7px" class="form-inline"
|
||||
ng-if="(partner.apply_approve_result==0 && ('10'|withRole))||(partner.apply_approve_result==1 && ('100'|withRole))">
|
||||
<!--<div uib-dropdown ng-if="partner.apply_approve_result==0 && ('10'|withRole)" class="btn-group pull-right">-->
|
||||
|
||||
<!--<button id="single-button" type="button" class="btn btn-success" uib-dropdown-toggle ng-disabled="disabled">-->
|
||||
<!--Choose BD To Follow Up <span class="caret"></span>-->
|
||||
<!--</button>-->
|
||||
<!--<ul class="dropdown-menu" uib-dropdown-menu aria-labelledby="single-button">-->
|
||||
<!--<li ng-repeat="bd in bds"><a ng-click="chooseBD(bd)">{{bd.display_name}}</a></li>-->
|
||||
<!--</ul>-->
|
||||
<!--</div>-->
|
||||
<div class="form-group">
|
||||
<a role="button" class="btn btn-danger" ng-click="refuse()">
|
||||
Refuse
|
||||
</a>
|
||||
</div>
|
||||
<div class="form-group" ng-if="partner.apply_approve_result==0 && ('10'|withRole)"
|
||||
style="padding-left: 10px">
|
||||
<div class="form-group">
|
||||
<ui-select ng-model="choosed.selected" theme="bootstrap" reset-search-input="false" title="Choose a BD"
|
||||
append-to-body="true" style="min-width: 150px;max-width: 300px">
|
||||
<ui-select-match placeholder="Select a BD To Follow Up">{{$select.selected.display_name}}</ui-select-match>
|
||||
<ui-select-choices group-by="'org_name'"
|
||||
repeat="bd in bds | filter:$select.search">
|
||||
<div ng-bind-html="bd.display_name | highlight: $select.search"></div>
|
||||
</ui-select-choices>
|
||||
</ui-select>
|
||||
</div>
|
||||
|
||||
<button type="button" class="btn btn-success" ng-class="{'disabled':!choosed.selected}"
|
||||
ng-click="chooseBD(choosed.selected)">Next</button>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a ng-click="pass(partner)" ng-if="partner.apply_approve_result==1 && ('100'|withRole)"
|
||||
role="button" class="btn btn-success">
|
||||
PASS
|
||||
</a>
|
||||
</div>
|
||||
</span>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<div class="form-horizontal">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2">Full Name</label>
|
||||
|
||||
<div class="col-sm-10">
|
||||
<p class="form-control-static" ng-bind="partner.company_name"></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2">Short Name</label>
|
||||
|
||||
<div class="col-sm-10">
|
||||
<p class="form-control-static" ng-bind="partner.short_name"></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2">Business License No. (ABN/ACN)</label>
|
||||
|
||||
<div class="col-sm-10">
|
||||
<p class="form-control-static" ng-bind="partner.abn"></p>
|
||||
</div>
|
||||
</div>
|
||||
<!--<div class="form-group">-->
|
||||
<!--<label class="control-label col-sm-2">Industry</label>-->
|
||||
|
||||
<!--<div class="col-sm-10">-->
|
||||
<!--<p class="form-control-static" ng-bind="partner.industry|partner_industry"></p>-->
|
||||
<!--</div>-->
|
||||
<!--</div>-->
|
||||
<!--<div class="form-group" ng-if="partner.company_email">-->
|
||||
<!--<label class="control-label col-sm-2">Email Address</label>-->
|
||||
|
||||
<!--<div class="col-sm-10">-->
|
||||
<!--<p class="form-control-static" target="_blank" ng-bind="partner.company_email"></p>-->
|
||||
<!--</div>-->
|
||||
<!--</div>-->
|
||||
<div class="form-group" ng-if="partner.company_website">
|
||||
<label class="control-label col-sm-2">Website</label>
|
||||
|
||||
<div class="col-sm-10">
|
||||
<a class="form-control-static" target="_blank" ng-bind="partner.company_website"
|
||||
ng-href="http://{{partner.company_website}}"></a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2">Office Telephone Number</label>
|
||||
|
||||
<div class="col-sm-10">
|
||||
<p class="form-control-static" ng-bind="partner.company_phone||'-'"></p>
|
||||
</div>
|
||||
</div>
|
||||
<!--<div class="form-group col-sm-6">-->
|
||||
<!--<label class="control-label col-sm-4">Mobile Number (China)</label>-->
|
||||
|
||||
<!--<div class="col-sm-8">-->
|
||||
<!--<p class="form-control-static" ng-bind="partner.mobile_chn||'-'"></p>-->
|
||||
<!--</div>-->
|
||||
<!--</div>-->
|
||||
<!--<div class="form-group col-sm-6">-->
|
||||
<!--<label class="control-label col-sm-4">Mobile Number (Aus)</label>-->
|
||||
|
||||
<!--<div class="col-sm-8">-->
|
||||
<!--<p class="form-control-static" ng-bind="partner.mobile_aus||'-'"></p>-->
|
||||
<!--</div>-->
|
||||
<!--</div>-->
|
||||
<div class="form-group col-sm-12">
|
||||
<label class="control-label col-sm-2">Address</label>
|
||||
|
||||
<div class="col-sm-10">
|
||||
<p class="form-control-static" ng-bind="partner.address"></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label class="control-label col-sm-4">City</label>
|
||||
|
||||
<div class="col-sm-8">
|
||||
<p class="form-control-static" ng-bind="partner.suburb"></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label class="control-label col-sm-4">Post Code</label>
|
||||
|
||||
<div class="col-sm-8">
|
||||
<p class="form-control-static" ng-bind="partner.postcode"></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label class="control-label col-sm-4">State</label>
|
||||
|
||||
<div class="col-sm-8">
|
||||
<p class="form-control-static" ng-bind="partner.state||partner_state"></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label class="control-label col-sm-4">Country</label>
|
||||
|
||||
<div class="col-sm-8">
|
||||
<p class="form-control-static" ng-bind="partner.country"></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!--end 商户基本资料-->
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">Contact Information</div>
|
||||
<div class="panel-body">
|
||||
<div class="form-horizontal">
|
||||
<div class="form-group col-sm-12">
|
||||
<label class="control-label col-sm-2">Contact Person</label>
|
||||
|
||||
<div class="col-sm-10">
|
||||
<p class="form-control-static" ng-bind="partner.contact_person"></p>
|
||||
</div>
|
||||
</div>
|
||||
<!--<div class="form-group col-sm-6">-->
|
||||
<!--<label class="control-label col-sm-4">Job Title</label>-->
|
||||
|
||||
<!--<div class="col-sm-8">-->
|
||||
<!--<p class="form-control-static" ng-bind="partner.contact_person_job"></p>-->
|
||||
<!--</div>-->
|
||||
<!--</div>-->
|
||||
<div class="form-group col-sm-6">
|
||||
<label class="control-label col-sm-4">Telephone No.</label>
|
||||
|
||||
<div class="col-sm-8">
|
||||
<p class="form-control-static" ng-bind="partner.contact_phone"></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label class="control-label col-sm-4">E-mail</label>
|
||||
|
||||
<div class="col-sm-8">
|
||||
<p class="form-control-static" ng-bind="partner.contact_email"></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!--end 商户联系资料-->
|
||||
<div class="panel panel-default" ng-if="partner.apply_approve_result>0">
|
||||
<div class="panel-heading">Approaching Progress </div>
|
||||
<div class="panel-body">
|
||||
<div class="form-horizontal">
|
||||
<div class="form-group col-sm-12">
|
||||
<div class="col-sm-12" ng-if="('100'|withRole)">
|
||||
<textarea class="form-control" ng-model="partner.remark" name="remark"
|
||||
id="remark-input" maxlength="500"></textarea>
|
||||
<a ng-if="('100'|withRole)" class="btn btn-success" role="button" ng-click="updateRemark()">Save</a>
|
||||
</div>
|
||||
<div class="col-sm-12" ng-if="partner.apply_approve_result>0 && ('10'|withRole)">
|
||||
<p class="form-control-static" ng-bind="partner.remark"></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
@ -0,0 +1,97 @@
|
||||
<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>
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="optionsRadiosinline" id="optionsRadios2" value="" ng-model="params.agree" ng-click="loadSimpleApplies()" ng-checked="true"> ALL
|
||||
</label>
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="optionsRadiosinline" id="optionsRadios3" value="0" ng-model="params.agree" ng-click="loadSimpleApplies()"> 申请中
|
||||
</label>
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="optionsRadiosinline" id="optionsRadios4" value="1" ng-model="params.agree" ng-click="loadSimpleApplies()"> 已申请
|
||||
</label>
|
||||
</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>Name</th>
|
||||
<th>Phone</th>
|
||||
<th>Email</th>
|
||||
<!-- <th>Approve Status</th>-->
|
||||
<th>Company Name</th>
|
||||
<th>Status</th>
|
||||
<th>Create Time</th>
|
||||
<th>Operation</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="apply in applies">
|
||||
<td ng-bind="apply.contact_person"></td>
|
||||
<td ng-bind="apply.contact_phone"></td>
|
||||
<td ng-bind="apply.contact_email"></td>
|
||||
<td ng-bind="apply.company_name |cut:true:10:' ....'"></td>
|
||||
<td>
|
||||
<if ng-if="apply.agree">已申请</if>
|
||||
<if ng-if="!apply.agree">未申请
|
||||
<span ng-if="apply.username && !apply.company_name">(<em class="text-danger">step2</em>)</span>
|
||||
<span ng-if="apply.company_name && !apply.bank_no">(<em class="text-danger">step3</em>)</span>
|
||||
<span ng-if="apply.bank_no && !apply.clean_days">(<em class="text-danger">step4</em>)</span>
|
||||
</if>
|
||||
</td>
|
||||
<td ng-bind="apply.create_time"></td>
|
||||
<!-- <td>
|
||||
<span ng-if="apply.apply_approve_result==0||partner.apply_approve_result==null">Waiting Approving</span>
|
||||
<span ng-if="apply.apply_approve_result==1" style="color: blue"> BD Approaching ({{partner.bd_user_name}})</span>
|
||||
<span ng-if="apply.apply_approve_result==2" style="color: green">Pass ({{partner.bd_user_name}} {{partner.apply_approve_time}})</span>
|
||||
<span ng-if="apply.apply_approve_result==3||partner.apply_approve_result==4"
|
||||
style="color: red">Not Pass</span>
|
||||
</td>-->
|
||||
<td>
|
||||
<a class="text-primary" role="button" title="Detail"
|
||||
ui-sref="apply_detail({client_pre_apply_id:apply.client_pre_apply_id})">
|
||||
<i class="fa fa-search"></i> Detail
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="box-footer" ng-if="applies.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="loadSimpleApplies()"
|
||||
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>
|
Loading…
Reference in new issue