From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 162 insertions(+), 2 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
index 0c116d2..87be36d 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
@@ -1,17 +1,28 @@
package com.ltkj.hosp.service.impl;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
+import java.util.Map;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.utils.DateUtils;
import com.ltkj.hosp.domain.TjProject;
+import com.ltkj.hosp.vo.ProFcListVo;
+import com.ltkj.hosp.vodomain.ShenGaoTiZhongVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ltkj.hosp.mapper.TjOrderDetailMapper;
import com.ltkj.hosp.domain.TjOrderDetail;
import com.ltkj.hosp.service.ITjOrderDetailService;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
/**
* 浣撴椤圭洰鏄庣粏Service涓氬姟灞傚鐞�
@@ -94,13 +105,38 @@
}
@Override
+ public int deleteTjOrderDetailByOrderId(String orderId) {
+ return tjOrderDetailMapper.deleteTjOrderDetailByOrderId(orderId);
+ }
+
+ @Override
public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNotNull(String orderId) {
return tjOrderDetailMapper.selectTjOrderDetailListByFlowingWaterIdIsNotNull(orderId);
}
@Override
+ public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNotNullN(String orderId,String jxbz) {
+ return tjOrderDetailMapper.selectTjOrderDetailListByFlowingWaterIdIsNotNullN(orderId,jxbz);
+ }
+
+ @Override
+ public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNotNullAndJxbzIsNull(String orderId) {
+ return tjOrderDetailMapper.selectTjOrderDetailListByFlowingWaterIdIsNotNullAndJxbzIsNull(orderId);
+ }
+
+ @Override
public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNull(String orderId) {
return tjOrderDetailMapper.selectTjOrderDetailListByFlowingWaterIdIsNull(orderId);
+ }
+
+ @Override
+ public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNullAndJxbzIsNull(String orderId) {
+ return tjOrderDetailMapper.selectTjOrderDetailListByFlowingWaterIdIsNullAndJxbzIsNull(orderId);
+ }
+
+ @Override
+ public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNullN(String orderId, String jxbz) {
+ return tjOrderDetailMapper.selectTjOrderDetailListByFlowingWaterIdIsNullN(orderId,jxbz);
}
@Override
@@ -134,8 +170,19 @@
}
@Override
- public boolean saveTjOrderDetailsByCusId(String cusId,String orderId, String userName, String userId) {
- return tjOrderDetailMapper.saveTjOrderDetailsByCusId(cusId,orderId,userName,userId);
+ public boolean saveTjOrderDetailsByCusId(String cusId,String orderId, String userName, String userId,String cardId) {
+ return tjOrderDetailMapper.saveTjOrderDetailsByCusId(cusId,orderId,userName,userId,cardId);
+ }
+
+ @Override
+ public boolean saveJSYTjOrderDetailsByCusId(String cusId, String orderId, String userName, String userId,String cardId,String sl) {
+ return tjOrderDetailMapper.saveJSYTjOrderDetailsByCusId(cusId,orderId,userName,userId,cardId,sl);
+ }
+
+ @Override
+ public boolean saveTjPureToneTesByCusId(String cusId, String tjNum, String userName, String userId,String cardId) {
+
+ return tjOrderDetailMapper.saveTjPureToneTesByCusId(cusId,tjNum,userName,userId,cardId);
}
@Override
@@ -143,4 +190,117 @@
return tjOrderDetailMapper.updateTjOrderDetailsByOrderId(orderId,userName,userId,ls);
}
+ @Override
+ public List<TjOrderDetail> getDetailByOrderIdAndParId(Long orderId, Long proParentId) {
+ return tjOrderDetailMapper.getDetailByOrderIdAndParId(orderId,proParentId);
+ }
+
+ @Override
+ public List<TjOrderDetail> getDetailByOrderIdAndParIds(Long orderId, List<Long> proParentIds) {
+ return tjOrderDetailMapper.getDetailByOrderIdAndParIds(orderId,proParentIds);
+ }
+
+ @Override
+ public List<TjOrderDetail> addHuaYanTable(String tjnumber) {
+ return tjOrderDetailMapper.addHuaYanTable(tjnumber);
+ }
+
+ @Override
+ public List<TjOrderDetail> addHuaYanAndCgTable(String tjnumber) {
+ return tjOrderDetailMapper.addHuaYanAndCgTable(tjnumber);
+ }
+
+ @Override
+ public void deleteTjOrderDetailByjxbz(String jxbz) {
+ tjOrderDetailMapper.deleteTjOrderDetailByjxbz(jxbz);
+ }
+
+ @Override
+ public List<ShenGaoTiZhongVo> getShenGaoTiZhongList(String tjNum) {
+ return tjOrderDetailMapper.getShenGaoTiZhongList(tjNum);
+ }
+
+ @Override
+ public List<TjOrderDetail> getCaiYangDengJi(Long orderId) {
+ return tjOrderDetailMapper.getCaiYangDengJi(orderId);
+ }
+
+ @Override
+ public List<TjOrderDetail> getCaiYangDengJiJxbz(Long orderId, String jxbz) {
+ return tjOrderDetailMapper.getCaiYangDengJiJxbz(orderId,jxbz);
+ }
+
+ @Override
+ public List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu(int num, String tjNumber) {
+ return tjOrderDetailMapper.getzongjianyishengchakanyichangxiangmu(tjNumber);
+ }
+
+
+
+ @Override
+ public List<TjOrderDetail> getzongjianyishengchakanyichangxiangmu(String tjNumber) {
+ return tjOrderDetailMapper.getzongjianyishengchakanyichangxiangmu(tjNumber);
+ }
+
+
+ @Override
+ public void updateTjOrderDetailsFlowingWaterIdByJxbz(String orderId, String jxbz,String ls) {
+ tjOrderDetailMapper.updateTjOrderDetailsFlowingWaterIdByJxbz(orderId,jxbz,ls);
+ }
+
+ @Override
+ public void updateTjOrderDetailsFlowingWaterIdByJxbzisnull(String orderId,String ls) {
+ tjOrderDetailMapper.updateTjOrderDetailsFlowingWaterIdByJxbzisnull(orderId,ls);
+ }
+
+ @Override
+ public List<ProFcListVo> getFcList(Long orderId, Integer type) {
+ return tjOrderDetailMapper.getFcList(orderId,type);
+ }
+
+ @Transactional
+ @Override
+ public AjaxResult updFcPro(String json) {
+ try {
+ JSONObject entries = JSONUtil.parseObj(json);
+ System.out.println(JSONUtil.toJsonStr(entries));
+ String orderId = entries.getStr("orderId");
+ JSONArray array = entries.getJSONArray("data");
+ ArrayList<String> fcList = new ArrayList<>();
+ ArrayList<String> notFcList = new ArrayList<>();
+ for (Object o : array) {
+ JSONObject object = (JSONObject) o;
+ String proId = object.getStr("proId");
+ Integer type = object.getInt("type");
+ if (type == 1) {
+ fcList.add(proId);
+ } else {
+ notFcList.add(proId);
+ }
+ }
+// System.out.println("fcList = " + fcList);
+// System.out.println("notFcList = " + notFcList);
+// if (true)
+// return AjaxResult.error();
+ if (!fcList.isEmpty()){
+ LambdaUpdateWrapper<TjOrderDetail> wrapper = new LambdaUpdateWrapper<>();
+ wrapper.set(TjOrderDetail::getIsReturn,1);
+ wrapper.eq(TjOrderDetail::getOrderId,orderId);
+ wrapper.in(TjOrderDetail::getProId,fcList);
+ update(wrapper);
+ }
+ if (!notFcList.isEmpty()){
+ LambdaUpdateWrapper<TjOrderDetail> wrapper = new LambdaUpdateWrapper<>();
+ wrapper.set(TjOrderDetail::getIsReturn,0);
+ wrapper.eq(TjOrderDetail::getOrderId,orderId);
+ wrapper.in(TjOrderDetail::getProId,notFcList);
+ update(wrapper);
+ }
+ }catch (Exception e){
+ log.error(String.valueOf(e)+e.getMessage());
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error();
+ }
+ return AjaxResult.success();
+ }
}
--
Gitblit v1.8.0