From 201e9ae76d2c8d6219ceabbf4e1ebb36fc2e7a06 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 11 七月 2024 18:18:23 +0800
Subject: [PATCH] zjh 2024/07/11-1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 3286075..caec8fa 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -511,11 +511,21 @@
                                 if(null !=objectMap.get("YXZD") || !objectMap.get("YXZD").equals(""))
                                 jcbgd.setYxzd(objectMap.get("YXZD").toString());
 
-                                if(null !=objectMap.get("YXBX") || !objectMap.get("YXBX").equals(""))
-                                jcbgd.setYxbx(objectMap.get("YXBX").toString());
-
+                                if(null !=objectMap.get("YXBX") || !objectMap.get("YXBX").equals("")){
+                                    if(objectMap.get("YXBX").toString().equals("null")){
+                                        jcbgd.setYxbx("鏈寮傚父");
+                                    }else {
+                                        jcbgd.setYxbx(objectMap.get("YXBX").toString());
+                                    }
+                                }
                                 if(null !=objectMap.get("SJJLSJ") || !objectMap.get("SJJLSJ").equals(""))
                                 jcbgd.setZdsj(objectMap.get("SJJLSJ").toString());
+
+                                if(null !=objectMap.get("JCBW") || !objectMap.get("JCBW").equals(""))
+                                    jcbgd.setJcbw(objectMap.get("JCBW").toString());
+
+                                if(null !=objectMap.get("SQRQSJ") || !objectMap.get("SQRQSJ").equals(""))
+                                    jcbgd.setSqsj(objectMap.get("SQRQSJ").toString());
 
                                 jcbgdService.save(jcbgd);
                             }
@@ -989,10 +999,13 @@
                                 } catch (NumberFormatException ignored) {
                                     ignored.printStackTrace();
                                 }
+                                if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
+                                    tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
+                                }
+                            }else {
+                                tjOrderDetail.setProResult(tjOrderDetail.getProResult());
                             }
-                            if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
-                                tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
-                            }
+
                             dels.add(tjOrderDetail);
                         }
                     }

--
Gitblit v1.8.0