From 46d3403bb8dcfeed6dd04c8f492a830e3ea8160b Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期一, 24 六月 2024 20:15:16 +0800
Subject: [PATCH] zjh 本地 2024/06/24 --1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 dc3d545..683f1b6 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
@@ -1926,6 +1926,7 @@
map.put("proPrantId", entry.getKey().toString());
if (null != pacId) {
TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
+ map.put("tjCategory",aPackage.getTjCategory());
map.put("pacName", aPackage.getPacName());
TjProject tjProject = projectService.getById(entry.getKey());
// TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
@@ -1938,6 +1939,7 @@
// }
map.put("nowPrice", transitionService.getTbTransitionDxPriceByPac(cusId, entry.getKey(), cardId, pacId));
} else {
+ map.put("tjCategory",null);
map.put("pacName", "鍗曢」");
List<TbTransition> tbTransitionList = entry.getValue();
if (null != tbTransitionList && tbTransitionList.size() > 0) {
@@ -1976,6 +1978,7 @@
map.put("proPrantId", entry.getKey().toString());
if (null != pacId) {
TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
+ map.put("tjCategory",aPackage.getTjCategory());
map.put("pacName", aPackage.getPacName());
TjProject tjProject = projectService.getById(entry.getKey());
// TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
@@ -1986,8 +1989,9 @@
// } else {
// map.put("nowPrice", tjProject.getProPrice());
// }
- map.put("nowPrice", transitionService.getTbTransitionDxPriceByPac(cusId, entry.getKey(), cardId, pacId));
+ map.put("nowPrice",tjProject.getProPrice());
} else {
+ map.put("tjCategory",null);
map.put("pacName", "鍗曢」");
List<TbTransition> tbTransitionList = entry.getValue();
if (null != tbTransitionList && tbTransitionList.size() > 0) {
@@ -2256,7 +2260,7 @@
wrapper.eq("tj_num",tjNumber);
list = transitionService.list(wrapper);
JSONArray info = JSONUtil.createArray();
- index = 0;
+ index = 1;
for (TbTransition tbTransition : list) {
JSONObject obj = JSONUtil.createObj();
obj.putOpt("index",index++);
@@ -2271,7 +2275,9 @@
obj.putOpt("num",num);
BigDecimal price = ordPrice.divide(new BigDecimal(num));
obj.putOpt("danjia",price);
- obj.putOpt("time",tbTransition.getCreateTime());
+ Date createTime = tbTransition.getCreateTime();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ obj.putOpt("time",dateFormat.format(createTime));
info.put(obj);
}
HashMap<String, Object> map = new HashMap<>();
--
Gitblit v1.8.0