From f072f0f403aa3dd2590d4cca5af0e1c8de6d9cdf Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 07 四月 2025 18:02:17 +0800
Subject: [PATCH] zjh20250407

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index d2f35d8..bcaa9a3 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -1742,17 +1742,32 @@
                             if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
                                 if (null != project.getHisXmbm()) {
                                     {
-                                        mapJinchuan.add(project.getProParentId().toString());
-                                        OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
-                                        detailsDto.setMxfyxmbm(project.getHisXmbm());
+
                                         if (project.getSfzhfy().equals("Y")) {
-                                            detailsDto.setSfzhfy("1");
-                                        } else {
-                                            detailsDto.setSfzhfy("0");
+                                            mapJinchuan.add(project.getProParentId().toString());
+                                            OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
+                                            detailsDto.setMxfyxmbm(project.getHisXmbm());
+                                            if (project.getSfzhfy().equals("Y")) {
+                                                detailsDto.setSfzhfy("1");
+                                            } else {
+                                                detailsDto.setSfzhfy("0");
+                                            }
+                                            detailsDto.setSl(project.getSl());
+                                            detailsDto.setProjg(project.getProPrice());
+                                            detailDtos.add(detailsDto);
                                         }
-                                        detailsDto.setSl(project.getSl());
-                                        detailsDto.setProjg(project.getProPrice());
-                                        detailDtos.add(detailsDto);
+
+//                                        mapJinchuan.add(project.getProParentId().toString());
+//                                        OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
+//                                        detailsDto.setMxfyxmbm(project.getHisXmbm());
+//                                        if (project.getSfzhfy().equals("Y")) {
+//                                            detailsDto.setSfzhfy("1");
+//                                        } else {
+//                                            detailsDto.setSfzhfy("0");
+//                                        }
+//                                        detailsDto.setSl(project.getSl());
+//                                        detailsDto.setProjg(project.getProPrice());
+//                                        detailDtos.add(detailsDto);
                                     }
                                 }
                                 List<Long> proParentIds = projects.stream().map(TjProject::getProParentId).distinct().collect(Collectors.toList());

--
Gitblit v1.8.0