From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
jnpf-lims/jnpf-lims-biz/src/main/java/jnpf/limsService/impl/LimsSxtQingyanXiangmuServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/jnpf-lims/jnpf-lims-biz/src/main/java/jnpf/limsService/impl/LimsSxtQingyanXiangmuServiceImpl.java b/jnpf-lims/jnpf-lims-biz/src/main/java/jnpf/limsService/impl/LimsSxtQingyanXiangmuServiceImpl.java
new file mode 100644
index 0000000..23878ba
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-biz/src/main/java/jnpf/limsService/impl/LimsSxtQingyanXiangmuServiceImpl.java
@@ -0,0 +1,58 @@
+package jnpf.limsService.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import jnpf.limsEntity.LimsSxtQingyanXiangmuParam;
+import jnpf.limsEntity.ZhiliangBiaozhunGuanliEntity;
+import jnpf.limsEntity.ZhiliangBiaozhunGuanliZixiangEntity;
+import jnpf.limsMapper.LimsSxtQuyangdianMapper;
+import jnpf.limsMapper.ZhiliangBiaozhunGuanliMapper;
+import jnpf.limsModel.LimsSxtQuyangdianVO;
+import jnpf.limsService.LimsSxtQingyanXiangmuService;
+import jnpf.limsService.ZhiliangBiaozhunGuanliZixiangService;
+import jnpf.util.R;
+import jnpf.util.StringUtil;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Service
+public class LimsSxtQingyanXiangmuServiceImpl implements LimsSxtQingyanXiangmuService {
+
+ @Autowired
+ private ZhiliangBiaozhunGuanliMapper biaozhunGuanliMapper;
+ @Autowired
+ private ZhiliangBiaozhunGuanliZixiangService zixiangService;
+ @Autowired
+ private LimsSxtQuyangdianMapper quyangdianMapper;
+
+ @Override
+ public R<List<ZhiliangBiaozhunGuanliZixiangEntity>> getJianyanXiangmuList(LimsSxtQingyanXiangmuParam param) {
+ QueryWrapper<ZhiliangBiaozhunGuanliEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("yangpin_id", param.getYangpinLeixing());
+ wrapper.eq("biaozhun_bianhao", param.getZhiliangBiaozhun());
+ wrapper.eq("biz_enabled", "enabled");
+ wrapper.orderByDesc("f_id");
+ wrapper.last("LIMIT 1");
+ ZhiliangBiaozhunGuanliEntity biaozhun = biaozhunGuanliMapper.selectOne(wrapper);
+
+ return R.success(zixiangService.listByForeignId(biaozhun.getId()));
+ }
+
+ @Override
+ public R<List<LimsSxtQuyangdianVO>> getJihuaQuyangdian(String leixing, String chejian) {
+ List<String> chejianList = new ArrayList<>();
+ if (StringUtil.isNotEmpty(chejian)) {
+ chejianList = Arrays.asList(chejian.split(","));
+ }
+ if (CollectionUtils.isEmpty(chejianList)) {
+ return R.error("杞﹂棿涓嶈兘涓虹┖锝�");
+ }
+ List<LimsSxtQuyangdianVO> data = quyangdianMapper.selectByLeixingAndChejian(leixing, chejianList);
+
+ return R.success(data);
+ }
+}
--
Gitblit v1.8.0