From 07e99128114a015c11fe21858f21f00306216472 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 26 二月 2025 17:36:32 +0800
Subject: [PATCH] zjh20250226
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 38 +++++++++++++------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 20 ++++++++-
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 6 ++
3 files changed, 48 insertions(+), 16 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index 63bfd3f..950f410 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -200,7 +200,7 @@
}
// Map<String,Object> mapJinchuan=new HashMap<>();
- List<String> mapJinchuan=null;
+ private static List<String> mapJinchuan=null;
public AjaxResult tijianshenqingJinchuanNew(TjCustomer customer, String date,String cardId)
{
mapJinchuan=new ArrayList<>();
@@ -213,6 +213,8 @@
String dept = configService.selectConfigByKey("request_default_dept");
String ysbm = configService.selectConfigByKey("request_default_ysbm");
String ysmc = configService.selectConfigByKey("request_default_ysmc");
+
+ log.info("mapJinchuan闆嗗悎閲岄潰鐨勬暟鎹槸: "+mapJinchuan.toString());
List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
@@ -254,6 +256,8 @@
wrapper.notIn(TjProject::getProParentId, mapJinchuan);
}
List<TjProject> list = projectService.list(wrapper);
+
+ log.info("妫�楠岀敵璇烽泦鍚堥噷闈㈢殑鏁版嵁鏄�: "+list.toString());
for (TjProject tjProject : list) {
if (StrUtil.isNotBlank(tjProject.getHisXmbm()) && tjProject.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
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 efa6950..048d4d8 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
@@ -560,7 +560,7 @@
maps.put("ksbm", "浣撴涓績");
maps.put("pagecount", 100);
maps.put("page", 1);
-// AjaxResult results = service.getHISDataNew("Getexamreportinfo", maps);
+
LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Getexamreportinfo");
@@ -568,7 +568,15 @@
/*鍚屾妫�鏌� his瀛樺偍杩囩▼*/
- AjaxResult results = jcsqdService.getTjJcProByHisCall("浣撴涓績", order.getCardId(), "''", 100, 1, "'1'");
+
+ String jctbfs = configService.selectConfigByKey("jctbfs");
+ AjaxResult results =null;
+ if (jctbfs.equalsIgnoreCase("Y")){
+ results = service.getHISDataNew("Getexamreportinfo", maps);
+ }else{
+ results = jcsqdService.getTjJcProByHisCall("浣撴涓績", order.getCardId(), "''", 100, 1, "'1'");
+ }
+
DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
DynamicDataSourceContextHolder.clearDataSourceType();
@@ -803,7 +811,13 @@
lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Getexamreportinfo");
HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
/*鍚屾妫�鏌� his瀛樺偍杩囩▼*/
- AjaxResult results = jcsqdService.getTjJcProByHisCall("浣撴涓績", order.getCardId(), "''", 100, 1, "'1'");
+ String jctbfs = configService.selectConfigByKey("jctbfs");
+ AjaxResult results =null;
+ if (jctbfs.equalsIgnoreCase("Y")){
+ results = service.getHISDataNew("Getexamreportinfo", maps);
+ }else{
+ results = jcsqdService.getTjJcProByHisCall("浣撴涓績", order.getCardId(), "''", 100, 1, "'1'");
+ }
DynamicDataSourceContextHolder.clearDataSourceType();
log.info("妫�鏌ラ」鐩煡璇㈣繑鍥炲��: " + results.toString());
if (Integer.parseInt(results.get("code").toString()) == 200) {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 9e4fc5d..833b9bf 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1212,16 +1212,16 @@
/*璋冪敤his鎺ュ彛*/
String config = configService.selectConfigByKey("sfkqdyhis");
if (null != config && config.equals("Y")) {
- AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder);
- if (!result.get("code").toString().equals("200")) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- Object jzh = result.get("jzh");
- if (null != jzh && null != jzh.toString()) {
- hisApiMethod.ZfHisApiMethod(jzh.toString());
- }
- log.info("璇ョ櫥璁颁汉鎸傚彿澶辫触, 灏辫瘖鍙蜂负: " + tjOrder.getCardId());
- return AjaxResult.error("鎸傚彿澶辫触!" + result.get("msg").toString());
- }
+// AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder);
+// if (!result.get("code").toString().equals("200")) {
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// Object jzh = result.get("jzh");
+// if (null != jzh && null != jzh.toString()) {
+// hisApiMethod.ZfHisApiMethod(jzh.toString());
+// }
+// log.info("璇ョ櫥璁颁汉鎸傚彿澶辫触, 灏辫瘖鍙蜂负: " + tjOrder.getCardId());
+// return AjaxResult.error("鎸傚彿澶辫触!" + result.get("msg").toString());
+// }
log.info("璇ョ櫥璁颁汉鐨刪is灏辫瘖鍙锋槸: " + tjOrder.getCardId());
//鍥綋
@@ -1239,8 +1239,8 @@
// 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
tjFlowingWater.setPayStasus(1L);
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
- AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result);
- if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult;
+// AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result);
+// if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult;
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
@@ -3758,6 +3758,20 @@
}
+ @GetMapping("/chushenyemianyijianjiekou")
+ @ApiOperation(value = "鍒濆椤甸潰寮冩鎺ュ彛")
+ @Transactional
+ public AjaxResult chushenyemianyijianjiekou(@RequestParam String tjNUm, @RequestParam String proId) {
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getTjNumber, tjNUm);
+ wq.eq(TjOrderRemark::getProId, proId);
+ TjOrderRemark remark = remarkService.getOne(wq);
+ remark.setType(1);
+ remarkService.updateById(remark);
+ return AjaxResult.success("鎿嶄綔鎴愬姛!");
+ }
+
+
@PostMapping("/zongjanyemianshjianzhou")
@ApiOperation(value = "鎬绘鑾峰彇鏃堕棿杞存帴鍙�")
@Transactional
--
Gitblit v1.8.0