From 0ec69e2b1479f42f02dfae587aee3fab7a648883 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期二, 27 二月 2024 11:30:58 +0800
Subject: [PATCH] zjh 本地 2024/02/27 -1
---
ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java | 11 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java | 8 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 311 ++++++++++++++++++++++++++++++++++++++------
ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java | 17 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 5
ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml | 13 +
ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java | 15 ++
9 files changed, 339 insertions(+), 45 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index 4dca8d3..dcf20d4 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -1442,7 +1442,10 @@
StringBuilder stringBuilder = new StringBuilder();
for (TjOrderRemark remark : list) {
TjProject byId = projectService.getById(remark.getProId());
- stringBuilder.append(byId.getProName()).append(";");
+ if(null !=byId){
+ stringBuilder.append(byId.getProName()).append(";");
+ }
+
}
customer.setNotCheckeds(String.valueOf(stringBuilder));
if (null == customer.getNotCheckeds()) customer.setNotCheckeds("鍏ㄩ儴宸叉");
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index eff536a..8ee329b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -395,7 +395,9 @@
StringBuilder stringBuilder = new StringBuilder();
for (TjOrderRemark remark : list) {
TjProject byId = projectService.getById(remark.getProId());
- stringBuilder.append(byId.getProName()).append(";");
+ if(null !=byId){
+ stringBuilder.append(byId.getProName()).append(";");
+ }
}
customer.setNotCheckeds(String.valueOf(stringBuilder));
if (null == customer.getNotCheckeds()) customer.setNotCheckeds("鍏ㄩ儴宸叉");
@@ -426,47 +428,57 @@
@ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
- String userId = SecurityUtils.getLoginUser().getUserId();
- Integer ksId = null;
- SysUser sysUser = null;
- if (null != userId) {
- sysUser = userService.getById(Long.valueOf(userId));
- if (null != sysUser) {
- ksId = Math.toIntExact(sysUser.getDeptId());
- }
- }
- if (ksId == null) {
- return AjaxResult.error("璇疯緭鍏ョ瀹d");
- }
+// String userId = SecurityUtils.getLoginUser().getUserId();
+// Integer ksId = null;
+// SysUser sysUser = null;
+// if (null != userId) {
+// sysUser = userService.getById(Long.valueOf(userId));
+// if (null != sysUser) {
+// ksId = Math.toIntExact(sysUser.getDeptId());
+// }
+// }
+// if (ksId == null) {
+// return AjaxResult.error("璇疯緭鍏ョ瀹d");
+// }
+
+ //A30鍖栭獙
//鏍规嵁褰撳墠鐧婚檰鐨勪汉鐨勭瀹d锛岃幏鍙栬绉戝涓嬬殑鎵�鏈夐」鐩�
- List<Long> postIds = sysUser.getPostIds();
+// List<Long> postIds = sysUser.getPostIds();
List<Long> ksproList = null;
- if (postIds != null) {
- for (Long postId : postIds) {
- LambdaQueryWrapper<SysUserPost> wq111 = new LambdaQueryWrapper<>();
- wq111.eq(SysUserPost::getPostId, postId);
- SysUserPost one = userPostService.getOne(wq111);
- if (one != null) {
- SysPost byId = postService.getById(one.getPostId());
- if (byId.getPostName().equals("褰曞叆鍛�")) {
- ksproList = projectService.getKsTjProjectIdListBydeptId(String.valueOf(ksId));
- }
- }
- }
- } else {
- ksproList = projectService.getKsTjProjectIdList();
- }
+// if (postIds != null) {
+// for (Long postId : postIds) {
+// LambdaQueryWrapper<SysUserPost> wq111 = new LambdaQueryWrapper<>();
+// wq111.eq(SysUserPost::getPostId, postId);
+// SysUserPost one = userPostService.getOne(wq111);
+// if (one != null) {
+// SysPost byId = postService.getById(one.getPostId());
+// if (byId.getPostName().equals("褰曞叆鍛�")) {
+// ksproList = projectService.getKsTjProjectIdListBydeptId(String.valueOf(ksId));
+// }
+// }
+// }
+// } else {
+// ksproList = projectService.getKsTjProjectIdList();
+// }
+
+// if(sysUser.getUserName().equals("10001")){
+ ksproList = projectService.getHuaYanProId();
+// }
+// else {
+// ksproList = projectService.getKsTjProjectIdListBydeptId(String.valueOf(ksId));
+// }
+
if (ksproList == null || ksproList.size() == 0) {
return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
}
//绛涢�夊寲楠岀殑椤圭洰銆�
- ksproList = ksproList.stream()
- .filter(element -> element ==1633660948860522629L)
- .collect(Collectors.toList());
+// ksproList = ksproList.stream()
+// .filter(element -> element ==1633660948860522629L)
+// .collect(Collectors.toList());
List<TjCustomer> customerLis = new ArrayList<>();
- //鏍规嵁浣撴鍙锋煡
+/* //鏍规嵁浣撴鍙锋煡
if (null != tjNumber) {
List<TjOrder> orderList = orderService.getOrderListByLikeTjNum(tjNumber);
if (null == orderList) {
@@ -602,17 +614,197 @@
return AjaxResult.success("鏆傛棤鏁版嵁");
}
}
- List<TjCustomer> customerLists = null;
+ List<TjCustomer> customerLists = null;*/
+// //鏍规嵁浣撴鍙锋煡
+// if (null != tjNumber) {
+// List<TjOrder> orderList = orderService.getOrderListByLikeTjNum(tjNumber);
+// if (null == orderList) {
+// return AjaxResult.success("鏆傛椂娌℃湁鏁版嵁");
+// }
+// for (TjOrder order : orderList) {
+// List<TjOrderDetail> list = Optional.ofNullable(detailService.getTjOrderDetailListByOrderId(String.valueOf(order.getOrderId()))).get();
+// if (list.size() == 0) {
+// continue;
+// }
+// LambdaQueryWrapper<TjOrderRemark> wqs = new LambdaQueryWrapper<>();
+// wqs.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
+// wqs.in(TjOrderRemark::getType, 0,3);
+// List<TjOrderRemark> lists = remarkService.list(wqs);
+// TjCustomer customer = customerService.getById(order.getUserId());
+//
+// //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
+// for (TjOrderDetail tjOrderDetail11 : list) {
+// customer.setIsPositive(tjOrderDetail11.getIsPositive());
+// if (tjOrderDetail11.getIsPositive()==1){
+// break;
+// }
+// }
+//
+// customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
+// customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+// customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
+// if (null != lists && lists.size() > 0) {
+// StringBuilder stringBuilder = new StringBuilder();
+// for (TjOrderRemark remark : lists) {
+// TjProject byId = projectService.selectTjProjectByProId(remark.getProId());
+// TjOrderDetail one = detailService.getTjOrderDetailByOrderId(String.valueOf(order.getOrderId()), String.valueOf(byId.getProId()));
+// if (one.getFlowingWaterId() != null) {
+// stringBuilder.append(byId.getProName()).append(";");
+// }
+//
+// }
+// customer.setNotCheckeds(String.valueOf(stringBuilder));
+// customer.setTjStatus(0L);
+// } else {
+// customer.setTjStatus(1L);
+// customer.setNotCheckeds("鏃�");
+// }
+// if (order.getTjType().equals("1")) {
+// customer.setTjType("鍥綋");
+// }
+// if (order.getTjType().equals("2")) {
+// customer.setTjType("涓汉");
+// }
+// customer.setTjTime(order.getCreateTime());
+// customer.setTjNumber(order.getTjNumber());
+// customer.setOrderId(order.getOrderId());
+// customer.setIsHz(order.getIsHz());
+// customer.setTjCategory(order.getTjCategory());
+// customerLis.add(customer);
+// }
+// if (customerLis.size() > 0) {
+// List<TjCustomer> customerList = customerLis.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+// Collections.reverse(customerList);
+// Map<String, Object> map = new HashMap<>();
+// map.put("date", customerList);
+// map.put("total", customerLis.size());
+// return AjaxResult.success(map);
+// } else {
+// return AjaxResult.success("鏆傛棤鏁版嵁");
+// }
+// }
+//
+// //鏍规嵁濮撳悕鏌ヨ
+// if (null != name && !"".equals(name)) {
+// LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
+// wq.like(TjCustomer::getCusName, name);
+// List<TjCustomer> list = customerService.list(wq);
+// List<TjCustomer> list11111 = new ArrayList<>();
+// if (null != list && list.size() > 0) {
+// for (TjCustomer customer : list) {
+// customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
+// customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+// customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
+// List<TjOrder> orderList = orderService.getOrderListByCusId(String.valueOf(customer.getCusId()));
+// if (null != orderList && orderList.size() > 0) {
+// for (TjOrder order : orderList) {
+// List<TjOrderDetail> list111 = Optional.ofNullable(detailService.getTjOrderDetailListByOrderId(String.valueOf(order.getOrderId()))).get();
+// if (list111.size() == 0) {
+// continue;
+// }
+// //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
+// for (TjOrderDetail tjOrderDetail11 : list111) {
+// customer.setIsPositive(tjOrderDetail11.getIsPositive());
+// if (tjOrderDetail11.getIsPositive()==1){
+// break;
+// }
+// }
+// List<TjOrderRemark> lists = remarkService.getTjOrderRemarkListByYjNum(order.getTjNumber());
+// if (null != lists && lists.size() > 0) {
+// StringBuilder stringBuilder = new StringBuilder();
+// for (TjOrderRemark remark : lists) {
+// TjProject byId = projectService.selectTjProjectByProId(remark.getProId());
+// TjOrderDetail one = detailService.getTjOrderDetailByOrderId(String.valueOf(order.getOrderId()), String.valueOf(byId.getProId()));
+// if (one.getFlowingWaterId() != null) {
+// stringBuilder.append(byId.getProName()).append(";");
+// }
+// }
+// customer.setNotCheckeds(String.valueOf(stringBuilder));
+// if (null == customer.getNotCheckeds()) customer.setNotCheckeds("鍏ㄩ儴宸叉");
+// customer.setTjStatus(0L);
+// } else {
+// customer.setNotCheckeds("鏃�");
+// customer.setTjStatus(1L);
+// }
+// if (order.getTjType().equals("1")) {
+// customer.setTjType("鍥綋");
+// }
+// if (order.getTjType().equals("2")) {
+// customer.setTjType("涓汉");
+// }
+// customer.setTjTime(order.getCreateTime());
+// customer.setTjNumber(order.getTjNumber());
+// customer.setOrderId(order.getOrderId());
+// customer.setIsHz(order.getIsHz());
+// customer.setTjCategory(order.getTjCategory());
+// list11111.add(customer);
+// }
+// }
+// }
+// if (list11111.size() == 0) {
+// return AjaxResult.success("鏆傛棤鏁版嵁");
+// }
+// Map<String, Object> map = new HashMap<>();
+// List<TjCustomer> customers = list11111.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+// Collections.reverse(customers);
+// map.put("customers", customers);
+// map.put("total", list11111.size());
+// return AjaxResult.success(map);
+// } else {
+// return AjaxResult.success("鏆傛棤鏁版嵁");
+// }
+// }
+// List<TjCustomer> customerLists = new ArrayList<>();
+
+// String key="*";
+// if(sysUser.isAdmin()){
+// key="ks"+":*";
+// }else {
+// key="ks:"+ksId+":*";
+// }
+// ScanOptions options = ScanOptions.scanOptions()
+// //杩欓噷鎸囧畾姣忔鎵弿key鐨勬暟閲�(寰堝鍗氬鐬庤瑕佹寚瀹欼nteger.MAX_VALUE锛岃繖鏍风殑璇濊窡 keys鏈変粈涔堝尯鍒紵)
+// .count(10000)
+// .match(key).build();
+// RedisSerializer<String> redisSerializer = (RedisSerializer<String>) redisTemplate.getKeySerializer();
+// 0鏈,1宸叉
+ Map<String,Object> map=null;
if (type == 0) {
+// Cursor cursor = redisTemplate.executeWithStickyConnection(redisConnection -> new ConvertingCursor<>(redisConnection.scan(options), redisSerializer::deserialize));
+// List<TjCustomer> customers = new ArrayList<>();
+// while(cursor.hasNext()){
+// String s = cursor.next().toString();
+// TjCustomer wj = redisCache.getCacheMapValue(s,"0");
+// if(null !=wj){
+// customers.add(wj);
+// }
+// }
+//// //鍒囪杩欓噷涓�瀹氳鍏抽棴锛屽惁鍒欎細鑰楀敖杩炴帴鏁般�傛姤Cannot get Jedis connection; nested exception is redis.clients.jedis.exceptions.JedisException: Could not get a
+// cursor.close();
// customerLists = redisCache.getCacheMapValue(ksId + "ks", "wj");
+ map = deptService.getSysDeptHyAndYxYjWjCustomerList13("A30", name, tjNumber, 0, page, pageSize);
+// customerLists = customers;
}
if (type == 1) {
+// Cursor cursor = redisTemplate.executeWithStickyConnection(redisConnection -> new ConvertingCursor<>(redisConnection.scan(options), redisSerializer::deserialize));
+// List<TjCustomer> customers = new ArrayList<>();
+// while(cursor.hasNext()){
+// String s = cursor.next().toString();
+// TjCustomer wj = redisCache.getCacheMapValue(s,"1");
+// if(null !=wj){
+// customers.add(wj);
+// }
+// }
+//// //鍒囪杩欓噷涓�瀹氳鍏抽棴锛屽惁鍒欎細鑰楀敖杩炴帴鏁般�傛姤Cannot get Jedis connection; nested exception is redis.clients.jedis.exceptions.JedisException: Could not get a
+// cursor.close();
// customerLists = redisCache.getCacheMapValue(ksId + "ks", "yj");
+ map = deptService.getSysDeptHyAndYxYjWjCustomerList13("A30", name, tjNumber, 1, page, pageSize);
+// customerLists = customers;
}
- asyncService.dockerSetCustomerLisByRedis(ksproList, String.valueOf(ksId));
- AjaxResult map = getAjaxResult(type, page, pageSize, ksproList, customerLis);
- if (map != null) return map;
- return AjaxResult.success("鏆傛椂娌℃湁鏁版嵁");
+// asyncService.dockerSetCustomerLisByRedis(ksproList, String.valueOf(ksId));
+// AjaxResult map = getAjaxResult(type, page, pageSize, ksproList, customerLis);
+// if (map != null) return map;
+ return AjaxResult.success(map);
}
@@ -626,7 +818,7 @@
@ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
- String userId = SecurityUtils.getLoginUser().getUserId();
+/* String userId = SecurityUtils.getLoginUser().getUserId();
Integer ksId = null;
SysUser sysUser = null;
if (null != userId) {
@@ -657,7 +849,7 @@
} else {
ksproList = projectService.getKsTjProjectIdList();
}
- //绛涢�夊奖鍍忕殑椤圭洰銆�
+ //绛涢�夊奖鍍忕殑椤圭洰銆� A32褰卞儚
if (ksproList.size() == 0) {
return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
}
@@ -675,7 +867,10 @@
// ||
// element ==1633660948860522531L|| element ==1633660948860522533L
)
- .collect(Collectors.toList());
+ .collect(Collectors.toList());*/
+
+
+ List<Long> ksproList = projectService.getYingXiangProId();
List<TjCustomer> customerLis = new ArrayList<>();
//鏍规嵁浣撴鍙锋煡
@@ -815,11 +1010,38 @@
}
}
List<TjCustomer> customerLists = null;
+ Map<String,Object> map=null;
if (type == 0) {
+// Cursor cursor = redisTemplate.executeWithStickyConnection(redisConnection -> new ConvertingCursor<>(redisConnection.scan(options), redisSerializer::deserialize));
+// List<TjCustomer> customers = new ArrayList<>();
+// while(cursor.hasNext()){
+// String s = cursor.next().toString();
+// TjCustomer wj = redisCache.getCacheMapValue(s,"0");
+// if(null !=wj){
+// customers.add(wj);
+// }
+// }
+//// //鍒囪杩欓噷涓�瀹氳鍏抽棴锛屽惁鍒欎細鑰楀敖杩炴帴鏁般�傛姤Cannot get Jedis connection; nested exception is redis.clients.jedis.exceptions.JedisException: Could not get a
+// cursor.close();
// customerLists = redisCache.getCacheMapValue(ksId + "ks", "wj");
+ map = deptService.getSysDeptHyAndYxYjWjCustomerList13("A32", name, tjNumber, 0, page, pageSize);
+// customerLists = customers;
}
if (type == 1) {
+// Cursor cursor = redisTemplate.executeWithStickyConnection(redisConnection -> new ConvertingCursor<>(redisConnection.scan(options), redisSerializer::deserialize));
+// List<TjCustomer> customers = new ArrayList<>();
+// while(cursor.hasNext()){
+// String s = cursor.next().toString();
+// TjCustomer wj = redisCache.getCacheMapValue(s,"1");
+// if(null !=wj){
+// customers.add(wj);
+// }
+// }
+//// //鍒囪杩欓噷涓�瀹氳鍏抽棴锛屽惁鍒欎細鑰楀敖杩炴帴鏁般�傛姤Cannot get Jedis connection; nested exception is redis.clients.jedis.exceptions.JedisException: Could not get a
+// cursor.close();
// customerLists = redisCache.getCacheMapValue(ksId + "ks", "yj");
+ map = deptService.getSysDeptHyAndYxYjWjCustomerList13("A32", name, tjNumber, 1, page, pageSize);
+// customerLists = customers;
}
// asyncService.dockerSetCustomerLisByRedis(ksproList, String.valueOf(ksId));
// if (customerLists.size() > 0) {
@@ -830,9 +1052,10 @@
// map.put("total", customerLists.size());
// return AjaxResult.success(map);
// } else {
- AjaxResult map = getAjaxResult(type, page, pageSize, ksproList, customerLis);
- if (map != null) return map;
- return AjaxResult.success("鏆傛椂娌℃湁鏁版嵁");
+// AjaxResult map = getAjaxResult(type, page, pageSize, ksproList, customerLis);
+// if (map != null) return map;
+// return AjaxResult.success("鏆傛椂娌℃湁鏁版嵁");
+ return AjaxResult.success(map);
// }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
index ffdf03f..43956b1 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
@@ -147,4 +147,15 @@
"tj_project a LEFT JOIN tj_project b ON b.pro_parent_id=a.pro_id WHERE\n" +
"a.pro_parent_id=0 AND a.pro_status=0 AND a.pro_id=b.pro_parent_id GROUP BY a.pro_id")
List<TjProject> getPacTjProjectList();
+
+
+ @Select("SELECT a.pro_id FROM tj_project a JOIN sys_dept b ON a.dept_id=b.dept_id WHERE a.deleted=0 AND b.parent_org_code='A30' AND a.need_report='Y'")
+ List<Long> getHuaYanProId();
+
+ @Select("SELECT a.pro_id FROM tj_project a JOIN sys_dept b ON a.dept_id=b.dept_id WHERE a.deleted=0 AND b.parent_org_code='A32' AND a.need_report='Y'")
+ List<Long> getYingXiangProId();
+
+
+
+ List<Long> getHuaYanKsProId(String ksId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
index e7a3a23..2a39360 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java
@@ -112,4 +112,12 @@
List<TjProject> getPacTjProjectList();
+
+ List<Long> getHuaYanProId();
+
+ List<Long> getYingXiangProId();
+
+ List<Long> getHuaYanKsProId(String ksId);
+
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
index 86fefd5..d36c51d 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java
@@ -216,6 +216,21 @@
return tjProjectMapper.getPacTjProjectList();
}
+ @Override
+ public List<Long> getHuaYanProId() {
+ return tjProjectMapper.getHuaYanProId();
+ }
+
+ @Override
+ public List<Long> getYingXiangProId() {
+ return tjProjectMapper.getYingXiangProId();
+ }
+
+ @Override
+ public List<Long> getHuaYanKsProId(String ksId) {
+ return tjProjectMapper.getHuaYanKsProId(ksId);
+ }
+
/**
* 閫掑綊鍒楄〃
*/
diff --git a/ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java b/ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java
index 065cbc3..e510f0c 100644
--- a/ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java
+++ b/ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java
@@ -139,5 +139,7 @@
List<List<?>> getSysDeptYjWjCustomerList13(Map<String,Object> map);
+ List<List<?>> getSysDeptHyAndYxYjWjCustomerList13(Map<String,Object> map);
+
List<ResultSet> getSysDeptYjWjCustomerList2(Map<String,Object> map);
}
diff --git a/ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java b/ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java
index b55c610..58b836c 100644
--- a/ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java
+++ b/ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java
@@ -147,4 +147,6 @@
ResultSet getSysDeptYjWjCustomerList12(String deptid, String tjname, String tjNumber, int type, int page , int pageSize);
Map<String,Object> getSysDeptYjWjCustomerList13(String deptid, String tjname, String tjNumber, int type, int page , int pageSize);
+
+ Map<String,Object> getSysDeptHyAndYxYjWjCustomerList13(String deptid, String tjname, String tjNumber, int type, int page , int pageSize);
}
diff --git a/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java b/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java
index 77f18ee..2eecbba 100644
--- a/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java
+++ b/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java
@@ -405,4 +405,21 @@
return map1 ;
// return deptMapper.getSysDeptYjWjCustomerList(deptid,tjname,tjNumber,type,page,pageSize);
}
+
+ @Override
+ public Map<String, Object> getSysDeptHyAndYxYjWjCustomerList13(String deptid, String tjname, String tjNumber, int type, int page, int pageSize) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("deptid",deptid);
+ map.put("tjname",tjname);
+ map.put("tjNumber",tjNumber);
+ map.put("type",type);
+ map.put("page",page);
+ map.put("pageSize",pageSize);
+ List<List<?>> list = deptMapper.getSysDeptHyAndYxYjWjCustomerList13(map);
+ Map<String,Object> map1=new HashMap<>();
+ map1.put("date",list);
+ map1.put("total",map.get("totalRows"));
+
+ return map1 ;
+ }
}
diff --git a/ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 6565f35..1cb02f2 100644
--- a/ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -357,4 +357,17 @@
)}
</select>
+
+ <select id="getSysDeptHyAndYxYjWjCustomerList13" parameterType="java.util.Map" statementType="CALLABLE" resultType="java.util.Map">
+ {call check_hyAndYx_list(
+ #{deptid,mode=IN,jdbcType=VARCHAR},
+ #{tjname,mode=IN,jdbcType=VARCHAR},
+ #{tjNumber,mode=IN,jdbcType=VARCHAR},
+ #{type,mode=IN,jdbcType=INTEGER},
+ #{page,mode=IN,jdbcType=INTEGER},
+ #{pageSize,mode=IN,jdbcType=INTEGER},
+ #{totalRows,mode=OUT,jdbcType=INTEGER}
+ )}
+ </select>
+
</mapper>
--
Gitblit v1.8.0