From b8bf9a10ca1c65e94d75a2db5550e6263b582512 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 16 十二月 2024 15:01:41 +0800
Subject: [PATCH] 调整结果项目状态判断结论增加非空判断
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 575 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 346 insertions(+), 229 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 047ce66..3e6a5a5 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;
@@ -410,78 +411,23 @@
@ApiOperation(value = "鏌ヨ浣撴璁板綍鍒楄〃")
public AjaxResult getOrderList(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @ApiParam(value = "鐘舵��") @RequestParam(required = false) Integer zt,
@ApiParam(value = "浣撴鍙�)") @RequestParam(required = false) String tjNum,
@ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
@ApiParam(value = "椤圭洰鍚�)") @RequestParam(required = false) String xmmc,
@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) {
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());
}
+
Page<TjOrder> page1 = new Page<>(pageNum, pageSize);
LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
if (null != djbeginTime && null != djendTime) {
@@ -497,6 +443,94 @@
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(null !=zt && (zt==0 || zt==1 || zt==2)){
+ List<TjOrder> orders=new ArrayList<>();
+ List<TjOrder> tjOrders=null;
+ List<TjOrder> orderList = tjOrderService.list(wq);
+ if(null !=orderList && !orderList.isEmpty()){
+ for (TjOrder order : orderList) {
+ int czwj = remarkService.panduaniscunzaiweijian(order.getTjNumber());
+ int sfwc = remarkService.panduaniswancheng(order.getTjNumber());
+ if (zt==0 && czwj == 0) {
+ //鏈0
+ order.setZt("鏈");
+ orders.add(order);
+ }
+ if (zt==1 && czwj > 0) {
+ //鍦ㄦ1
+ order.setZt("鍦ㄦ");
+ orders.add(order);
+ }
+ if (zt==2 && sfwc == 0) {
+ //宸插畬鎴�2
+ order.setZt("宸插畬鎴�");
+ orders.add(order);
+ }
+ }
+ if(!orders.isEmpty()){
+ tjOrders=orders.stream().sorted(Comparator.comparing(TjOrder::getCreateTime).reversed())
+ .skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+ for (TjOrder order : tjOrders) {
+ TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
+ if (null != tjCustomer) {
+ order.setTjCustomerSex(tjCustomer.getCusSex());
+ order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
+ order.setTjCustomerName(tjCustomer.getCusName());
+ order.setTjCustomerPhone(tjCustomer.getCusPhone());
+ order.setTjCusIdCard(tjCustomer.getCusIdcard());
+ 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());
+ } else 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()));
+ }
+ }
+ }
+ }
+ map.put("list", tjOrders);
+ map.put("total", orders.size());
+ return AjaxResult.success(map);
+ }
+
+ if(null !=zt){
+ if(zt==3){
+ wq.isNotNull(TjOrder::getCheckTime);
+ }
+ if(zt==4){
+ wq.isNotNull(TjOrder::getReportTime);
+ }
+ if(zt==5){
+ wq.eq(TjOrder::getHeshouStatus,1);
+ }
+ if(zt==6){
+ wq.isNotNull(TjOrder::getPrintLastTime);
+ }
}
wq.orderByDesc(TjOrder::getCreateTime);
@@ -533,6 +567,56 @@
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(null !=zt){
+ if(zt==3){
+ order.setZt("宸插鏍�");
+ }
+ if(zt==4){
+ order.setZt("鐢熸垚鎶ュ憡");
+ }
+ if(zt==5){
+ order.setZt("鎶ュ憡鏍告敹");
+ }
+ if(zt==6){
+ order.setZt("宸插嚭鎶ュ憡");
+ }
+ }else {
+ if (czwj == 0) {
+ //鏈0
+ order.setZt("鏈");
+ }
+ if (czwj > 0) {
+ //鍦ㄦ1
+ order.setZt("鍦ㄦ");
+ }
+ if (sfwc == 0) {
+ //宸插畬鎴�2
+ order.setZt("宸插畬鎴�");
+ }
+ if (null != checkTime) {
+ //宸插鏍�3
+ order.setZt("宸插鏍�");
+ }
+ if (null != reportTime) {
+ //鐢熸垚鎶ュ憡4
+ order.setZt("鐢熸垚鎶ュ憡");
+ }
+ if (1== heshouStatus) {
+ //鎶ュ憡鏍告敹5
+ order.setZt("鎶ュ憡鏍告敹");
+ }
+ if (null != lastTime) {
+ //宸插嚭鎶ュ憡6
+ order.setZt("宸插嚭鎶ュ憡");
+ }
+ }
}
}
map.put("list", list);
@@ -552,136 +636,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 +784,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);
@@ -1031,7 +1125,8 @@
return AjaxResult.error("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�");
}
if (null != tjReservation.getTeamNo()) tjOrder.setTeamNo(tjReservation.getTeamNo());
- if (null != tjReservation.getCompanyId()) tjOrder.setFirmId(tjReservation.getCompanyId());
+// if (null != tjReservation.getCompanyId()) tjOrder.setFirmId(tjReservation.getCompanyId());
+// if (null != tjReservation.getCompany()) tjOrder.setFirmName(tjReservation.getCompany());
if (null != tjReservation.getDepartment()) tjOrder.setFirmDeptName(tjReservation.getDepartment());
if (null != tjReservation.getJobNo()) tjOrder.setFirmWorkId(tjReservation.getJobNo());
if (null != tjReservation.getPacId()) tjOrder.setPacId(tjReservation.getPacId());
@@ -1040,7 +1135,6 @@
tjOrder.setGroupId(tjReservation.getGroupingId());
tjOrder.setFirmDeptId(tjReservation.getPacId());
}
- // if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId());
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
if (null != tjReservation.getTeamNo() && tjOrder.getTjType().equals("1")) {
@@ -1049,6 +1143,16 @@
tjOrder.setTjType("2");
}
}
+
+ if (null != tjCustomer.getCompName()) {
+ tjOrder.setFirmName(tjCustomer.getCompName());
+ }
+ if (null != tjCustomer.getDictCompId()) {
+ tjOrder.setFirmId(String.valueOf(tjCustomer.getDictCompId()));
+ } else {
+ tjOrder.setFirmId("0");
+ }
+
if (null != tjOrder.getPhoto()) {
File file = new File(tjOrder.getPhoto());
@@ -1062,9 +1166,8 @@
tjOrder.setPhoto(encode);
}
}
- if (tjOrder.getFirmId() == null) {
- tjOrder.setFirmId("0");
- }
+
+
if (null == tjOrder.getPacId() && null != transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId()))) {
tjOrder.setPacId(transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId())));
}
@@ -2665,9 +2768,9 @@
//淇敼order琛ㄤ腑鐨勬墦鍗版姤鍛婃椂闂翠负褰撳墠鏃堕棿
LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TjOrder::getTjNumber, byId.getTjNumber());
- updateWrapper.set(TjOrder::getReportTime, new Date());
- updateWrapper.set(TjOrder::getPrintLastTime, new Date());
- updateWrapper.set(TjOrder::getDownloadLastTime, new Date());
+// updateWrapper.set(TjOrder::getReportTime, new Date());
+// updateWrapper.set(TjOrder::getPrintLastTime, new Date());
+// updateWrapper.set(TjOrder::getDownloadLastTime, new Date());
updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
tjOrderService.update(updateWrapper);
}
@@ -2694,9 +2797,9 @@
try {
shengchengbgmoban(byId.getTjNumber(), byId, tjCustomer, reportTemplate, zongJianYiShiQianMing);
byId.setStatus(TjConstants.TJ_END);
- byId.setReportTime(date);
- byId.setPrintLastTime(date);
- byId.setDownloadLastTime(date);
+// byId.setReportTime(date);
+// byId.setPrintLastTime(date);
+// byId.setDownloadLastTime(date);
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
e.printStackTrace();
@@ -3243,47 +3346,61 @@
}
-
@GetMapping("/zongjanyemianshjianzhou")
@ApiOperation(value = "鎬绘鑾峰彇鏃堕棿杞存帴鍙�")
@Transactional
- public AjaxResult zongjanyemianshjianzhou(@RequestParam String tjNUm) {
- TjOrder order = tjOrderService.getOrderByTjNum(tjNUm);
- if(null !=order){
- int czwj = remarkService.panduaniscunzaiweijian(tjNUm);
- int sfwc = remarkService.panduaniswancheng(tjNUm);
- Date checkTime = order.getCheckTime();
- Date reportTime = order.getReportTime();
- Integer heshouStatus = order.getHeshouStatus();
- Date lastTime = order.getPrintLastTime();
- if(czwj==0){
- //鏈
- return AjaxResult.success(0);
- } else if(czwj>0) {
- //鍦ㄦ
- return AjaxResult.success(1);
- }else if(sfwc==0){
- //宸插畬鎴�
- return AjaxResult.success(2);
- }else if(null !=checkTime){
- //宸插鏍�
- return AjaxResult.success(3);
- }else if(null !=reportTime){
- //鐢熸垚鎶ュ憡
- return AjaxResult.success(4);
- }else if(null !=heshouStatus){
- //鎶ュ憡鏍告敹
- return AjaxResult.success(5);
- }else if(null !=lastTime){
- //宸插嚭鎶ュ憡
- return AjaxResult.success(6);
- }else {
- return AjaxResult.error();
+ public AjaxResult zongjanyemianshjianzhou(@RequestParam List<String> tjNUms) {
+
+ if(null !=tjNUms && !tjNUms.isEmpty()){
+ List<Map<String,Object>> list=new ArrayList<>();
+ for (String tjNUm : tjNUms) {
+ Map<String,Object> map=new HashMap<>();
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNUm);
+ if (null != order) {
+ int czwj = remarkService.panduaniscunzaiweijian(tjNUm);
+ int sfwc = remarkService.panduaniswancheng(tjNUm);
+ Date checkTime = order.getCheckTime();
+ Date reportTime = order.getReportTime();
+ Integer heshouStatus = order.getHeshouStatus();
+ Date lastTime = order.getPrintLastTime();
+ int a=0;
+ if (czwj == 0) {
+ //鏈
+ a=0;
+ }
+ if (czwj > 0) {
+ //鍦ㄦ
+ a=1;
+ }
+ if (sfwc == 0) {
+ //宸插畬鎴�
+ a=2;
+ }
+ if (null != checkTime) {
+ //宸插鏍�
+ a=3;
+ }
+ if (null != reportTime) {
+ //鐢熸垚鎶ュ憡
+ a=4;
+ }
+ if (null != heshouStatus) {
+ //鎶ュ憡鏍告敹
+ a=5;
+ }
+ if (null != lastTime) {
+ //宸插嚭鎶ュ憡
+ a=6;
+ }
+ map.put("tjNUm",tjNUm);
+ map.put("sjz",a);
+ list.add(map);
}
+ }
+ return AjaxResult.success(list);
}
return AjaxResult.error();
}
-
}
--
Gitblit v1.8.0