From bf81174e8446b6057fe6fcfd3a752cd983e6f8eb Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 13 十二月 2024 22:47:56 +0800
Subject: [PATCH] zjh202412013
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 523 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 331 insertions(+), 192 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index c1d6c2a..4526fca 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -25,6 +25,7 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.symmetric.DES;
import cn.hutool.extra.pinyin.PinyinUtil;
import cn.hutool.json.JSONArray;
@@ -416,70 +417,148 @@
@ApiParam(value = "鐧昏寮�濮嬫椂闂�") @RequestParam(required = false) Date djbeginTime,
@ApiParam(value = "鐧昏缁撴潫鏃堕棿") @RequestParam(required = false) Date djendTime,
@ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) Date bgbeginTime,
- @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) Date bgendTime) {
+ @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) Date bgendTime,
+ @ApiParam(value = "鍗曚綅") @RequestParam(required = false) String dw) {
Map<String, Object> map = new HashMap<>();
+ List<Long> cusIds = null;
if (null != name) {
+// List<TjCustomer> customerList;
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
wqq.like(TjCustomer::getCusName, name);
- List<TjCustomer> customerList = tjCustomerService.list(wqq);
- if (null != customerList && !customerList.isEmpty()) {
- List<TjOrder> list = new ArrayList<>();
- for (TjCustomer customer : customerList) {
- LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
- if (null != djbeginTime && null != djendTime) {
- wq.between(TjOrder::getCreateTime, DateUtil.beginOfDay(djbeginTime), DateUtil.endOfDay(djendTime));
- }
- wq.eq(TjOrder::getUserId, customer.getCusId());
- list.addAll(tjOrderService.list(wq));
- }
- List<TjOrder> collect = null;
- if (!list.isEmpty()) {
- for (TjOrder order : list) {
- TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
- if (null != tjCustomer) {
-// order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
- order.setTjCustomerName(tjCustomer.getCusName());
-// order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
- order.setTjCustomerPhone(tjCustomer.getCusPhone());
-// order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
- order.setTjCusIdCard(tjCustomer.getCusIdcard());
- order.setTjCustomerSex(tjCustomer.getCusSex());
- order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
- order.setCareer(tjCustomer.getCareer());
- order.setIdType(tjCustomer.getIdType());
- order.setAgeUnit(tjCustomer.getAgeUnit());
- order.setTjCount(String.valueOf(tjCustomer.getCusNumber()));
- if (null != tjCustomer.getCompName()) {
- order.setDictCompName(tjCustomer.getCompName());
- } else {
- String firmId = order.getFirmId();
- if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
- order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName());
- }
- }
-
- if (null != order.getPacId()) {
- if (null != tjPackageService.getById(order.getPacId())) {
- order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
- }
- if (null != dwDeptService.getById(order.getPacId())) {
- order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
- }
- }
- TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber());
- if (null != dycs) order.setDycs(Math.toIntExact(dycs.getDycs()));
- }
- }
- collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
- }
- if (null != collect) {
- map.put("total", collect.size());
- } else {
- map.put("total", 0);
- }
- map.put("list", collect);
- return AjaxResult.success(map);
- }
+ cusIds = tjCustomerService.list(wqq).stream().map(TjCustomer::getCusId).collect(Collectors.toList());
+// if (StrUtil.isNotBlank(dw)){
+// wqq.like(TjCustomer::getCompName,dw);
+// customerList = tjCustomerService.list(wqq);
+// }else {
+// customerList = tjCustomerService.list(wqq);
+// }
+// if (null != customerList && !customerList.isEmpty()) {
+// List<TjOrder> list = new ArrayList<>();
+// for (TjCustomer customer : customerList) {
+// LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
+// if (null != djbeginTime && null != djendTime) {
+// wq.between(TjOrder::getCreateTime, DateUtil.beginOfDay(djbeginTime), DateUtil.endOfDay(djendTime));
+// }
+// wq.eq(TjOrder::getUserId, customer.getCusId());
+// list.addAll(tjOrderService.list(wq));
+// }
+// List<TjOrder> collect = null;
+// if (!list.isEmpty()) {
+// for (TjOrder order : list) {
+// TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
+// if (null != tjCustomer) {
+//// order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+// order.setTjCustomerName(tjCustomer.getCusName());
+//// order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
+// order.setTjCustomerPhone(tjCustomer.getCusPhone());
+//// order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+// order.setTjCusIdCard(tjCustomer.getCusIdcard());
+// order.setTjCustomerSex(tjCustomer.getCusSex());
+// order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
+// order.setCareer(tjCustomer.getCareer());
+// order.setIdType(tjCustomer.getIdType());
+// order.setAgeUnit(tjCustomer.getAgeUnit());
+// order.setTjCount(String.valueOf(tjCustomer.getCusNumber()));
+// if (null != tjCustomer.getCompName()) {
+// order.setDictCompName(tjCustomer.getCompName());
+// } else {
+// String firmId = order.getFirmId();
+// if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
+// order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName());
+// }
+// }
+//
+// if (null != order.getPacId()) {
+// if (null != tjPackageService.getById(order.getPacId())) {
+// order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
+// }
+// if (null != dwDeptService.getById(order.getPacId())) {
+// order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
+// }
+// }
+// TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber());
+// if (null != dycs) order.setDycs(Math.toIntExact(dycs.getDycs()));
+// }
+// }
+// collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+// }
+// if (null != collect) {
+// map.put("total", collect.size());
+// } else {
+// map.put("total", 0);
+// }
+// map.put("list", collect);
+// return AjaxResult.success(map);
+// }
+// else {
+// if (StrUtil.isNotBlank(dw)){
+// wqq = new LambdaQueryWrapper<>();
+// wqq.like(TjCustomer::getCusName, name);
+// customerList = tjCustomerService.list(wqq);
+// LambdaQueryWrapper<DictComp> wrapper = new LambdaQueryWrapper<>();
+// wrapper.like(DictComp::getCnName,dw);
+// List<String> list = iDictCompService.list(wrapper).stream().map(DictComp::getCnName).collect(Collectors.toList());
+// if (null != customerList && !customerList.isEmpty()) {
+// List<TjOrder> list1 = new ArrayList<>();
+// for (TjCustomer customer : customerList) {
+// LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
+// if (null != djbeginTime && null != djendTime) {
+// wq.between(TjOrder::getCreateTime, DateUtil.beginOfDay(djbeginTime), DateUtil.endOfDay(djendTime));
+// wq.in(TjOrder::getFirmId, list);
+// }
+// wq.eq(TjOrder::getUserId, customer.getCusId());
+// list1.addAll(tjOrderService.list(wq));
+// }
+// List<TjOrder> collect = null;
+// if (!list1.isEmpty()) {
+// for (TjOrder order : list1) {
+// TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
+// if (null != tjCustomer) {
+//// order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+// order.setTjCustomerName(tjCustomer.getCusName());
+//// order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
+// order.setTjCustomerPhone(tjCustomer.getCusPhone());
+//// order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+// order.setTjCusIdCard(tjCustomer.getCusIdcard());
+// order.setTjCustomerSex(tjCustomer.getCusSex());
+// order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
+// order.setCareer(tjCustomer.getCareer());
+// order.setIdType(tjCustomer.getIdType());
+// order.setAgeUnit(tjCustomer.getAgeUnit());
+// order.setTjCount(String.valueOf(tjCustomer.getCusNumber()));
+// if (null != tjCustomer.getCompName()) {
+// order.setDictCompName(tjCustomer.getCompName());
+// } else {
+// String firmId = order.getFirmId();
+// if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
+// order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName());
+// }
+// }
+//
+// if (null != order.getPacId()) {
+// if (null != tjPackageService.getById(order.getPacId())) {
+// order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
+// }
+// if (null != dwDeptService.getById(order.getPacId())) {
+// order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
+// }
+// }
+// TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber());
+// if (null != dycs) order.setDycs(Math.toIntExact(dycs.getDycs()));
+// }
+// }
+// collect = list1.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+// }
+// if (null != collect) {
+// map.put("total", collect.size());
+// } else {
+// map.put("total", 0);
+// }
+// map.put("list", collect);
+// return AjaxResult.success(map);
+// }
+// }
+// }
}
Page<TjOrder> page1 = new Page<>(pageNum, pageSize);
@@ -498,6 +577,21 @@
if (null != xmmc) {
wq.in(TjOrder::getTjNumber, projectService.getTjNumLIstByXmmx(xmmc));
}
+
+ if (StrUtil.isNotBlank(dw)) {
+ wq.like(TjOrder::getFirmName, dw);
+ }
+
+ if (null != cusIds && !cusIds.isEmpty()) {
+ wq.in(TjOrder::getUserId, cusIds);
+ }
+
+// if (StrUtil.isNotBlank(dw)){
+// LambdaQueryWrapper<DictComp> wrapper = new LambdaQueryWrapper<>();
+// wrapper.like(DictComp::getCnName,dw);
+// List<String> list = iDictCompService.list(wrapper).stream().map(DictComp::getDrugManufacturerId).collect(Collectors.toList());
+// wq.in(TjOrder::getFirmId,list);
+// }
wq.orderByDesc(TjOrder::getCreateTime);
Page<TjOrder> page2 = tjOrderService.page(page1, wq);
@@ -533,6 +627,41 @@
TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber());
if (null != dycs) order.setDycs(Math.toIntExact(dycs.getDycs()));
}
+ int czwj = remarkService.panduaniscunzaiweijian(order.getTjNumber());
+ int sfwc = remarkService.panduaniswancheng(order.getTjNumber());
+ Date checkTime = order.getCheckTime();
+ Date reportTime = order.getReportTime();
+ Integer heshouStatus = order.getHeshouStatus();
+ Date lastTime = order.getPrintLastTime();
+ if (czwj == 0) {
+ //鏈
+ order.setZt("鏈");
+ }
+ if (czwj > 0) {
+ //鍦ㄦ
+ order.setZt("鍦ㄦ");
+ }
+ if (sfwc == 0) {
+ //宸插畬鎴�
+ order.setZt("宸插畬鎴�");
+ }
+ if (null != checkTime) {
+ //宸插鏍�
+ order.setZt("宸插鏍�");
+ }
+ if (null != reportTime) {
+ //鐢熸垚鎶ュ憡
+ order.setZt("鐢熸垚鎶ュ憡");
+ }
+ if (1== heshouStatus) {
+ //鎶ュ憡鏍告敹
+ order.setZt("鎶ュ憡鏍告敹");
+ }
+ if (null != lastTime) {
+ //宸插嚭鎶ュ憡
+ order.setZt("宸插嚭鎶ュ憡");
+ }
+
}
}
map.put("list", list);
@@ -552,136 +681,140 @@
@ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) String djbeginTime,
@ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) String djendTime) {
Map<String, Object> map = new HashMap<>();
+ List<Long> cusIds = null;
if (StringUtil.isNotBlank(name)) {
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
wqq.like(TjCustomer::getCusName, name);
- List<TjCustomer> customerList = tjCustomerService.list(wqq);
- if (null != customerList && !customerList.isEmpty()) {
- List<TjOrder> list = new ArrayList<>();
- for (TjCustomer customer : customerList) {
- LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrder::getUserId, customer.getCusId());
- if (dyzt == 0) {
- wq.isNull(TjOrder::getPrintLastTime);
- wq.eq(TjOrder::getHeshouStatus, 1);
- } else {
- wq.isNotNull(TjOrder::getPrintLastTime);
- }
- list.addAll(tjOrderService.list(wq));
- }
- List<TjOrder> collect = null;
- if (!list.isEmpty()) {
-
- for (int i = 0; i < list.size(); i++) {
- TjCustomer tjCustomer = tjCustomerService.getById(list.get(i).getUserId());
- if (null == tjCustomer) {
- list.remove(list.get(i));
- continue;
- }
- list.get(i).setTjCustomerSex(tjCustomer.getCusSex());
- list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
- list.get(i).setTjCustomerName(tjCustomer.getCusName());
- list.get(i).setTjCustomerPhone(tjCustomer.getCusPhone());
- list.get(i).setTjCusIdCard(tjCustomer.getCusIdcard());
-
- if (null != tjCustomer.getCompName()) {
- list.get(i).setDictCompName(tjCustomer.getCompName());
- } else {
- String firmId = list.get(i).getFirmId();
- if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) {
- list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName());
- }
- }
-
- if (null != list.get(i).getPacId()) {
- if (null != tjPackageService.getById(list.get(i).getPacId())) {
- list.get(i).setPacName(tjPackageService.getById(list.get(i).getPacId()).getPacName());
- }
- if (null != dwDeptService.getById(list.get(i).getPacId())) {
- list.get(i).setPacName(dwDeptService.getById(list.get(i).getPacId()).getDwDeptName());
- }
- }
- }
- collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
- }
- if (null != collect) {
- map.put("total", collect.size());
- } else {
- map.put("total", 0);
- }
- map.put("list", collect);
- return AjaxResult.success(map);
- }
+ cusIds = tjCustomerService.list(wqq).stream().map(TjCustomer::getCusId).collect(Collectors.toList());
+// if (null != customerList && !customerList.isEmpty()) {
+// List<TjOrder> list = new ArrayList<>();
+// for (TjCustomer customer : customerList) {
+// LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjOrder::getUserId, customer.getCusId());
+// if (dyzt == 0) {
+// wq.isNull(TjOrder::getPrintLastTime);
+// wq.eq(TjOrder::getHeshouStatus, 1);
+// } else {
+// wq.isNotNull(TjOrder::getPrintLastTime);
+// }
+// list.addAll(tjOrderService.list(wq));
+// }
+// List<TjOrder> collect = null;
+// if (!list.isEmpty()) {
+//
+// for (int i = 0; i < list.size(); i++) {
+// TjCustomer tjCustomer = tjCustomerService.getById(list.get(i).getUserId());
+// if (null == tjCustomer) {
+// list.remove(list.get(i));
+// continue;
+// }
+// list.get(i).setTjCustomerSex(tjCustomer.getCusSex());
+// list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
+// list.get(i).setTjCustomerName(tjCustomer.getCusName());
+// list.get(i).setTjCustomerPhone(tjCustomer.getCusPhone());
+// list.get(i).setTjCusIdCard(tjCustomer.getCusIdcard());
+//
+// if (null != tjCustomer.getCompName()) {
+// list.get(i).setDictCompName(tjCustomer.getCompName());
+// } else {
+// String firmId = list.get(i).getFirmId();
+// if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) {
+// list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName());
+// }
+// }
+//
+// if (null != list.get(i).getPacId()) {
+// if (null != tjPackageService.getById(list.get(i).getPacId())) {
+// list.get(i).setPacName(tjPackageService.getById(list.get(i).getPacId()).getPacName());
+// }
+// if (null != dwDeptService.getById(list.get(i).getPacId())) {
+// list.get(i).setPacName(dwDeptService.getById(list.get(i).getPacId()).getDwDeptName());
+// }
+// }
+// }
+// collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+// }
+// if (null != collect) {
+// map.put("total", collect.size());
+// } else {
+// map.put("total", 0);
+// }
+// if (collect == null) collect = new ArrayList<>();
+// map.put("list", collect);
+// return AjaxResult.success(map);
+// }
}
- if (StringUtil.isNotBlank(dw)) {
- LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
- wqq.like(TjCustomer::getCompName, dw);
- List<TjCustomer> customerList = tjCustomerService.list(wqq);
- List<TjOrder> list = new ArrayList<>();
- if (null != customerList && !customerList.isEmpty()) {
- for (TjCustomer customer : customerList) {
- LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrder::getUserId, customer.getCusId());
- if (dyzt == 0) {
- wq.isNull(TjOrder::getPrintLastTime);
- wq.eq(TjOrder::getHeshouStatus, 1);
- } else {
- wq.isNotNull(TjOrder::getPrintLastTime);
- }
- list.addAll(tjOrderService.list(wq));
- }
- }
- List<String> dwIds = iDictCompService.getdwIdByDwName(dw);
-
- LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
- wq.in(TjOrder::getFirmId, dwIds);
- list.addAll(tjOrderService.list(wq));
- List<TjOrder> collect = null;
- if (!list.isEmpty()) {
- List<TjOrder> orders = list.stream().distinct().collect(Collectors.toList());
- for (int i = 0; i < orders.size(); i++) {
- TjCustomer tjCustomer = tjCustomerService.getById(list.get(i).getUserId());
- if (null == tjCustomer) {
- list.remove(list.get(i));
- continue;
- }
- list.get(i).setTjCustomerSex(tjCustomer.getCusSex());
- list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
- list.get(i).setTjCustomerName(tjCustomer.getCusName());
- list.get(i).setTjCustomerPhone(tjCustomer.getCusPhone());
- list.get(i).setTjCusIdCard(tjCustomer.getCusIdcard());
-
- if (null != tjCustomer.getCompName()) {
- list.get(i).setDictCompName(tjCustomer.getCompName());
- } else {
- String firmId = list.get(i).getFirmId();
- if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) {
- list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName());
- }
- }
-
- if (null != list.get(i).getPacId()) {
- if (null != tjPackageService.getById(list.get(i).getPacId())) {
- list.get(i).setPacName(tjPackageService.getById(list.get(i).getPacId()).getPacName());
- }
- if (null != dwDeptService.getById(list.get(i).getPacId())) {
- list.get(i).setPacName(dwDeptService.getById(list.get(i).getPacId()).getDwDeptName());
- }
- }
- }
- collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
- }
- if (null != collect) {
- map.put("total", collect.size());
- } else {
- map.put("total", 0);
- }
- map.put("list", collect);
- return AjaxResult.success(map);
+// if (StringUtil.isNotBlank(dw)) {
+// LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
+// wqq.like(TjCustomer::getCompName, dw);
+// List<TjCustomer> customerList = tjCustomerService.list(wqq);
+// List<TjOrder> list = new ArrayList<>();
+// if (null != customerList && !customerList.isEmpty()) {
+// for (TjCustomer customer : customerList) {
+// LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjOrder::getUserId, customer.getCusId());
+// if (dyzt == 0) {
+// wq.isNull(TjOrder::getPrintLastTime);
+// wq.eq(TjOrder::getHeshouStatus, 1);
+// } else {
+// wq.isNotNull(TjOrder::getPrintLastTime);
+// }
+// list.addAll(tjOrderService.list(wq));
+// }
+// }
+// List<String> dwIds = iDictCompService.getdwIdByDwName(dw);
+//
+// LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
+// wq.in(TjOrder::getFirmId, dwIds);
+// list.addAll(tjOrderService.list(wq));
+// List<TjOrder> collect = null;
+// if (!list.isEmpty()) {
+// List<TjOrder> orders = list.stream().distinct().collect(Collectors.toList());
+// for (int i = 0; i < orders.size(); i++) {
+// TjCustomer tjCustomer = tjCustomerService.getById(list.get(i).getUserId());
+// if (null == tjCustomer) {
+// list.remove(list.get(i));
+// continue;
+// }
+// list.get(i).setTjCustomerSex(tjCustomer.getCusSex());
+// list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
+// list.get(i).setTjCustomerName(tjCustomer.getCusName());
+// list.get(i).setTjCustomerPhone(tjCustomer.getCusPhone());
+// list.get(i).setTjCusIdCard(tjCustomer.getCusIdcard());
+//
+// if (null != tjCustomer.getCompName()) {
+// list.get(i).setDictCompName(tjCustomer.getCompName());
+// } else {
+// String firmId = list.get(i).getFirmId();
+// if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) {
+// list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName());
+// }
+// }
+//
+// if (null != list.get(i).getPacId()) {
+// if (null != tjPackageService.getById(list.get(i).getPacId())) {
+// list.get(i).setPacName(tjPackageService.getById(list.get(i).getPacId()).getPacName());
+// }
+// if (null != dwDeptService.getById(list.get(i).getPacId())) {
+// list.get(i).setPacName(dwDeptService.getById(list.get(i).getPacId()).getDwDeptName());
+// }
+// }
+// }
+// collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+// }
+// if (null != collect) {
+// map.put("total", collect.size());
+// } else {
+// map.put("total", 0);
+// }
+// map.put("list", collect);
+// return AjaxResult.success(map);
+//
+//
+// }
- }
Page<TjOrder> page1 = new Page<>(pageNum, pageSize);
LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
if (dyzt == 0) {
@@ -696,6 +829,12 @@
}
if (null != tjNum) {
wq.like(TjOrder::getTjNumber, tjNum);
+ }
+ if (StringUtil.isNotBlank(dw)) {
+ wq.like(TjOrder::getFirmName, dw);
+ }
+ if (null != cusIds && !cusIds.isEmpty()) {
+ wq.in(TjOrder::getUserId, cusIds);
}
wq.orderByDesc(TjOrder::getCreateTime);
Page<TjOrder> page2 = tjOrderService.page(page1, wq);
@@ -3264,30 +3403,30 @@
Date reportTime = order.getReportTime();
Integer heshouStatus = order.getHeshouStatus();
Date lastTime = order.getPrintLastTime();
+ int a=0;
if (czwj == 0) {
//鏈
- return AjaxResult.success(0);
+ a=0;
} else if (czwj > 0) {
//鍦ㄦ
- return AjaxResult.success(1);
+ a=1;
} else if (sfwc == 0) {
//宸插畬鎴�
- return AjaxResult.success(2);
+ a=2;
} else if (null != checkTime) {
//宸插鏍�
- return AjaxResult.success(3);
+ a=3;
} else if (null != reportTime) {
//鐢熸垚鎶ュ憡
- return AjaxResult.success(4);
+ a=4;
} else if (null != heshouStatus) {
//鎶ュ憡鏍告敹
- return AjaxResult.success(5);
+ a=5;
} else if (null != lastTime) {
//宸插嚭鎶ュ憡
- return AjaxResult.success(6);
- } else {
- return AjaxResult.error();
+ a=6;
}
+ return AjaxResult.success(a);
}
return AjaxResult.error();
}
--
Gitblit v1.8.0