parent
bc960bbb2b
commit
a329df620d
|
|
@ -44,6 +44,14 @@ public class OrderGoodsController extends BaseController {
|
|||
return prefix;
|
||||
}
|
||||
|
||||
@GetMapping(value = "/master")
|
||||
public String orderMasterGoods(Long orderId, ModelMap mmap) {
|
||||
OrderMaster orderMaster = orderMasterService.selectById(orderId);
|
||||
mmap.put("orderId", orderId);
|
||||
mmap.put("orderMaster", orderMaster);
|
||||
return "order/masterGoods";
|
||||
}
|
||||
|
||||
// @RequiresPermissions("order:goods:list")
|
||||
@PostMapping("/list")
|
||||
@ResponseBody
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ import com.ghy.common.enums.WorkerStatus;
|
|||
import com.ghy.common.enums.WorkerType;
|
||||
import com.ghy.common.utils.CacheUtils;
|
||||
import com.ghy.common.utils.ExceptionUtil;
|
||||
import com.ghy.common.utils.StringUtils;
|
||||
import com.ghy.goods.domain.Goods;
|
||||
import com.ghy.goods.domain.GoodsCategory;
|
||||
import com.ghy.goods.service.GoodsCategoryService;
|
||||
|
|
@ -151,6 +152,9 @@ public class WorkerController extends BaseController {
|
|||
Worker worker = new Worker();
|
||||
worker.setWorkerIds(CollectionUtils.isNotEmpty(resWorkerIds) ? resWorkerIds : null);
|
||||
worker.setKeyWords(workerListRequest.getWorkerName());
|
||||
if(StringUtils.isNotEmpty(workerListRequest.getWorkerPhone())){
|
||||
worker.setPhone(workerListRequest.getWorkerPhone());
|
||||
}
|
||||
if(this.getSysUser().getDept().getParentId() != 101){
|
||||
worker.setDeptId(this.getSysUser().getDept().getParentId());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ public class WorkerListRequest extends BaseEntity {
|
|||
|
||||
private String workerName;
|
||||
|
||||
private String workerPhone;
|
||||
|
||||
private Long workerId;
|
||||
|
||||
private Long exceptParentAreaId;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,91 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<th:block th:include="include :: header('订单商品列表')"/>
|
||||
<th:block th:include="include :: layout-latest-css"/>
|
||||
</head>
|
||||
|
||||
<body class="gray-bg">
|
||||
|
||||
<div class="ui-layout-center">
|
||||
<div class="container-div">
|
||||
<div class="row">
|
||||
<div class="col-sm-12 search-collapse">
|
||||
<form id="order-goods-form">
|
||||
<!-- <input type="hidden" id="orderId" name="orderId" th:value="${orderMaster.id}">-->
|
||||
</form>
|
||||
</div>
|
||||
<div class="col-sm-12 select-table table-striped">
|
||||
<table id="bootstrap-table"></table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<th:block th:include="include :: footer"/>
|
||||
<th:block th:include="include :: layout-latest-js"/>
|
||||
|
||||
<script th:inline="javascript">
|
||||
|
||||
var prefix = ctx + "order/goods";
|
||||
var orderId = '[[${orderId}]]';
|
||||
|
||||
$(function () {
|
||||
var panehHidden = false;
|
||||
if ($(this).width() < 769) {
|
||||
panehHidden = true;
|
||||
}
|
||||
$('body').layout({initClosed: panehHidden, west__size: 185});
|
||||
// 回到顶部绑定
|
||||
if ($.fn.toTop !== undefined) {
|
||||
var opt = {
|
||||
win: $('.ui-layout-center'),
|
||||
doc: $('.ui-layout-center')
|
||||
};
|
||||
$('#scroll-up').toTop(opt);
|
||||
}
|
||||
queryOrderGoodsList();
|
||||
});
|
||||
|
||||
function queryOrderGoodsList() {
|
||||
var options = {
|
||||
url: prefix + "/list?orderId=" + orderId,
|
||||
modalName: "订单商品",
|
||||
search: false,
|
||||
showSearch: false,
|
||||
showToggle: false,
|
||||
showColumns: false,
|
||||
showRefresh: false,
|
||||
columns: [
|
||||
{
|
||||
field: 'orderGoodsId',
|
||||
title: '订单商品id',
|
||||
visible: false
|
||||
},
|
||||
{
|
||||
field: 'orderId',
|
||||
title: '订单id',
|
||||
visible: false
|
||||
},
|
||||
{
|
||||
field: 'goodsName',
|
||||
title: '商品名称'
|
||||
},
|
||||
{
|
||||
field: 'goodsNum',
|
||||
title: '商品数量'
|
||||
},
|
||||
{
|
||||
field: 'serverGoodsNum',
|
||||
title: '已服务数量'
|
||||
}
|
||||
]
|
||||
};
|
||||
$.table.init(options);
|
||||
}
|
||||
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
|
@ -831,7 +831,7 @@
|
|||
}
|
||||
|
||||
function detail(id) {
|
||||
var url = "order/goods?orderId=" + id;
|
||||
var url = "order/goods/master?orderId=" + id;
|
||||
$.modal.open("商品信息", url);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -92,6 +92,10 @@
|
|||
<label class="form-control-label">人员名称：</label>
|
||||
<input name="workerName" type="text" class="form-control normal-input m-r">
|
||||
</div>
|
||||
<div class="flex-board input-content m-t">
|
||||
<label class="form-control-label">手机号：</label>
|
||||
<input name="workerPhone" type="text" class="form-control normal-input m-r">
|
||||
</div>
|
||||
<div class="m-t">
|
||||
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search('workerForm')"><i
|
||||
class="fa fa-search"></i> 搜索</a>
|
||||
|
|
@ -215,7 +219,12 @@
|
|||
checkbox: true
|
||||
}, {
|
||||
field: 'name',
|
||||
title: '人员名称',
|
||||
title: '昵称',
|
||||
align: "left"
|
||||
},
|
||||
{
|
||||
field: 'realName',
|
||||
title: '真实姓名',
|
||||
align: "left"
|
||||
}, {
|
||||
field: 'phone',
|
||||
|
|
|
|||
|
|
@ -102,6 +102,14 @@
|
|||
<select id="selectOrderDetailList" parameterType="com.ghy.order.domain.OrderDetail" resultMap="OrderDetailResult">
|
||||
<include refid="selectOrderDetailMoreInfo"/>
|
||||
<where>
|
||||
<if test="keyWords != null and keyWords != ''">
|
||||
AND
|
||||
(
|
||||
om.code LIKE concat('%', #{keyWords}, '%')
|
||||
or ca.name LIKE concat('%', #{keyWords}, '%')
|
||||
or ca.phone LIKE concat('%', #{keyWords}, '%')
|
||||
)
|
||||
</if>
|
||||
<if test="deptId != null and deptId != ''">
|
||||
AND w.dept_id = #{deptId}
|
||||
</if>
|
||||
|
|
|
|||
|
|
@ -93,4 +93,6 @@ public class Worker extends BaseEntity {
|
|||
private Long exceptParentAreaId;
|
||||
|
||||
private String keyWords;
|
||||
|
||||
private String realName;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,7 +49,16 @@
|
|||
</sql>
|
||||
|
||||
<select id="getWorkerList" parameterType="com.ghy.worker.domain.Worker" resultMap="WorkerResult">
|
||||
<include refid="selectWorker" /> where w.worker_id in (
|
||||
SELECT
|
||||
w.worker_id, w.name, w.account, w.phone, w.password, w.open_id, w.wx_open_id, w.dept_id, w.status, w.worker_logo_url,
|
||||
w.leader_team_rate, w.leader_team_money, w.create_by, w.create_time, w.update_by, w.update_time,
|
||||
w.remark, w.type, w.store_status, w.alipay_account, w.alipay_name,concat(wc.surname, wc.name) as realName,
|
||||
sd.dept_name, sdc.banner_url
|
||||
FROM worker w
|
||||
LEFT JOIN sys_dept sd ON w.dept_id = sd.dept_id
|
||||
LEFT JOIN sys_dept_config sdc ON w.dept_id = sdc.dept_id
|
||||
LEFT JOIN worker_certification wc on w.worker_id = wc.worker_id
|
||||
where w.worker_id in (
|
||||
SELECT w.worker_id FROM worker w
|
||||
LEFT JOIN worker_area wa ON wa.worker_id = w.worker_id
|
||||
LEFT JOIN worker_goods_category wgc ON wgc.worker_id = w.worker_id
|
||||
|
|
|
|||
Loading…
Reference in New Issue