From 8b5f92972cf09ff0e52b5d15f44ba11e579a5928 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 05 六月 2025 16:27:16 +0800
Subject: [PATCH] 总价传递问题
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 1377 +++++++++++-----------------------------------------------
1 files changed, 274 insertions(+), 1,103 deletions(-)
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 7e7046a..fbb30fa 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
@@ -153,12 +153,12 @@
@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
String userId = SecurityUtils.getLoginUser().getUserId();
- Integer ksId = null;
+ String ksId = null;
SysUser sysUser = null;
if (null != userId) {
sysUser = userService.getById(Long.valueOf(userId));
if (null != sysUser) {
- ksId = Math.toIntExact(sysUser.getDeptId());
+ ksId = sysUser.getDeptId().toString();
}
}
if (ksId == null) {
@@ -167,294 +167,55 @@
//鏍规嵁褰撳墠鐧婚檰鐨勪汉鐨勭瀹d锛岃幏鍙栬绉戝涓嬬殑鎵�鏈夐」鐩�
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));
- }
- }
+
+ String byKey =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));
+// }
+// if (byId.getPostName().equals("鍓嶅彴")) {
+// byKey = configService.selectConfigByKey("qt_kjksid");
+//
+// }
+// }
+// }
+// } else {
+// ksproList = projectService.getKsTjProjectIdList();
+// }
+//
+// if (ksproList == null || ksproList.isEmpty()) {
+// return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
+// }
+
+ List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+ if (null != roles && !roles.isEmpty()) {
+ List<SysRole> list = roles.stream().filter(item -> item.getRoleName().contains("鍓嶅彴")).collect(Collectors.toList());
+ if (!list.isEmpty()) {
+ byKey = configService.selectConfigByKey("qt_kjksid");
}
- } else {
- ksproList = projectService.getKsTjProjectIdList();
}
- if (ksproList == null || ksproList.size() == 0) {
- return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
- }
- List<TjCustomer> customerLis = new ArrayList<>();
if (null == name) name = "";
if (null == tjNumber) tjNumber = "";
-
-// //鏍规嵁浣撴鍙锋煡
-// 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 ( StringUtil.isNotBlank(byKey)) {
+ ksId+=(","+byKey);
+ }
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.getSysDeptYjWjCustomerList13(String.valueOf(ksId), name, tjNumber, 0, page, pageSize);
-// customerLists = customers;
+ map = deptService.getSysDeptYjWjCustomerList13(ksId, name, tjNumber, 0, page, pageSize);
}
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.getSysDeptYjWjCustomerList13(String.valueOf(ksId), name, tjNumber, 1, page, pageSize);
-// customerLists = customers;
+ map = deptService.getSysDeptYjWjCustomerList13(ksId, name, tjNumber, 1, page, pageSize);
}
return AjaxResult.success(map);
-// asyncService.dockerSetCustomerLisByRedis(ksproList, String.valueOf(ksId));
-// if (null !=customerLists && customerLists.size() > 0) {
-// Collections.reverse(customerLists);
-// List<TjCustomer> customerList = customerLists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-// Map<String, Object> map = new HashMap<>();
-// map.put("date", customerList);
-// 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("鏆傛椂娌℃湁鏁版嵁");
-// }
- }
- private AjaxResult getAjaxResult(Integer type, Integer page, Integer pageSize, List<Long> ksproList, List<TjCustomer> customerLis) {
- LambdaQueryWrapper<TjOrderDetail> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjOrderDetail::getTjStatus, type);
- wq1.in(TjOrderDetail::getProId, ksproList);
- wq1.isNotNull(TjOrderDetail::getFlowingWaterId);
- wq1.orderByDesc(TjOrderDetail::getCreateTime);
- List<TjOrderDetail> detailList = detailService.list(wq1);
- if (null != detailList && detailList.size() > 0) {
- //鏀堕泦orderId骞跺幓閲�
- List<Long> orderIds = detailList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(
- () -> new TreeSet<>(Comparator.comparing(TjOrderDetail::getOrderId))
- ), ArrayList::new)).stream().map(TjOrderDetail::getOrderId).collect(Collectors.toList());
- for (Long orderId : orderIds) {
- if (null != orderId) {
- TjOrder order = orderService.getById(orderId);
- if (null == order) {
- continue;
- }
- if (type == 1) {
- List<TjOrderDetail> list = detailService.getTjOrderDetailListByOrderIdAndStatus(String.valueOf(orderId));
- if (null != list && list.size() > 0) {
- continue;
- }
- }
- TjCustomer customer = customerService.getById(order.getUserId());
- if (null != customer) {
- if (order.getTjType().equals("1")) {
- customer.setTjType("鍥綋");
- }
- if (order.getTjType().equals("2")) {
- customer.setTjType("涓汉");
- }
- customer.setTjTime(order.getCreateTime());
- customer.setTjNumber(order.getTjNumber());
- customer.setOrderId(orderId);
- customer.setIsHz(order.getIsHz());
- customer.setTjStatus(Long.valueOf(type));
- List<TjOrderRemark> list = remarkService.getTjOrderRemarkListByYjNum(order.getTjNumber());
- if (null != list && list.size() > 0) {
- StringBuilder stringBuilder = new StringBuilder();
- for (TjOrderRemark remark : list) {
- TjProject byId = projectService.getById(remark.getProId());
- if (null != byId) {
- stringBuilder.append(byId.getProName()).append(";");
- }
- }
- customer.setNotCheckeds(String.valueOf(stringBuilder));
- if (null == customer.getNotCheckeds()) customer.setNotCheckeds("鍏ㄩ儴宸叉");
- }
- 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);
- }
- }
- return null;
}
/**
@@ -467,382 +228,11 @@
@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");
-// }
-
- //A30鍖栭獙
- //鏍规嵁褰撳墠鐧婚檰鐨勪汉鐨勭瀹d锛岃幏鍙栬绉戝涓嬬殑鎵�鏈夐」鐩�
-// 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(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());
-
- List<TjCustomer> customerLis = new ArrayList<>();
-
-/* //鏍规嵁浣撴鍙锋煡
- 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());
- 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());
- 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 = 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;
+ map = deptService.getSysDeptHyAndYxYjWjCustomerList13( name, tjNumber, 0, page, pageSize);
}
- 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;
+ if (type == 1) map = deptService.getSysDeptHyAndYxYjWjCustomerList13(name, tjNumber, 1, page, pageSize);
return AjaxResult.success(map);
}
@@ -857,245 +247,16 @@
@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");
- }
- //鏍规嵁褰撳墠鐧婚檰鐨勪汉鐨勭瀹d锛岃幏鍙栬绉戝涓嬬殑鎵�鏈夐」鐩�
- 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();
- }
- //绛涢�夊奖鍍忕殑椤圭洰銆� A32褰卞儚
- if (ksproList.size() == 0) {
- return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
- }
- ksproList = ksproList.stream()
- .filter(element -> element ==1633660948860522589L
-// || element ==1633660948860522504L
-// ||
-// element ==1633660948860522507L|| element ==1633660948860522508L
-// ||
-// element ==1633660948860522515L|| element ==1633660948860522516L
-// ||
-// element ==1633660948860522517L|| element ==1633660948860522519L
-// ||
-// element ==1633660948860522524L|| element ==1633660948860522530L
-// ||
-// element ==1633660948860522531L|| element ==1633660948860522533L
- )
- .collect(Collectors.toList());*/
-
-
-// List<Long> ksproList = projectService.getYingXiangProId();
-// List<TjCustomer> customerLis = new ArrayList<>();
-//
-// //鏍规嵁浣撴鍙锋煡
-// 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());
-// 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());
-// 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 = 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;
+
+ map = deptService.getSysDeptHyAndYxYjWjCustomerList13( name, tjNumber, 0, page, pageSize);
}
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;
+ map = deptService.getSysDeptHyAndYxYjWjCustomerList13( name, tjNumber, 1, page, pageSize);
}
-// asyncService.dockerSetCustomerLisByRedis(ksproList, String.valueOf(ksId));
-// if (customerLists.size() > 0) {
-// Collections.reverse(customerLists);
-// List<TjCustomer> customerList = customerLists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-// Map<String, Object> map = new HashMap<>();
-// map.put("date", customerList);
-// 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("鏆傛椂娌℃湁鏁版嵁");
return AjaxResult.success(map);
-// }
}
@@ -1107,23 +268,10 @@
@ApiParam(value = "骞撮緞鍗曚綅") @RequestParam String patagename,
@ApiParam(value = "鐢熸棩)") @RequestParam Date patbirth) {
- String format = DateUtil.format(patbirth, "yyyy.MM.dd");
List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList(patname, sex, null);
return AjaxResult.success(tjYxjcList);
}
-
-
-// @GetMapping("/getSsTjYxjcList")
-// @ApiOperation("鏌ヨ涓汉褰卞搷妫�鏌ラ」鐩粨鏋滈泦(鎼滅礌鐢�)")
-// public AjaxResult getSsTjYxjcList(@ApiParam(value = "濮撳悕") @RequestParam String patname,
-// @ApiParam(value = "鎬у埆") @RequestParam String sex,
-// @ApiParam(value = "骞撮緞") @RequestParam String patage) {
-//
-//
-// List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList(patname,sex,null,null);
-// return AjaxResult.success(tjYxjcList);
-// }
/**
@@ -1386,7 +534,7 @@
// }
logger.info("鎺ュ彛 DataSourceContextHolder ->{}", DataSourceContextHolder.getDataSourceKey());
logger.info("鎺ュ彛 DynamicDataSourceContextHolder ->{}", DynamicDataSourceContextHolder.getDataSourceType());
- asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order,orderRemark);
+ asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order, orderRemark);
LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
qww.eq(TjOrderDetail::getProId, orderRemark.getProId());
@@ -1436,6 +584,7 @@
// 淇敼鎸夌収绉戝鏌ヨ
public AjaxResult getParentList(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
String userId = SecurityUtils.getLoginUser().getUserId();
+ log.info("褰撳墠鐧诲綍鐢ㄦ埛ID ->{}",userId);
Integer ksId = null;
SysUser sysUser = null;
if (null != userId) {
@@ -1511,244 +660,266 @@
}
}
}
- List<TjOrderRemark> list;
- if(null != sysUser && sysUser.getUserName().equals("10001")){
- list=remarkService.yiShengJianChaGetPrentProCJGLY(tjNumber);
- }else {
- list= remarkService.yiShengJianChaGetPrentPro(tjNumber, split);
+ log.info("鏌ヨ鍏宠仈绉戝闆嗗悎 ->{}",split);
+ List<TjOrderRemark> list;
+ if (null != sysUser && sysUser.getUserName().equals("10001")) {
+ list = remarkService.yiShengJianChaGetPrentProCJGLY(tjNumber);
+ } else {
+ list = remarkService.yiShengJianChaGetPrentPro(tjNumber, split);
+ }
+ if (null == list || list.isEmpty()) {
+ log.info("瑙﹀彂璇ョ瀹や笅鏃犻」鐩�");
+ return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
+ }
+ for (TjOrderRemark tjOrderRemark : list) {
+ TjProject tjProject = projectService.getById(tjOrderRemark.getProId());
+ if (null != tjProject) {
+ tjOrderRemark.setProName(tjProject.getProName());
}
- if (null ==list || list.isEmpty()) {
- return AjaxResult.error("璇ョ瀹や笅鏃犻」鐩紒");
- }
- for (TjOrderRemark tjOrderRemark : list) {
- TjProject tjProject = projectService.getById(tjOrderRemark.getProId());
- if (null != tjProject) {
- tjOrderRemark.setProName(tjProject.getProName());
- }
- }
- return AjaxResult.success(list);
-}
-
-@Transactional
-public void extracted(TjOrder tjOrder, TjFlowingWater tjFlowingWater) {
- tjFlowingWater.setPayStasus(1L);
- tjFlowingWater.setPayType(0L);
- tjFlowingWater.setTollCollectorId("148");
- tjFlowingWaterService.updateById(tjFlowingWater);
- Long tjSerialNumber = tjFlowingWater.getTjSerialNumber();
- LambdaQueryWrapper<TjOrderDetail> tjOrderDetailLambdaQueryWrapper = new LambdaQueryWrapper<>();
- tjOrderDetailLambdaQueryWrapper.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
- List<TjOrderDetail> tjOrderDetails = detailService.list(tjOrderDetailLambdaQueryWrapper);
- List<Long> detailIds = tjOrderDetails.stream().map(TjOrderDetail::getOrderDetailId).collect(Collectors.toList());
- LambdaUpdateWrapper<TjOrderDetail> tjOrderDetailLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
- tjOrderDetailLambdaUpdateWrapper.set(TjOrderDetail::getFlowingWaterId, tjSerialNumber);
- tjOrderDetailLambdaUpdateWrapper.in(TjOrderDetail::getOrderDetailId, detailIds);
- detailService.update(tjOrderDetailLambdaUpdateWrapper);
- remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString());
-}
-
-/**
- * 鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏
- *
- * @return
- */
-@GetMapping("/getOrderDetailByProParentId")
-@ApiOperation("鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏")
-public AjaxResult getOrderDetailByProParentId(@ApiParam(value = "鐖堕」鐩甶d") @RequestParam String proParentId,
- @ApiParam(value = "浣撴鍙�") @RequestParam String tjNumber) {
- if (null == SecurityUtils.getLoginUser().getUserId() || null == userService.getById(SecurityUtils.getLoginUser().getUserId())) {
- return AjaxResult.error("鑾峰彇鐢ㄦ埛淇℃伅閿欒");
+ }
+ return AjaxResult.success(list);
}
- TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);
- List<TjProject> proParentList = projectService.getTjProjectListByTbTransition(proParentId, tjNumber);
+ @GetMapping("/getParentListWs")
+ @ApiOperation(value = "鍖荤敓鐣岄潰澶栭�佽彍鍗�(鍙樉绀虹埗椤圭洰鍒楄〃)")
+// 淇敼鎸夌収绉戝鏌ヨ
+ public AjaxResult getParentListWs(@ApiParam(value = "瀹㈡埛浣撴鍙�") @RequestParam String tjNumber) {
+ TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
+ if (null == tjOrder) {
+ return AjaxResult.error("鏈壘鍒颁綋妫�璁板綍");
+ }
+ List<TjOrderRemark> list = remarkService.yiShengJianChaGetPrentProWs(tjNumber);
+ if (null == list || list.isEmpty()) {
+ return AjaxResult.error("鏆傛棤澶栭�侀」鐩紒");
+ }
+ for (TjOrderRemark tjOrderRemark : list) {
+ TjProject tjProject = projectService.getById(tjOrderRemark.getProId());
+ if (null != tjProject) {
+ tjOrderRemark.setProName(tjProject.getProName());
+ }
+ }
+ return AjaxResult.success(list);
+ }
- if (null == proParentList || proParentList.isEmpty()) {
+ @Transactional
+ public void extracted(TjOrder tjOrder, TjFlowingWater tjFlowingWater) {
+ tjFlowingWater.setPayStasus(1L);
+ tjFlowingWater.setPayType(0L);
+ tjFlowingWater.setTollCollectorId("148");
+ tjFlowingWaterService.updateById(tjFlowingWater);
+ Long tjSerialNumber = tjFlowingWater.getTjSerialNumber();
+ LambdaQueryWrapper<TjOrderDetail> tjOrderDetailLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjOrderDetailLambdaQueryWrapper.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
+ List<TjOrderDetail> tjOrderDetails = detailService.list(tjOrderDetailLambdaQueryWrapper);
+ List<Long> detailIds = tjOrderDetails.stream().map(TjOrderDetail::getOrderDetailId).collect(Collectors.toList());
+ LambdaUpdateWrapper<TjOrderDetail> tjOrderDetailLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+ tjOrderDetailLambdaUpdateWrapper.set(TjOrderDetail::getFlowingWaterId, tjSerialNumber);
+ tjOrderDetailLambdaUpdateWrapper.in(TjOrderDetail::getOrderDetailId, detailIds);
+ detailService.update(tjOrderDetailLambdaUpdateWrapper);
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
+ }
+
+ /**
+ * 鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏
+ *
+ * @return
+ */
+ @GetMapping("/getOrderDetailByProParentId")
+ @ApiOperation("鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏")
+ public AjaxResult getOrderDetailByProParentId(@ApiParam(value = "鐖堕」鐩甶d") @RequestParam String proParentId,
+ @ApiParam(value = "浣撴鍙�") @RequestParam String tjNumber) {
+ if (null == SecurityUtils.getLoginUser().getUserId() || null == userService.getById(SecurityUtils.getLoginUser().getUserId())) {
+ return AjaxResult.error("鑾峰彇鐢ㄦ埛淇℃伅閿欒");
+ }
+
+ TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);
+
+ List<TjProject> proParentList = projectService.getTjProjectListByTbTransition(proParentId, tjNumber);
+
+ if (null == proParentList || proParentList.isEmpty()) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("xiaoJieIds", null);
+ map.put("sons", projectService.list(new LambdaQueryWrapper<TjProject>().eq(TjProject::getProId, proParentId).orderByAsc(TjProject::getXh)));
+ map.put("xiaoJie", null);
+ map.put("remark", remark.getRemark());
+ return AjaxResult.success(map);
+ }
+ List<Long> proParentIdList = proParentList.stream().map(TjProject::getProId).collect(Collectors.toList());
+ TjOrder one = orderService.getOrderByTjNum(tjNumber);
+ if (null == one) {
+ return AjaxResult.success("璇ョ敤鎴锋殏鏃舵病鏈変綋妫�鏁版嵁");
+ }
+ List<TjOrderDetail> tjOrderDetails = detailService.getTjOrderDetailListInProParentIdList(String.valueOf(one.getOrderId()), proParentIdList);
+ List<TjOrderDetail> tjOrderDetailList = new ArrayList<>();
+ if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
+ for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
+ TjProject project = projectService.getById(tjOrderDetail.getProId());
+ if (null != project) {
+ //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
+ if ("N".equals(project.getNeedReport())) {
+ continue;
+ }
+ List<TjRules> rulesList = tjRulesService.getTjRulesListByTjNumAndProId(tjNumber, tjOrderDetail.getProId());
+ tjOrderDetail.setRulesList(rulesList);
+ tjOrderDetail.setProject(project);
+ tjOrderDetail.setResultType(project.getResultType());
+ if (null != remark.getDoctorName()) {
+ SysUser byId = userService.getById(remark.getDoctorName());
+ if (byId != null) {
+ tjOrderDetail.setDoctorName(userService.getById(remark.getDoctorName()).getNickName());
+ }
+ } else {
+ tjOrderDetail.setDoctorName(null);
+ }
+ if (StringUtil.isBlank(tjOrderDetail.getProResult())) {
+ tjOrderDetail.setProResult(project.getProDefault());
+ }
+ tjOrderDetail.setXh(project.getXh());
+ tjOrderDetailList.add(tjOrderDetail);
+ }
+ }
+ }
Map<String, Object> map = new HashMap<>();
- map.put("xiaoJieIds", null);
- map.put("sons", projectService.list(new LambdaQueryWrapper<TjProject>().eq(TjProject::getProId, proParentId)));
- map.put("xiaoJie", null);
+ List<TjAdvice> adviceList = new ArrayList<>();
+ if (null != remark) {
+ String[] strings = StringUtils.split(remark.getSummary(), ";");
+ if (null != strings && strings.length > 0) {
+ List<TjAdvice> list = tjAdviceService.getAdviceStringByIds(strings);
+ adviceList.addAll(list);
+ }
+ map.put("xiaoJieIds", StringUtils.split(remark.getSummary(), ";"));
+ } else {
+ map.put("xiaoJieIds", null);
+ }
+ map.put("sons", tjOrderDetailList.stream().sorted(Comparator.comparing(TjOrderDetail::getXh)).collect(Collectors.toList()));
+ map.put("xiaoJie", adviceList);
map.put("remark", remark.getRemark());
return AjaxResult.success(map);
}
- List<Long> proParentIdList = proParentList.stream().map(TjProject::getProId).collect(Collectors.toList());
- TjOrder one = orderService.getOrderByTjNum(tjNumber);
- if (null == one) {
- return AjaxResult.success("璇ョ敤鎴锋殏鏃舵病鏈変綋妫�鏁版嵁");
- }
- List<TjOrderDetail> tjOrderDetails = detailService.getTjOrderDetailListInProParentIdList(String.valueOf(one.getOrderId()), proParentIdList);
- List<TjOrderDetail> tjOrderDetailList = new ArrayList<>();
-// TjCustomer customer = tjCustomerService.getById(one.getUserId());
- if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
- for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
- TjProject project = projectService.getById(tjOrderDetail.getProId());
- if(null != project){
- //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
- if ("N".equals(project.getNeedReport())) {
- continue;
- }
- List<TjRules> rulesList = tjRulesService.getTjRulesListByTjNumAndProId(tjNumber, tjOrderDetail.getProId());
- tjOrderDetail.setRulesList(rulesList);
- tjOrderDetail.setProject(project);
- tjOrderDetail.setResultType(project.getResultType());
- if (null != remark.getDoctorName()) {
- SysUser byId = userService.getById(remark.getDoctorName());
- if (byId != null) {
- tjOrderDetail.setDoctorName(userService.getById(remark.getDoctorName()).getNickName());
- }
- } else {
- tjOrderDetail.setDoctorName(null);
- }
- if(StringUtil.isBlank(tjOrderDetail.getProResult())){
- tjOrderDetail.setProResult(project.getProDefault());
- }
- tjOrderDetailList.add(tjOrderDetail);
+
+ /**
+ * 鐘舵�佷慨鏀�
+ */
+ @PutMapping("/changeStatus")
+ @ApiOperation("閮ㄩ棬鐘舵�佷慨鏀�")
+ public AjaxResult changeStatus(@RequestBody SysDept dept) {
+ //鍒ゆ柇鏄惎鐢ㄨ繕鏄�
+ if ("1".equals(dept.getStatus())) {
+ //鍒ゆ柇鐢ㄦ埛琛ㄤ腑鏈夋病鏈変汉鍦ㄨ绉戝涓�
+ LambdaQueryWrapper<SysUser> wq = new LambdaQueryWrapper<>();
+ wq.eq(SysUser::getDeptId, dept.getDeptId());
+ List<SysUser> list = userService.list(wq);
+ if (!list.isEmpty()) {
+ return AjaxResult.error("璇ョ瀹や笅鏈夊伐浣滀汉鍛橈紝涓嶈兘鍋滅敤锛�");
}
}
- }
- Map<String, Object> map = new HashMap<>();
- List<TjAdvice> adviceList = new ArrayList<>();
- if (null != remark) {
- String[] strings = StringUtils.split(remark.getSummary(), ";");
- if (null != strings && strings.length > 0) {
- List<TjAdvice> list = tjAdviceService.getAdviceStringByIds(strings);
- adviceList.addAll(list);
+ dept.setUpdateBy(getUsername());
+ int i = deptService.updateDeptStatus(dept);
+ if (i == 0) {
+ return AjaxResult.error("淇敼澶辫触");
}
- map.put("xiaoJieIds", StringUtils.split(remark.getSummary(), ";"));
- } else {
- map.put("xiaoJieIds", null);
+ return AjaxResult.success("淇敼鎴愬姛");
+
}
- map.put("sons", tjOrderDetailList);
- map.put("xiaoJie", adviceList);
- map.put("remark", remark.getRemark());
-// asyncService.getOrderDetailByProParentId(tjNumber,map,proParentId);
- return AjaxResult.success(map);
-}
-/**
- * 鐘舵�佷慨鏀�
- */
-@PutMapping("/changeStatus")
-@ApiOperation("閮ㄩ棬鐘舵�佷慨鏀�")
-public AjaxResult changeStatus(@RequestBody SysDept dept) {
- //鍒ゆ柇鏄惎鐢ㄨ繕鏄�
- if ("1".equals(dept.getStatus())) {
- //鍒ゆ柇鐢ㄦ埛琛ㄤ腑鏈夋病鏈変汉鍦ㄨ绉戝涓�
- LambdaQueryWrapper<SysUser> wq = new LambdaQueryWrapper<>();
- wq.eq(SysUser::getDeptId, dept.getDeptId());
- List<SysUser> list = userService.list(wq);
- if (!list.isEmpty()) {
- return AjaxResult.error("璇ョ瀹や笅鏈夊伐浣滀汉鍛橈紝涓嶈兘鍋滅敤锛�");
+ /**
+ * 鏍规嵁椤圭洰id鑾峰彇寤鸿
+ */
+ @GetMapping("/getDeptAdvice")
+ @ApiOperation(value = "鏍规嵁椤圭洰id鑾峰彇寤鸿")
+ public AjaxResult getDeptAdvice(@ApiParam(value = "鐖堕」鐩」鐩甶d") @RequestParam(required = false) String proId,
+ @ApiParam(value = "鍐呭") @RequestParam(required = false) String nr,
+ @ApiParam(value = "鎷奸煶鐮�") @RequestParam(required = false) String pym,
+ @ApiParam(value = "椤电爜") @RequestParam(defaultValue = "1") int page,
+ @ApiParam(value = "姣忛〉灞曠ず鏉℃暟") @RequestParam(defaultValue = "10") int pageSize) {
+ LambdaQueryWrapper<TjAdvice> wq1 = new LambdaQueryWrapper<>();
+ if (null != proId) {
+ wq1.eq(TjAdvice::getProId, proId);
}
- }
- dept.setUpdateBy(getUsername());
- int i = deptService.updateDeptStatus(dept);
- if (i == 0) {
- return AjaxResult.error("淇敼澶辫触");
- }
- return AjaxResult.success("淇敼鎴愬姛");
-
-}
-
-
-/**
- * 鏍规嵁椤圭洰id鑾峰彇寤鸿
- */
-@GetMapping("/getDeptAdvice")
-@ApiOperation(value = "鏍规嵁椤圭洰id鑾峰彇寤鸿")
-public AjaxResult getDeptAdvice(@ApiParam(value = "鐖堕」鐩」鐩甶d") @RequestParam(required = false) String proId,
- @ApiParam(value = "鍐呭") @RequestParam(required = false) String nr,
- @ApiParam(value = "鎷奸煶鐮�") @RequestParam(required = false) String pym,
- @ApiParam(value = "椤电爜") @RequestParam(defaultValue = "1") int page,
- @ApiParam(value = "姣忛〉灞曠ず鏉℃暟") @RequestParam(defaultValue = "10") int pageSize) {
- LambdaQueryWrapper<TjAdvice> wq1 = new LambdaQueryWrapper<>();
- if (null != proId) {
- wq1.eq(TjAdvice::getProId, proId);
- }
- if (null != nr && !nr.isEmpty()) {
- wq1.like(TjAdvice::getTitle, nr);
- } else if (null != pym && !pym.isEmpty()) {
- wq1.like(TjAdvice::getTitle, pym);
- }
+ if (null != nr && !nr.isEmpty()) {
+ wq1.like(TjAdvice::getTitle, nr);
+ } else if (null != pym && !pym.isEmpty()) {
+ wq1.like(TjAdvice::getTitle, pym);
+ }
// else {
// wq1.last("limit 20");
// }
- Page<TjAdvice> pages = new Page<>(page, pageSize);
- Page<TjAdvice> advicePage = tjAdviceService.page(pages, wq1);
- Map<String, Object> map = new HashMap<>();
- map.put("list", advicePage.getRecords());
- map.put("total", advicePage.getTotal());
+ Page<TjAdvice> pages = new Page<>(page, pageSize);
+ Page<TjAdvice> advicePage = tjAdviceService.page(pages, wq1);
+ Map<String, Object> map = new HashMap<>();
+ map.put("list", advicePage.getRecords());
+ map.put("total", advicePage.getTotal());
// List<TjAdvice> list = tjAdviceService.list(wq1);
- return AjaxResult.success(map);
-}
+ return AjaxResult.success(map);
+ }
-@GetMapping("/getAdviceByTjNumAndPro")
-@ApiOperation(value = "鏍规嵁椤圭洰id鍜屼綋妫�鍙疯幏鍙栧缓璁�")
-public AjaxResult getAdviceByTjNumAndPro(@ApiParam(value = "鐖堕」鐩」鐩甶d") @RequestParam String proId,
- @ApiParam(value = "浣撴鍙�") @RequestParam String tjNum) {
- LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrderRemark::getProId, proId);
- wq.eq(TjOrderRemark::getTjNumber, tjNum);
- TjOrderRemark remark = remarkService.getOne(wq);
- List<TjAdvice> list = null;
- if (null != remark && !StringUtils.isBlank(remark.getSummary())) {
- String[] strings = StringUtils.split(remark.getSummary(), ";");
- if (null != strings && strings.length > 0) {
- list = tjAdviceService.getAdviceStringByIds(strings);
+ @GetMapping("/getAdviceByTjNumAndPro")
+ @ApiOperation(value = "鏍规嵁椤圭洰id鍜屼綋妫�鍙疯幏鍙栧缓璁�")
+ public AjaxResult getAdviceByTjNumAndPro(@ApiParam(value = "鐖堕」鐩」鐩甶d") @RequestParam String proId,
+ @ApiParam(value = "浣撴鍙�") @RequestParam String tjNum) {
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getProId, proId);
+ wq.eq(TjOrderRemark::getTjNumber, tjNum);
+ TjOrderRemark remark = remarkService.getOne(wq);
+ List<TjAdvice> list = null;
+ if (null != remark && !StringUtils.isBlank(remark.getSummary())) {
+ String[] strings = StringUtils.split(remark.getSummary(), ";");
+ if (null != strings && strings.length > 0) {
+ list = tjAdviceService.getAdviceStringByIds(strings);
+ }
}
+ return AjaxResult.success(list);
}
- return AjaxResult.success(list);
-}
-/**
- * 鑾峰彇閮ㄩ棬鏍戝垪琛�
- */
+ /**
+ * 鑾峰彇閮ㄩ棬鏍戝垪琛�
+ */
//@PreAuthorize("@ss.hasPermi('system:dept:list')")
-@GetMapping("/deptTree")
-@ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�")
-public AjaxResult deptTree(SysDept dept) {
- return success(deptService.selectDeptTreeList(dept));
-}
-
-
-@GetMapping("/deptTree111")
-@ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�1111111111")
-public AjaxResult deptTree111(SysDept dept) {
- final List<TreeSelect> treeSelects = deptService.selectDeptTreeList1(dept);
- return success(treeSelects);
-}
-
-
-/**
- * 鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�
- */
-@GetMapping("/getChildList")
-@ApiOperation(value = "鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�")
-public AjaxResult getChildList(String deptName) {
- LambdaQueryWrapper<SysDept> wq = new LambdaQueryWrapper<>();
- wq.ne(SysDept::getParentId, 0);
- if (deptName != null) {
- wq.like(SysDept::getDeptName, deptName);
+ @GetMapping("/deptTree")
+ @ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�")
+ public AjaxResult deptTree(SysDept dept) {
+ return success(deptService.selectDeptTreeList(dept));
}
- List<SysDept> depts = deptService.list(wq);
- return success(depts);
-}
+
+
+ @GetMapping("/deptTree111")
+ @ApiOperation("鑾峰彇閮ㄩ棬鏍戝垪琛�1111111111")
+ public AjaxResult deptTree111(SysDept dept) {
+ final List<TreeSelect> treeSelects = deptService.selectDeptTreeList1(dept);
+ return success(treeSelects);
+ }
+
+
+ /**
+ * 鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�
+ */
+ @GetMapping("/getChildList")
+ @ApiOperation(value = "鑾峰彇瀛愮瀹ら儴闂ㄥ垪琛�")
+ public AjaxResult getChildList(String deptName) {
+ LambdaQueryWrapper<SysDept> wq = new LambdaQueryWrapper<>();
+ wq.ne(SysDept::getParentId, 0);
+ if (deptName != null) {
+ wq.like(SysDept::getDeptName, deptName);
+ }
+ List<SysDept> depts = deptService.list(wq);
+ return success(depts);
+ }
@GetMapping("/getxmjgz")
@ApiOperation(value = "鍖荤敓妫�鏌ュ鑾峰彇椤圭洰瑙勫垯鍊�")
- public AjaxResult getxmjgz(@RequestParam String proId,@RequestParam(required = false) String xmgz) {
+ public AjaxResult getxmjgz(@RequestParam String proId, @RequestParam(required = false) String xmgz) {
LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>();
wq.eq(TjRules::getProId, proId);
- if(StringUtil.isNotBlank(xmgz))wq.like(TjRules::getRuleStr,xmgz);
+ if (StringUtil.isNotBlank(xmgz)) wq.like(TjRules::getRuleStr, xmgz);
List<TjRules> list = tjRulesService.list(wq);
- if(null !=list && !list.isEmpty()){
+ if (null != list && !list.isEmpty()) {
for (TjRules tjRules : list) {
- if(null !=tjRules){
- tjRules.setJm(PinyinUtil.getFirstLetter(tjRules.getRuleStr(),""));
+ if (null != tjRules) {
+ tjRules.setJm(PinyinUtil.getFirstLetter(tjRules.getRuleStr(), ""));
}
}
}
@@ -1756,9 +927,9 @@
}
- @GetMapping ("/ysjcbGetProByTjNumAndOrderId")
- @ApiOperation (value = "鍖荤敓妫�鏌ラ〉闈㈡煡璇㈡楠屾鏌ラ」鐩帴鍙�")
- public AjaxResult ysjcbGetProByTjNumAndOrderId(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
+ @GetMapping("/ysjcbGetProByTjNumAndOrderId")
+ @ApiOperation(value = "鍖荤敓妫�鏌ラ〉闈㈡煡璇㈡楠屾鏌ラ」鐩帴鍙�")
+ public AjaxResult ysjcbGetProByTjNumAndOrderId(@ApiParam(value = "浣撴鍙�") @RequestParam String tjNumber) {
// List<TjOrderRemark> orderRemarkList = orderRemarkService.getTjOrderRemarkListByTjNum(tjNumber);
// List<CsProVo> list = new ArrayList<>();
// if (null != orderRemarkList && orderRemarkList.size() > 0) {
--
Gitblit v1.8.0