Merge remote-tracking branch 'origin/master'

zhaowenxuan

2025-03-21 b7f0fb8eda40b6761b35a37f72eb5e8a3c836bed

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java

@@ -25,7 +25,9 @@
import com.ltkj.common.core.text.Convert;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.common.utils.bean.BeanUtils;
import com.ltkj.db.DataSourceContextHolder;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
@@ -1382,6 +1384,8 @@
//                        }
//                    }
//                }
                logger.info("接口 DataSourceContextHolder ->{}", DataSourceContextHolder.getDataSourceKey());
                logger.info("接口 DynamicDataSourceContextHolder ->{}", DynamicDataSourceContextHolder.getDataSourceType());
                asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order,orderRemark);
                LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
                qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
@@ -1409,8 +1413,8 @@
                    one.setType(1);
                    remarkService.updateById(one);
                }
                asyncService.updateCheckType(orderRemark.getTjNumber());
                asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(), null, String.valueOf(orderRemark.getProId()));
//                asyncService.updateCheckType(orderRemark.getTjNumber());
//                asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(), null, String.valueOf(orderRemark.getProId()));
                return AjaxResult.success("操作成功");
            }
//            asyncService.updateCheckType(orderRemark.getTjNumber());