From 30616665503726b49cb627cf59a9460e59523bee Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 24 三月 2025 18:17:26 +0800
Subject: [PATCH] zjh20250324
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java | 6 +++---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 28 ++++++++++++++++++++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 2 +-
3 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
index c590fd8..687021a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
@@ -337,7 +337,7 @@
creatTable(object, tabName, connection);
} catch (SQLException e) {
log.error(String.valueOf(e),e.getMessage());
- return AjaxResult.error();
+// return AjaxResult.error();
}
}
//鎻掑叆鏁版嵁
@@ -345,7 +345,7 @@
operationTable(object,connection,hisApiConfig,paramsJson,code);
} catch (SQLException e) {
log.error(String.valueOf(e),e.getMessage());
- return AjaxResult.error();
+// return AjaxResult.error();
}finally {
try {
connection.close();
@@ -481,7 +481,7 @@
String key = entry.getKey().trim().toLowerCase();
if (StrUtil.isBlank(defaultVal) || defaultVal.equals("null"))
continue;
- String val = defaultVal.trim().replaceAll("\\s+", "");
+ String val = defaultVal.trim().replaceAll("\\s+", "").replaceAll("[^\\x00-\\x7F]", "");
if (primaryKesList.contains(key)) {
deleteSqlBuilder.append(key).append(" = '").append(val).append("' and ");
}
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 e64e858..2189921 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
@@ -713,7 +713,7 @@
}
return AjaxResult.error("璇ヤ汉鍛樻暟鎹鍦ㄥ悓姝ヤ腑锛岃绋嶇瓑");
} catch (InterruptedException e) {
- e.printStackTrace();
+ log.error(String.valueOf(e),e.getMessage());
return AjaxResult.error("璇ヤ汉鍛樻暟鎹鍦ㄥ悓姝ヤ腑锛岃绋嶇瓑");
}finally {
lock.unlock();
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 ed0d806..cd429dd 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
@@ -18,6 +18,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -333,4 +334,31 @@
}
return AjaxResult.error("鏆傛棤浣撴璁板綍");
}
+
+
+
+ @GetMapping ("/getYxJcXxJg")
+ @ApiOperation (value = "鑾峰彇褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥剧粨鏋滄帴鍙�")
+ @Transactional
+ public AjaxResult getYxJcXxJg(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber,
+ @ApiParam (value = "椤圭洰id") @RequestParam String proId) {
+ TjOrder order = orderService.getOrderByTjNum(tjNumber);
+ 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::getOrderId,order.getOrderId());
+ TjOrderDetail detail = detailService.getOne(wq1);
+ if(null !=detail && StringUtil.isNotBlank(detail.getProResult())){
+ Map<String,Object> map=new HashMap<>();
+ String string = detail.getProResult();
+
+ }
+ }
+ return AjaxResult.success();
+ }
+ return AjaxResult.error("鏆傛棤浣撴璁板綍");
+ }
}
--
Gitblit v1.8.0