From ff7f564dc6c43384857a80246f72575a40e86cde Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 26 七月 2024 16:55:52 +0800
Subject: [PATCH] 参考范围为空时设置异常标志为空
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 74 ++++++++++++++++++++++++------------
1 files changed, 49 insertions(+), 25 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index 572f5d9..d5544f3 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -74,7 +74,6 @@
}
//瀵规帴his鎬绘帴鍙� 娉ㄥ唽鎸傚彿鎺ヨ瘖鐢宠鍗曟搷浣�
- @Transactional
@Logger
public AjaxResult HisApiMethods(TjCustomer customer, Long orderId) {
@@ -204,6 +203,7 @@
detailsDto.setSfzhfy("0");
}
detailsDto.setSl(project.getSl());
+ detailsDto.setProjg(project.getProPrice());
detailsDtos.add(detailsDto);
}
if(project.getProId()==1740177341251154377L){
@@ -253,14 +253,24 @@
String mxfyxmbm = detail.getMxfyxmbm();
tree.setHisXmdm(mxfyxmbm);
tree.setType("妫�楠�");
- LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
- List<TjProject> list = projectService.list(wrapper);
- String tj_price = "";
- for (TjProject project : list) {
- tj_price += project.getProPrice() + "銆�";
- }
- tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
+// LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
+// List<TjProject> list = projectService.list(wrapper);
+// String tj_price = "";
+// for (TjProject project : list) {
+// tj_price += project.getProPrice() + "銆�";
+// }
+// tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
+// LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
+// wrapper.eq(TjProject::getSl,1);
+// wrapper.groupBy(TjProject::getHisXmbm);
+// TjProject project = projectService.getOne(wrapper);
+// if(null !=project){
+// BigDecimal decimal = project.getProPrice().multiply(BigDecimal.valueOf(detail.getSl()));
+// tree.setTjPrice(String.valueOf(decimal));
+// }
+ tree.setTjPrice(String.valueOf(detail.getProjg()));
LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
if (detail.getSfzhfy().equals("1"))
wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
@@ -357,6 +367,7 @@
detailsDto.setSfzhfy("0");
}
detailsDto.setSl(project.getSl());
+ detailsDto.setProjg(project.getProPrice());
detailsDtoss.add(detailsDto);
}
@@ -382,14 +393,24 @@
String mxfyxmbm = detail.getMxfyxmbm();
tree.setHisXmdm(mxfyxmbm);
tree.setType("妫�鏌�");
- LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
- List<TjProject> list = projectService.list(wrapper);
- String tj_price = "";
- for (TjProject project : list) {
- tj_price += project.getProPrice() + "銆�";
- }
- tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
+// LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
+// List<TjProject> list = projectService.list(wrapper);
+// String tj_price = "";
+// for (TjProject project : list) {
+// tj_price += project.getProPrice() + "銆�";
+// }
+// tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
+// LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
+// wrapper.eq(TjProject::getSl,1);
+// wrapper.groupBy(TjProject::getHisXmbm);
+// TjProject project = projectService.getOne(wrapper);
+// if(null !=project){
+// BigDecimal decimal = project.getProPrice().multiply(BigDecimal.valueOf(detail.getSl()));
+// tree.setTjPrice(String.valueOf(decimal));
+// }
+ tree.setTjPrice(String.valueOf(detail.getProjg()));
LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
if (detail.getSfzhfy().equals("1"))
wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
@@ -453,6 +474,7 @@
detailsDto.setSfzhfy("0");
}
detailsDto.setSl(project.getSl());
+ detailsDto.setProjg(project.getProPrice());
detailDtos.add(detailsDto);
}
}
@@ -477,14 +499,16 @@
String mxfyxmbm = detail.getMxfyxmbm();
tree.setHisXmdm(mxfyxmbm);
tree.setType("澶勭疆");
- LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
- List<TjProject> list = projectService.list(wrapper);
- String tj_price = "";
- for (TjProject project : list) {
- tj_price += project.getProPrice() + "銆�";
- }
- tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
+// LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
+// wrapper.eq(TjProject::getSl,1);
+// wrapper.groupBy(TjProject::getHisXmbm);
+// TjProject project = projectService.getOne(wrapper);
+// if(null !=project){
+// BigDecimal decimal = project.getProPrice().multiply(BigDecimal.valueOf(detail.getSl()));
+// tree.setTjPrice(String.valueOf(decimal));
+// }
+ tree.setTjPrice(String.valueOf(detail.getProjg()));
LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
if (detail.getSfzhfy().equals("1"))
wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
--
Gitblit v1.8.0