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/callback/CallBackController.java | 69 +++++++++++++++++++++++++++++++++-
1 files changed, 66 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
index 28422ce..5e7b337 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
@@ -1,11 +1,19 @@
package com.ltkj.web.controller.callback;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.mapper.TjProjectMapper;
import com.ltkj.hosp.mapper.TjSamplingMapper;
import com.ltkj.hosp.service.*;
+import com.ltkj.system.service.ISysConfigService;
+import com.ltkj.web.wxUtils.HttpClientUtils;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -13,8 +21,10 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 瀵规帴鍏朵粬骞冲彴鎻愪緵鐨勫洖璋冩湇鍔�
@@ -43,7 +53,8 @@
private ITjCustomerService tjCustomerService;
@Autowired
private ITjOrderService orderService;
-
+ @Autowired
+ private TjProjectMapper tjProjectMapper;
/**
* 鏀堕��璐瑰洖璋冩帴鍙�
* @param params
@@ -64,8 +75,29 @@
LambdaQueryWrapper<TjFlowingWater> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjFlowingWater::getHisWaterId, feiYongId);
TjFlowingWater water = tjFlowingWaterService.getOne(wrapper);
- water.setPayStasus(1L);
- tjFlowingWaterService.updateById(water);
+ if(null !=water){
+ water.setPayStasus(1L);
+ if (tjFlowingWaterService.updateById(water)) {
+ String jxbz = water.getJxbz();
+ if(StringUtil.isNotBlank(jxbz)){
+ tjOrderDetailService.updateTjOrderDetailsFlowingWaterIdByJxbz(water.getOrderId().toString(),jxbz,water.getTjSerialNumber().toString());
+ remarkService.updateTjOrderRemarkSfbzByJxbz(water.getOrderId().toString(),jxbz,water.getTjSerialNumber().toString());
+// LambdaUpdateWrapper<TjSampling> wrapper1 = new LambdaUpdateWrapper<>();
+// wrapper1.eq(TjSampling::getJxbz,jxbz);
+// wrapper1.set(TjSampling::getIsPay,1);
+// tjSamplingService.update(wrapper1);
+ }else {
+ tjOrderDetailService.updateTjOrderDetailsFlowingWaterIdByJxbzisnull(water.getOrderId().toString(),water.getTjSerialNumber().toString());
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(water.getOrderId().toString(),water.getTjSerialNumber().toString());
+// LambdaUpdateWrapper<TjSampling> wrapper1 = new LambdaUpdateWrapper<>();
+// wrapper1.isNull(TjSampling::getJxbz);
+// wrapper1.set(TjSampling::getIsPay,1);
+// tjSamplingService.update(wrapper1);
+ }
+ }
+ }else {
+ return AjaxResult.error("鏌ヤ笉鍒版祦姘村彿: "+feiYongId);
+ }
}else {
LambdaQueryWrapper<TjFlowingWater> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjFlowingWater::getHisTfWaterId, feiYongId).or().eq(TjFlowingWater::getHisWaterId, feiYongId);
@@ -74,6 +106,7 @@
if (order != null){
// 閫�璐�
String bldh = water.getJxbz();
+ //TODO 鏄惁鍙戦�佷綔搴熺敵璇�
if (bldh != null){
remarkService.deleteTjOrderDetailByjxbz(bldh);
tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
@@ -99,6 +132,11 @@
return AjaxResult.success();
}
+ /**
+ * 鑾峰彇鎵�鏈夌殑His瀛楀吀闆嗗悎
+ * @param params
+ * @return
+ */
@PostMapping("getZdList")
public AjaxResult getZdList(@RequestBody Map<String ,Object> params){
String hosp = params.get("hosp").toString();
@@ -108,4 +146,29 @@
return AjaxResult.success(list);
}
+ /**
+ * 鑾峰彇鎵�鏈夌殑妫�楠岄」鐩�
+ * @param params
+ * @return
+ */
+ @PostMapping("getLisXmList")
+ public AjaxResult getLisXmList(@RequestBody Map<String ,Object> params){
+ List<Map<String, Object>> list = tjProjectMapper.getLisViewList();
+ return AjaxResult.success(list);
+ }
+
+ /**
+ * Lis纭鎾ら攢鍥炶皟
+ * @param params
+ * @return
+ */
+ @PostMapping("lisRevoke")
+ public AjaxResult lisRevoke(@RequestBody Map<String ,Object> params){
+ List<String> keys = (List<String>) params.get("keys");
+ String czy = params.get("czy").toString();
+ String hospid = params.get("hospid").toString();
+
+ return AjaxResult.success();
+ }
+
}
--
Gitblit v1.8.0