From dedacd79c93f8ef95e0cb986f5e7fbd27ddbd907 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 03 七月 2025 09:12:49 +0800
Subject: [PATCH] 2025-07-03

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 insertions(+), 4 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..af53c70 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,9 +361,8 @@
             if(null !=order){
                 TjProject project = projectService.getById(proId);
                 if(null !=project){
-                    List<TjProject> projects = projectService.getTjProjectListBySoneId(proId);
                     LambdaQueryWrapper<TjOrderDetail>wq1=new LambdaQueryWrapper<>();
-                    wq1.eq(TjOrderDetail::getProId,projects.get(0).getProParentId());
+                    wq1.eq(TjOrderDetail::getProId,proId);
                     wq1.eq(TjOrderDetail::getOrderId,order.getOrderId());
                     TjOrderDetail detail = detailService.getOne(wq1);
                     if(null !=detail){
@@ -425,13 +424,37 @@
             jcbgd.setShysxm(xdtgmdjg.getCreateBy());
             jcbgd.setShysdm(xdtgmdjg.getCreateId());
             jcbgd.setYxzd(xdtgmdjg.getJcjl());
-            jcbgd.setYxbx("鏈寮傚父");
+            jcbgd.setYxbx(xdtgmdjg.getJcjl());
             jcbgd.setZdsj(DateUtil.format(date,"yyyy-MM-dd"));
             jcbgd.setJcbw("");
+            jcbgd.setLx("1");
             jcbgd.setSqsj(DateUtil.format(date,"yyyy-MM-dd"));
             jcbgd.setCreateTime(date);
             jcbgdService.save(jcbgd);
-            jcsqdService.saveLtkjExamJcsqd(xdtgmdjg.getCardId());
+            jcsqdService.saveXdtLtkjExamJcsqd(xdtgmdjg.getCardId(),jcbgd.getTmh());
+
+            LambdaQueryWrapper<TjJcycxm> wq=new LambdaQueryWrapper<>();
+            wq.eq(TjJcycxm::getTjh,xdtgmdjg.getTjh());
+            wq.eq(TjJcycxm::getProId,xdtgmdjg.getProId());
+            jcycxmService.remove(wq);
+            if(StringUtil.isNotBlank(xdtgmdjg.getJcjl())){
+                String s = "銆倈锛泑;|,|锛�";
+                String[] split = xdtgmdjg.getJcjl().replaceAll("\n", "銆�").split(s);
+                for (String jg : split) {
+                    if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
+                            && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
+                            && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝e父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")){
+                        TjJcycxm jcycxm=new TjJcycxm();
+                        jcycxm.setTjh(xdtgmdjg.getTjh());
+                        jcycxm.setYqid("");
+                        jcycxm.setProId(xdtgmdjg.getProId());
+                        jcycxm.setProName(xdtgmdjg.getProName());
+                        jcycxm.setCreateTime(new Date());
+                        jcycxm.setJcjg(jg);
+                        jcycxmService.save(jcycxm);
+                    }
+                }
+            }
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

--
Gitblit v1.8.0