From d4b226bc63f56b7039deea20c0e1e120eb302e19 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 18 十二月 2023 18:02:51 +0800
Subject: [PATCH] zjh 2023/12/18--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 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 96f1748..9652d00 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
@@ -200,12 +200,12 @@
// 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));
+ 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));
}
@@ -243,15 +243,15 @@
// });
// }
- List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber);
- if(null !=list && list.size()>0){
- list.sort(new Comparator<CsProVo>() {
- @Override
- public int compare(CsProVo o1, CsProVo o2) {
- return o1.getType() - o2.getType();
- }
- });
- }
+ List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber);
+ if (null != list && list.size() > 0) {
+ list.sort(new Comparator<CsProVo>() {
+ @Override
+ public int compare(CsProVo o1, CsProVo o2) {
+ return o1.getType() - o2.getType();
+ }
+ });
+ }
return AjaxResult.success(list);
}
@@ -449,12 +449,12 @@
// 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.getCunChuGuoChengCustomerList(tjNumber,page,pageSize,checkStatus, value,beginTime,endTime,name));
+ if (tjNumber == null) tjNumber = "";
+ if (compId == null) value = "";
+ if (name == null) name = "";
+ if (beginTime == null) beginTime = "";
+ if (endTime == null) endTime = "";
+ return AjaxResult.success(orderService.getCunChuGuoChengCustomerList(tjNumber, page, pageSize, checkStatus, value, beginTime, endTime, name));
}
/**
@@ -563,7 +563,7 @@
tjOrderDetail.setStandard(list2.get(0));
} else {
final int ageType = StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday()));
- TjStandard tjStandard1 = tjStandardService.getListBySexAndType(customer.getCusSex(), ageType, String.valueOf(tjOrderDetail.getProId()));
+ TjStandard tjStandard1 = tjStandardService.getListBySexAndType(customer.getCusSex(),ageType,String.valueOf(tjOrderDetail.getProId()));
tjOrderDetail.setStandard(tjStandard1);
}
}
--
Gitblit v1.8.0