From 4761f2bc70814bde9929f1081a213a9ab38a7393 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 02 一月 2025 18:15:38 +0800
Subject: [PATCH] 采样管理确认采样增加调用lis请求

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
index 802c01d..c7e531f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
@@ -260,10 +260,14 @@
         wrapper.eq(TjSampling::getTjNum, tjNumber);
         wrapper.eq(TjSampling::getIsSignFor,isSignFor);
         wrapper.and(i -> i.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1));
+//        wrapper.eq(TjSampling::getIsPay,1);
+//        if (isSignFor == 1)
+//            wrapper.eq(TjSampling::getIsApply,0);
         wrapper.orderByDesc(TjSampling::getIsMerge);
         List<TjSampling> list = tjSamplingService.list(wrapper);
         if (list.isEmpty()){
             logger.info("jtNum ->{}",tjNumber);
+//            return AjaxResult.error("鏈煡璇㈠埌鏁版嵁锛屼汉鍛樻湭缂磋垂鎴栨病鏈夋湭閲囨牱椤圭洰");
             return AjaxResult.error("鍙傛暟閿欒,鏈煡璇㈠埌鏁版嵁");
         }
 //        for (TjSampling sampling : list) {

--
Gitblit v1.8.0