From 41f99a843fb2c0424426e006f29c1e78192eae01 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 06 十二月 2023 08:37:55 +0800
Subject: [PATCH] zjh 2023/12/06--1
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java | 10 +++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java | 4 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 39 +++++++++++++++++++
ltkj-admin/src/main/resources/logback.xml | 9 ++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjCustomerService.java | 2 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCustomerServiceImpl.java | 5 ++
ltkj-admin/src/main/resources/application.yml | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/HistoryTjOrder.java | 33 ++++++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java | 10 +++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java | 5 ++
10 files changed, 117 insertions(+), 2 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 e485e43..250602e 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
@@ -4,6 +4,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
+import java.time.OffsetTime;
import java.util.*;
import java.util.List;
import java.util.stream.Collectors;
@@ -29,6 +30,7 @@
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.vodomain.BingZhongVO;
+import com.ltkj.hosp.vodomain.HistoryTjOrder;
import com.ltkj.hosp.vodomain.QjDomainVo;
import com.ltkj.mall.domain.MallCheckLog;
import com.ltkj.mall.domain.MallOrder;
@@ -64,7 +66,7 @@
*/
@RestController
@RequestMapping("/hosp/order")
-@Api(tags = "浣撴璁板綍鎺ュ彛")
+@Api(tags = "PC绔� ----浣撴璁板綍鎺ュ彛")
@Slf4j
public class TjOrderController extends BaseController {
@Resource
@@ -1643,4 +1645,39 @@
}
return AjaxResult.success("鏍告敹鎴愬姛");
}
+
+ @GetMapping("/getHistryTjOrderByCusIdCard")
+ @ApiOperation(value = "鏍规嵁韬唤璇佸彿鏌ョ湅鍘嗗彶浣撴璁板綍")
+ @Transactional
+ public AjaxResult getHistryTjOrderByCusIdCard(@RequestParam String cusIdCard) {
+ TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusIdCard);
+ List<HistoryTjOrder> list=new ArrayList<>();
+ if(null !=tjCustomer){
+ List<TjOrder> orderList = tjOrderService.getTjOrderListByCusId(tjCustomer.getCusId());
+ for (TjOrder order : orderList) {
+ HistoryTjOrder historyTjOrder=new HistoryTjOrder();
+ historyTjOrder.setUserName(tjCustomer.getCusName());
+ historyTjOrder.setTjNum(order.getTjNumber());
+ historyTjOrder.setTjTime(order.getCreateTime());
+ historyTjOrder.setTjProName(tjOrderService.getHistoryTjOrderProByTjNum(order.getTjNumber()));
+ list.add(historyTjOrder);
+ }
+ }
+ return AjaxResult.success(list);
+ }
+
+
+ @GetMapping("/getHistryTjOrderProByCusIdCard")
+ @ApiOperation(value = "鏍规嵁韬唤璇佸彿鏌ョ湅鍘嗗彶浣撴椤圭洰璁板綍")
+ @Transactional
+ public AjaxResult getHistryTjOrderProByCusIdCard(@RequestParam String cusIdCard) {
+ TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusIdCard);
+ if(null !=tjCustomer){
+ TjOrder order= tjOrderService.getLastTjOrderListByCusId(tjCustomer.getCusId());
+
+ return AjaxResult.success(order);
+ }
+ return AjaxResult.success("鏆傛棤鍘嗗彶璁板綍");
+ }
+
}
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 7a3e8f8..b7f3608 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -82,7 +82,7 @@
# 瀵嗙爜
password: 654321
# 杩炴帴瓒呮椂鏃堕棿
- timeout: 60s
+ timeout: 120s
lettuce:
pool:
# 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
diff --git a/ltkj-admin/src/main/resources/logback.xml b/ltkj-admin/src/main/resources/logback.xml
index ac4ea46..030fefa 100644
--- a/ltkj-admin/src/main/resources/logback.xml
+++ b/ltkj-admin/src/main/resources/logback.xml
@@ -80,6 +80,15 @@
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
+<!-- <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">-->
+<!-- <!– ... 鍏朵粬閰嶇疆 ... –>-->
+<!-- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">-->
+<!-- <!– ... 鍏朵粬閰嶇疆 ... –>-->
+<!-- <!– 璁剧疆鏈�闀夸繚鐣欐湡闄愪负 7 澶� –>-->
+<!-- <maxDays>7</maxDays>-->
+<!-- </rollingPolicy>-->
+<!-- </appender>-->
+
<!-- 绯荤粺妯″潡鏃ュ織绾у埆鎺у埗 -->
<logger name="com.ltkj" level="info"/>
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java
index c729cd5..f61ebfb 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjCustomerMapper.java
@@ -66,4 +66,8 @@
@Select("SELECT * FROM tj_customer WHERE cus_name like concat('%',#{name},'%') AND deleted=0 ")
List<TjCustomer> getTjCustomerList(String name);
+
+
+ @Select("SELECT * FROM tj_customer WHERE cus_idcard = #{cusIdCard}")
+ TjCustomer getTjCustomerByCusIdCard(String cusIdCard);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
index f110264..56dfb05 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -175,4 +175,14 @@
@Select("SELECT * FROM tj_order WHERE deleted='0' and user_id = #{userId} AND !ISNULL(finish_time) " +
"and !ISNULL(confirm_time) ")
List<TjOrder> getCsTjOrderListByCusId1(Long userId);
+
+
+ @Select("SELECT GROUP_CONCAT( DISTINCT b.pro_name SEPARATOR ';' ) aa FROM tj_order_remark a" +
+ " LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.deleted=0 AND a.tj_number= #{tjNum} AND a.type !=2")
+ String getHistoryTjOrderProByTjNum(String tjNum);
+
+
+ @Select("SELECT * FROM tj_order WHERE deleted='0' and user_id =#{userId}" +
+ " AND !ISNULL(finish_time) ORDER BY create_time DESC LIMIT 1")
+ TjOrder getLastTjOrderListByCusId(Long userId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjCustomerService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjCustomerService.java
index 5686ed0..ca4745e 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjCustomerService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjCustomerService.java
@@ -61,4 +61,6 @@
public int deleteTjCustomerByCusId(Long cusId);
List<TjCustomer> getTjCustomerList(String name);
+
+ TjCustomer getTjCustomerByCusIdCard(String cusIdCard);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
index 18651e4..23edc54 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -112,4 +112,9 @@
//鎬绘 宸插垵瀹¤繃
List<TjOrder> getCsTjOrderListByCusId1(Long userId);
+
+ String getHistoryTjOrderProByTjNum(String tjNum);
+
+
+ TjOrder getLastTjOrderListByCusId(Long userId);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCustomerServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCustomerServiceImpl.java
index 41f642c..ec6b0b5 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCustomerServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjCustomerServiceImpl.java
@@ -95,4 +95,9 @@
public List<TjCustomer> getTjCustomerList(String name) {
return tjCustomerMapper.getTjCustomerList(name);
}
+
+ @Override
+ public TjCustomer getTjCustomerByCusIdCard(String cusIdCard) {
+ return tjCustomerMapper.getTjCustomerByCusIdCard(cusIdCard);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
index 385a84a..a54d353 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -211,4 +211,14 @@
public List<TjOrder> getCsTjOrderListByCusId1(Long userId) {
return tjOrderMapper.getCsTjOrderListByCusId1(userId);
}
+
+ @Override
+ public String getHistoryTjOrderProByTjNum(String tjNum) {
+ return tjOrderMapper.getHistoryTjOrderProByTjNum(tjNum);
+ }
+
+ @Override
+ public TjOrder getLastTjOrderListByCusId(Long userId) {
+ return tjOrderMapper.getLastTjOrderListByCusId(userId);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/HistoryTjOrder.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/HistoryTjOrder.java
new file mode 100644
index 0000000..e3e7ddc
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/HistoryTjOrder.java
@@ -0,0 +1,33 @@
+package com.ltkj.hosp.vodomain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ltkj.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
+ * @Author: zjh
+ * @Date: 2023/12/5 0005 11:23
+ */
+@Data
+public class HistoryTjOrder {
+ //濮撳悕
+ private String userName;
+
+ //浣撴鍙�
+ private String tjNum;
+
+ //浣撴鏃堕棿
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date tjTime;
+
+ //浣撴椤圭洰
+ private String tjProName;
+
+}
--
Gitblit v1.8.0