From 510475592869d73235929e283fcd3af823e54ede Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 18 十二月 2023 10:40:49 +0800
Subject: [PATCH] zjh 2023/12/18--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 161 +++++++++++++++++++++++++++--------------------------
1 files changed, 83 insertions(+), 78 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 071f60c..d29fced 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -80,10 +80,8 @@
private TestMapper testMapper;
@Resource
private TjvLtkjvtjpatService tjvLtkjvtjpatService;
-
@Resource
private LtkjMiddleDetailService middleDetailService;
-
@Resource
private LtkjMiddleHeadService headService;
@Resource
@@ -125,82 +123,89 @@
@ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
@ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime) {
- DateTime beginTimes = null;
- DateTime endTimes = null;
- if (null != beginTime && null != endTime) {
- beginTimes = DateUtil.beginOfDay(DateUtil.parse(beginTime));
- endTimes = DateUtil.endOfDay(DateUtil.parse(endTime));
- }
- //鍒濆鍖栦綋妫�璁㈠崟琛�
- List<TjOrder> orderList = null;
- List<TjCustomer> customerList = new ArrayList<>();
- Map<String, Object> map = new HashMap<>();
-
- if (checkStatus == 0)
- asyncService.wCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes));
- if (checkStatus == 1)
- asyncService.yCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes));
-
- //鏍规嵁濮撳悕鏌ヨ
- if (null != name && !"".equals(name)) {
- List<TjCustomer> list = customerService.getTjCustomerList(name);
- if (null != list && list.size() > 0) {
- List<TjCustomer> lists = new ArrayList<>();
- for (TjCustomer customer : list) {
- orderList = orderService.getCsTjOrderListByCusId(customer.getCusId());
- if (null != orderList && orderList.size() > 0) {
- for (TjOrder tjOrder : orderList) {
- customer.setTjNumber(tjOrder.getTjNumber());
- customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
- customer.setOrderId(tjOrder.getOrderId());
- customer.setTjTime(tjOrder.getCreateTime());
- customer.setFinishTime(tjOrder.getFinishTime());
- customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
- customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
- customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
- customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
- if (tjOrder.getFirmId().equals("0")) {
- customer.setTjCompName(null);
- } else {
- customer.setTjCompName(compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId()).getCnName());
- }
- lists.add(customer);
- }
- }
- }
- List<TjCustomer> customers = null;
- if (lists.size() > 0) {
- customers = lists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
- }
- map.put("customers", customers);
- map.put("total", lists.size());
- return AjaxResult.success(map);
- }
- return AjaxResult.success("鏆傛棤鏁版嵁");
- }
-
- //鏉′欢鏌ヨ
- if (null != tjNumber || null != compId || (null != beginTime && null != endTime)) {
- orderList = orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
- return getResult(page, pageSize, orderList, customerList, map);
- }
-
- List<TjCustomer> customers = null;
- if (checkStatus == 0) {
- customers = redisCache.getCacheMapValue("cScheck", "ws");
- }
- if (checkStatus == 1) {
- customers = redisCache.getCacheMapValue("cScheck", "ys");
- }
- if (customers != null && customers.size() > 0) {
- List<TjCustomer> customerLists = customers.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
- map.put("customers", customerLists);
- map.put("total", customers.size());
- return AjaxResult.success(map);
- } else {
- orderList = orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
- return getResult(page, pageSize, orderList, customerList, map);
- }
+// DateTime beginTimes = null;
+// DateTime endTimes = null;
+// if (null != beginTime && null != endTime) {
+// beginTimes = DateUtil.beginOfDay(DateUtil.parse(beginTime));
+// endTimes = DateUtil.endOfDay(DateUtil.parse(endTime));
+// }
+// //鍒濆鍖栦綋妫�璁㈠崟琛�
+// List<TjOrder> orderList = null;
+// List<TjCustomer> customerList = new ArrayList<>();
+// Map<String, Object> map = new HashMap<>();
+//
+// if (checkStatus == 0)
+// asyncService.wCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes));
+// if (checkStatus == 1)
+// asyncService.yCScheckSetCustomerLisByRedis(orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes));
+//
+// //鏍规嵁濮撳悕鏌ヨ
+// if (null != name && !"".equals(name)) {
+// List<TjCustomer> list = customerService.getTjCustomerList(name);
+// if (null != list && list.size() > 0) {
+// List<TjCustomer> lists = new ArrayList<>();
+// for (TjCustomer customer : list) {
+// orderList = orderService.getCsTjOrderListByCusId(customer.getCusId());
+// if (null != orderList && orderList.size() > 0) {
+// for (TjOrder tjOrder : orderList) {
+// customer.setTjNumber(tjOrder.getTjNumber());
+// customer.setTjStatus(Long.valueOf(tjOrder.getCheckStatus()));
+// customer.setOrderId(tjOrder.getOrderId());
+// customer.setTjTime(tjOrder.getCreateTime());
+// customer.setFinishTime(tjOrder.getFinishTime());
+// customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
+// customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+// customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
+// customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
+// if (tjOrder.getFirmId().equals("0")) {
+// customer.setTjCompName(null);
+// } else {
+// customer.setTjCompName(compService.selectDictCompByDrugManufacturerId(tjOrder.getFirmId()).getCnName());
+// }
+// lists.add(customer);
+// }
+// }
+// }
+// List<TjCustomer> customers = null;
+// if (lists.size() > 0) {
+// customers = lists.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+// }
+// map.put("customers", customers);
+// map.put("total", lists.size());
+// return AjaxResult.success(map);
+// }
+// return AjaxResult.success("鏆傛棤鏁版嵁");
+// }
+//
+// //鏉′欢鏌ヨ
+// if (null != tjNumber || null != compId || (null != beginTime && null != endTime)) {
+// orderList = orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
+// return getResult(page, pageSize, orderList, customerList, map);
+// }
+//
+// List<TjCustomer> customers = null;
+// if (checkStatus == 0) {
+// customers = redisCache.getCacheMapValue("cScheck", "ws");
+// }
+// if (checkStatus == 1) {
+// customers = redisCache.getCacheMapValue("cScheck", "ys");
+// }
+// if (customers != null && customers.size() > 0) {
+// List<TjCustomer> customerLists = customers.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+// map.put("customers", customerLists);
+// map.put("total", customers.size());
+// return AjaxResult.success(map);
+// } else {
+// orderList = orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
+// return getResult(page, pageSize, orderList, customerList, map);
+// }
+ String value = String.valueOf(compId);
+ if(tjNumber==null)tjNumber="";
+ if(compId==null)value="";
+ if(name==null)name="";
+ if(beginTime==null)beginTime="";
+ if(endTime==null)endTime="";
+ return AjaxResult.success(orderService.getCsCunChuGuoChengCustomerList(tjNumber,page,pageSize,checkStatus, value,beginTime,endTime,name));
}
--
Gitblit v1.8.0