From b83df5a43c563bac919dee41d3a8b794f22f1030 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 13 十二月 2024 19:20:45 +0800
Subject: [PATCH] zjh202412013
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 122 +++++++++++++++++++++++++++++++---------
1 files changed, 94 insertions(+), 28 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 6f3db93..c1d6c2a 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
@@ -80,6 +80,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.aspectj.weaver.ast.Var;
@@ -547,10 +548,11 @@
@ApiParam(value = "鎵撳嵃鏈墦鍗扮姸鎬� 0鏈墦鍗� 1宸叉墦鍗�") @RequestParam(defaultValue = "0") Integer dyzt,
@ApiParam(value = "浣撴鍙�)") @RequestParam(required = false) String tjNum,
@ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
+ @ApiParam(value = "鍗曚綅") @RequestParam(required = false) String dw,
@ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) String djbeginTime,
@ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) String djendTime) {
Map<String, Object> map = new HashMap<>();
- if (null != name) {
+ if (StringUtil.isNotBlank(name)) {
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
wqq.like(TjCustomer::getCusName, name);
List<TjCustomer> customerList = tjCustomerService.list(wqq);
@@ -599,17 +601,6 @@
list.get(i).setPacName(dwDeptService.getById(list.get(i).getPacId()).getDwDeptName());
}
}
-
- //浠庢墦鍗拌褰曟煡鍑烘渶鏂版墦鍗版椂闂�
- LambdaQueryWrapper<TjReportPrint> wqqq = new LambdaQueryWrapper<>();
- wqqq.eq(TjReportPrint::getTjNumber, list.get(i).getTjNumber());
- wqqq.orderByDesc(TjReportPrint::getPrintTime);
- wqqq.last("limit 1");
- TjReportPrint one = tjReportPrintService.getOne(wqqq);
- if (one != null) {
- list.get(i).setPrintLastTime(one.getPrintTime());
- }
-
}
collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
}
@@ -621,6 +612,74 @@
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);
@@ -972,7 +1031,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());
@@ -981,7 +1041,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")) {
@@ -990,6 +1049,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());
@@ -1003,9 +1072,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())));
}
@@ -3184,47 +3252,45 @@
}
-
@GetMapping("/zongjanyemianshjianzhou")
@ApiOperation(value = "鎬绘鑾峰彇鏃堕棿杞存帴鍙�")
@Transactional
public AjaxResult zongjanyemianshjianzhou(@RequestParam String tjNUm) {
TjOrder order = tjOrderService.getOrderByTjNum(tjNUm);
- if(null !=order){
+ 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){
+ if (czwj == 0) {
//鏈
return AjaxResult.success(0);
- } else if(czwj>0) {
+ } else if (czwj > 0) {
//鍦ㄦ
return AjaxResult.success(1);
- }else if(sfwc==0){
+ } else if (sfwc == 0) {
//宸插畬鎴�
return AjaxResult.success(2);
- }else if(null !=checkTime){
+ } else if (null != checkTime) {
//宸插鏍�
return AjaxResult.success(3);
- }else if(null !=reportTime){
+ } else if (null != reportTime) {
//鐢熸垚鎶ュ憡
return AjaxResult.success(4);
- }else if(null !=heshouStatus){
+ } else if (null != heshouStatus) {
//鎶ュ憡鏍告敹
return AjaxResult.success(5);
- }else if(null !=lastTime){
+ } else if (null != lastTime) {
//宸插嚭鎶ュ憡
return AjaxResult.success(6);
- }else {
+ } else {
return AjaxResult.error();
}
}
return AjaxResult.error();
}
-
}
--
Gitblit v1.8.0