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 | 94 ++++++++++++++++++++++++----------------------
1 files changed, 49 insertions(+), 45 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 14fa948..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
@@ -420,7 +420,7 @@
@ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) Date bgendTime,
@ApiParam(value = "鍗曚綅") @RequestParam(required = false) String dw) {
Map<String, Object> map = new HashMap<>();
- List<Long> cusIds =null;
+ List<Long> cusIds = null;
if (null != name) {
// List<TjCustomer> customerList;
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
@@ -579,10 +579,10 @@
}
if (StrUtil.isNotBlank(dw)) {
- wq.like(TjOrder::getFirmName,dw);
+ wq.like(TjOrder::getFirmName, dw);
}
- if(null !=cusIds && !cusIds.isEmpty()){
+ if (null != cusIds && !cusIds.isEmpty()) {
wq.in(TjOrder::getUserId, cusIds);
}
@@ -627,36 +627,40 @@
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("鏈");
- } else if (czwj > 0) {
- //鍦ㄦ
- order.setZt("鍦ㄦ");
- } else if (sfwc == 0) {
- //宸插畬鎴�
- order.setZt("宸插畬鎴�");
- } else if (null != checkTime) {
- //宸插鏍�
- order.setZt("宸插鏍�");
- } else if (null != reportTime) {
- //鐢熸垚鎶ュ憡
- order.setZt("鐢熸垚鎶ュ憡");
- } else if (null != heshouStatus) {
- //鎶ュ憡鏍告敹
- order.setZt("鎶ュ憡鏍告敹");
- } else if (null != lastTime) {
- //宸插嚭鎶ュ憡
- order.setZt("宸插嚭鎶ュ憡");
- } else {
- order.setZt("鏈");
- }
+ 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("宸插嚭鎶ュ憡");
+ }
}
}
@@ -677,7 +681,7 @@
@ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) String djbeginTime,
@ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) String djendTime) {
Map<String, Object> map = new HashMap<>();
- List<Long> cusIds =null;
+ List<Long> cusIds = null;
if (StringUtil.isNotBlank(name)) {
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
wqq.like(TjCustomer::getCusName, name);
@@ -826,10 +830,10 @@
if (null != tjNum) {
wq.like(TjOrder::getTjNumber, tjNum);
}
- if (StringUtil.isNotBlank(dw)){
+ if (StringUtil.isNotBlank(dw)) {
wq.like(TjOrder::getFirmName, dw);
}
- if(null !=cusIds && !cusIds.isEmpty()){
+ if (null != cusIds && !cusIds.isEmpty()) {
wq.in(TjOrder::getUserId, cusIds);
}
wq.orderByDesc(TjOrder::getCreateTime);
@@ -3399,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