From c63daceb66fbb7faa56849e695c07e28447818b9 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 29 四月 2025 14:18:46 +0800
Subject: [PATCH] pdf生成增加是否根据orderdetail结果字段判断 修复字体重叠问题 固定项目结论增加字符串去除null
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
index fa466d4..1508821 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
@@ -361,13 +361,13 @@
if(null !=order){
TjProject project = projectService.getById(proId);
if(null !=project){
- List<TjProject> projects = projectService.getTjProjectListBySoneId(proId);
+// List<TjProject> projects = projectService.getTjProjectListBySoneId(proId);
LambdaQueryWrapper<TjOrderDetail>wq1=new LambdaQueryWrapper<>();
- wq1.eq(TjOrderDetail::getProId,projects.get(0).getProParentId());
+// wq1.eq(TjOrderDetail::getProId,projects.get(0).getProParentId());
wq1.eq(TjOrderDetail::getOrderId,order.getOrderId());
TjOrderDetail detail = detailService.getOne(wq1);
if(null !=detail){
- detail.setProResult(jcjl+"銆�"+jcsj);
+// detail.setProResult(jcjl+"銆�"+jcsj);
detail.setTjStatus(1L);
detailService.updateById(detail);
LambdaQueryWrapper<TjOrderRemark>wq2=new LambdaQueryWrapper<>();
--
Gitblit v1.8.0