From 133307a0637193ca0c23f468aea2bd91c76e710a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 08 九月 2023 14:04:57 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderMapper.xml | 3 +
src/main/java/com/zy/crm/manager/mapper/OrderMapper.java | 2
src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java | 4 +-
src/main/webapp/static/js/order/order.js | 6 +++
src/main/java/com/zy/crm/manager/service/OrderService.java | 2
src/main/webapp/views/home/dashboard.html | 33 +++++++++++++++-
src/main/java/com/zy/crm/manager/controller/OrderController.java | 13 +++++-
7 files changed, 54 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/OrderController.java b/src/main/java/com/zy/crm/manager/controller/OrderController.java
index 51ddfb2..1209c35 100644
--- a/src/main/java/com/zy/crm/manager/controller/OrderController.java
+++ b/src/main/java/com/zy/crm/manager/controller/OrderController.java
@@ -52,12 +52,18 @@
@RequestParam(defaultValue = "10") Integer limit,
@RequestParam(required = false) String condition,
@RequestParam(required = false, value = "dept_id") Long deptId,
- @RequestParam(required = false, value = "user_id") Long userId){
+ @RequestParam(required = false, value = "user_id") Long userId,
+ @RequestParam Map<String, Object> param){
+ Integer status = null;
+ if (param.get("status") != null) {
+ status = Integer.parseInt(param.get("status").toString());
+ }
return R.ok(orderService.getPage(new Page<>(curr, limit)
, getHostId()
, deptId == null ? null : String.valueOf(deptId)
, userId == null ? getUserId() : userId
- , condition)
+ , condition
+ , status)
);
}
@@ -165,7 +171,8 @@
, getHostId()
, role.judgeLeader() ? String.valueOf(user.getDeptId()) : null
, user.getId()
- , condition);
+ , condition
+ , null);
List<KeyValueVo> vos = new ArrayList<>();
page.getRecords().forEach(item -> vos.add(new KeyValueVo(item.getName(), item.getId())));
return R.ok().add(vos);
diff --git a/src/main/java/com/zy/crm/manager/mapper/OrderMapper.java b/src/main/java/com/zy/crm/manager/mapper/OrderMapper.java
index c6c46df..ac40808 100644
--- a/src/main/java/com/zy/crm/manager/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/crm/manager/mapper/OrderMapper.java
@@ -18,7 +18,7 @@
Order selectOrderByNewestUuid(@Param("hostId") Long hostId);
- List<Order> listByPage(Page<Order> page, @Param("hostId")Long hostId, @Param("deptId") String deptId, @Param("userId") Long userId , @Param("condition") String condition);
+ List<Order> listByPage(Page<Order> page, @Param("hostId") Long hostId, @Param("deptId") String deptId, @Param("userId") Long userId, @Param("condition") String condition, @Param("status") Integer status);
Double selectMoneyByYearAndStatus(String year, Integer status);//鑾峰彇鎸囧畾骞翠唤鍜岃鍗曠姸鎬佹�讳氦鏄撻噾棰�
diff --git a/src/main/java/com/zy/crm/manager/service/OrderService.java b/src/main/java/com/zy/crm/manager/service/OrderService.java
index f85e809..3f917c9 100644
--- a/src/main/java/com/zy/crm/manager/service/OrderService.java
+++ b/src/main/java/com/zy/crm/manager/service/OrderService.java
@@ -14,7 +14,7 @@
String getUuid(Long hostId);
- Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId, String condition);
+ Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId, String condition, Integer status);
Double selectMoneyByYearAndStatus(String year, Integer status);//鑾峰彇鎸囧畾骞翠唤鍜岃鍗曠姸鎬佹�讳氦鏄撻噾棰�
diff --git a/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java
index 986cb26..a14e7aa 100644
--- a/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java
@@ -21,8 +21,8 @@
}
@Override
- public Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId, String condition) {
- return page.setRecords(baseMapper.listByPage(page, hostId, deptId, userId, condition));
+ public Page<Order> getPage(Page<Order> page, Long hostId, String deptId, Long userId, String condition, Integer status) {
+ return page.setRecords(baseMapper.listByPage(page, hostId, deptId, userId, condition, status));
}
@Override
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 2193d95..091faa1 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -91,6 +91,9 @@
<if test="hostId != null">
and mo.host_id = #{hostId}
</if>
+ <if test="status != null">
+ and mo.status = #{status}
+ </if>
<if test="condition != null and condition != ''">
and (
mo.uuid like concat('%',#{condition},'%')
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 3c5ed50..6ca4607 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -120,6 +120,11 @@
})
}
+ let where = {}
+ if (getQueryVariable('status') !== false) {
+ where = {status: getQueryVariable('status')}
+ }
+
// 鏁版嵁娓叉煋
tableIns = table.render({
elem: '#order',
@@ -132,6 +137,7 @@
height: 'full-148',
// size: 'sm',
skin: 'line',
+ where: where,
cols: [[
{type: 'checkbox'}
,{field: 'name', align: 'left',title: '璺熻釜椤圭洰鍚嶇О', style: 'color: #1890ff;cursor:pointer', event: 'more', width: 300}
diff --git a/src/main/webapp/views/home/dashboard.html b/src/main/webapp/views/home/dashboard.html
index de57f41..f5aeb2f 100644
--- a/src/main/webapp/views/home/dashboard.html
+++ b/src/main/webapp/views/home/dashboard.html
@@ -101,7 +101,7 @@
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
<div class="numberInfoSubTitle">璺熻釜椤圭洰鏁伴噺</div>
<div class="numberInfoValue">
- <span id="progressCount">124</span><em class="numberInfoSuffix">涓�</em>
+ <a href="#" id="openProgress"><span id="progressCount">124</span><em class="numberInfoSuffix">涓�</em></a>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
@@ -113,7 +113,7 @@
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
<div class="numberInfoSubTitle">鎴愪氦椤圭洰鏁伴噺</div>
<div class="numberInfoValue">
- <span id="successCount">121</span><em class="numberInfoSuffix">涓�</em>
+ <a href="#" id="openSuccess"><span id="successCount">121</span><em class="numberInfoSuffix">涓�</em></a>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
@@ -248,6 +248,7 @@
var $ = layui.jquery;
var layer = layui.layer;
var element = layui.element;
+ element.init();
//鑾峰彇鍥㈤槦鏁版嵁
$.ajax({
@@ -419,6 +420,34 @@
myCharts3.resize();
};
+ $("#openProgress").on("click", () => {
+ layer.open({
+ type: 2,
+ title: '璺熻釜椤圭洰',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../order/order.html?status=0',
+ success: function(layero, index){
+
+ }
+ });
+ });
+
+ $("#openSuccess").on("click", () => {
+ layer.open({
+ type: 2,
+ title: '璺熻釜椤圭洰',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../order/order.html?status=1',
+ success: function(layero, index){
+
+ }
+ });
+ });
+
});
</script>
</body>
--
Gitblit v1.9.1