From 6bbe80db09d7083e9ea25905597e4f047cd928a5 Mon Sep 17 00:00:00 2001 From: wuwenxiong <646448316@qq.com> Date: Tue, 31 Aug 2021 13:53:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E6=88=B7=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AE=A2=E6=88=B7=E7=B1=BB=E5=9E=8B=E3=80=81=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=90=8D=E7=A7=B0=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/sysuser/SysuserController.java | 16 +++++----- .../system/sysuser/SysuserSyncService.java | 29 +++++++++++++++++-- .../system/sysuser/SysuserController.java | 5 ++-- .../system/sysuser/SysuserSyncService.java | 28 +++++++++++------- 4 files changed, 57 insertions(+), 21 deletions(-) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserController.java index 9a7c9ae..b3bdb8d 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserController.java @@ -35,13 +35,15 @@ public class SysuserController extends Controller { * 分页查找 sysuser */ public void find() { - PageParam pp = getBean(PageParam.class, "", true); - String name = get("name", ""); - String phone = get("phone", ""); - Integer del = getInt("del", Const.LOGIC_DEL_VALID); // 默认显示未删除的 - Integer type = getInt("type"); - Integer entity_id = getInt("entity_id"); - renderJson(Result.object(SysuserSyncService.me.find(pp, name, phone, del, type, entity_id))); + PageParam pp = getBean(PageParam.class, "", true); + String name = get("name", ""); + String phone = get("phone", ""); + Integer del = getInt("del", Const.LOGIC_DEL_VALID); // 默认显示未删除的 + Integer type = getInt("type"); + Integer entity_id = getInt("entity_id"); + Integer customer_type = getInt("customer_type"); + String customer_name = get("customer_name"); + renderJson(Result.object(SysuserSyncService.me.find(pp, name, phone, del, type, entity_id, customer_type, customer_name))); } /** diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java index ce5fcd5..77e5044 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java @@ -295,7 +295,8 @@ public class SysuserSyncService extends BaseService { return sysuser; } - public Page find(PageParam pp, String name, String phone, Integer del, Integer type, Integer entity_id) { + public Page find(PageParam pp, String name, String phone, Integer del, Integer type, Integer entity_id, Integer customer_type, String customer_name) { + List paraList = new ArrayList<>(); StringBuilder sqlbuf = new StringBuilder(); sqlbuf.append(" from (\n"); sqlbuf.append("select \n"); @@ -313,7 +314,31 @@ public class SysuserSyncService extends BaseService { sqlbuf.append(" left join customer c on u.entity_id = c.id\n"); sqlbuf.append(") a\n"); sqlbuf.append("where 1 = 1"); - List paraList = new ArrayList<>(); + + if (type != null && type == UserTypeEnum.CUSTOMER.getTypeid()) { + sqlbuf.setLength(0); + sqlbuf.append(" from ( \n"); + sqlbuf.append(" select \n"); + sqlbuf.append(" u.id, u.phone, u.name, u.type, u.del, u.entity_id, c.name customer_name, c.texpayer_name, c.invoice_type, t.id customer_type, t.name customer_type_name \n"); + sqlbuf.append(" from sysuser u \n"); + sqlbuf.append(" left join customer c on u.entity_id = c.id\n"); + sqlbuf.append(" left join customer_type t on c.customer_type_id = t.id\n"); + sqlbuf.append(" union all\n"); + sqlbuf.append(" select o.sn id, o.customer_phone phone, '零散客户' name, 3 type, 0 del, null entity_id, o.customer_name, o.customer_texpayer_name texpayer_name, o.invoice_type, 99 customer_type, '零散' customer_type_name \n"); + sqlbuf.append(" from order_temp o \n"); + + sqlbuf.append(") a\n"); + sqlbuf.append("where 1 = 1"); + if (StrKit.notBlank(customer_name)) { + sqlbuf.append(" and a.customer_name like ? \n"); + paraList.add("%" + customer_name.trim() + "%"); + } + + if (customer_type != null && customer_type >= 0) { + sqlbuf.append(" and a.customer_type = ? \n"); + paraList.add(customer_type); + } + } if (StrKit.notBlank(name)) { sqlbuf.append(" and a.name like ? \n"); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java index c62908e..f09b3c3 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserController.java @@ -153,8 +153,9 @@ public class SysuserController extends Controller { Integer del = getInt("del", Const.LOGIC_DEL_VALID); // 默认显示未删除的 Integer type = getInt("type"); Integer entity_id = getInt("entity_id"); - String customer_name = get("customer_name"); - renderJson(Result.object(SysuserSyncService.me.find(pp, name, phone, del, type, entity_id, customer_name))); + Integer customer_type = getInt("customer_type"); + String customer_name = get("customer_name"); + renderJson(Result.object(SysuserSyncService.me.find(pp, name, phone, del, type, entity_id, customer_type, customer_name))); } /** diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java index ba2504f..ec84108 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java @@ -817,7 +817,7 @@ public class SysuserSyncService extends BaseSyncService { return sysuser; } - public Page find(PageParam pp, String name, String phone, Integer del, Integer type, Integer entity_id, String customer_name) { + public Page find(PageParam pp, String name, String phone, Integer del, Integer type, Integer entity_id, Integer customer_type, String customer_name) { List paraList = new ArrayList<>(); StringBuilder sqlbuf = new StringBuilder(); @@ -839,20 +839,28 @@ public class SysuserSyncService extends BaseSyncService { sqlbuf.append("where 1 = 1"); if (type != null && type == UserTypeEnum.CUSTOMER.getTypeid()) { - sqlbuf.setLength(0); - - sqlbuf.append(" from (\n"); - sqlbuf.append("select \n"); - sqlbuf.append(" u.id, u.phone, u.name, u.type, u.role, u.del, u.entity_id, c.name customer_name, c.texpayer_name, c.invoice_type \n"); - sqlbuf.append(" from sysuser u \n"); - sqlbuf.append(" left join customer c on u.entity_id = c.id\n"); - sqlbuf.append(") a\n"); - sqlbuf.append("where 1 = 1"); + sqlbuf.setLength(0); + sqlbuf.append(" from ( \n"); + sqlbuf.append(" select \n"); + sqlbuf.append(" u.id, u.phone, u.name, u.type, u.del, u.entity_id, c.name customer_name, c.texpayer_name, c.invoice_type, t.id customer_type, t.name customer_type_name \n"); + sqlbuf.append(" from sysuser u \n"); + sqlbuf.append(" left join customer c on u.entity_id = c.id\n"); + sqlbuf.append(" left join customer_type t on c.customer_type_id = t.id\n"); + sqlbuf.append(" union all\n"); + sqlbuf.append(" select o.sn id, o.customer_phone phone, '零散客户' name, 3 type, 0 del, null entity_id, o.customer_name, o.customer_texpayer_name texpayer_name, o.invoice_type, 99 customer_type, '零散' customer_type_name \n"); + sqlbuf.append(" from order_temp o \n"); + sqlbuf.append(") a\n"); + sqlbuf.append("where 1 = 1"); if (StrKit.notBlank(customer_name)) { sqlbuf.append(" and a.customer_name like ? \n"); paraList.add("%" + customer_name.trim() + "%"); } + + if (customer_type != null && customer_type >= 0) { + sqlbuf.append(" and a.customer_type = ? \n"); + paraList.add(customer_type); + } } if (StrKit.notBlank(name)) {