From ba5bd31ecf829d2b462bd3f62b566828b347a89a Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 08 四月 2025 13:36:18 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductPartServiceImpl.java | 136 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 129 insertions(+), 7 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductPartServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductPartServiceImpl.java
index 5ecfb88..9162805 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductPartServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductPartServiceImpl.java
@@ -1,10 +1,15 @@
package com.ruoyi.basic.service.impl;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.dto.ProductPartDto;
+import com.ruoyi.basic.mapper.ProductPartLogMapper;
+import com.ruoyi.basic.pojo.ProductPartLog;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.basic.mapper.ProductPartMapper;
@@ -12,22 +17,29 @@
import com.ruoyi.basic.pojo.ProductPart;
import com.ruoyi.basic.pojo.StructureTestObjectPart;
import com.ruoyi.basic.service.ProductPartService;
+import com.ruoyi.common.utils.SecurityUtils;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
@Transactional
@Service
@AllArgsConstructor
public class ProductPartServiceImpl extends ServiceImpl<ProductPartMapper, ProductPart> implements ProductPartService {
- private ProductPartMapper productPartMapper;
+ private ProductPartMapper productPartMapper;
private StructureTestObjectPartMapper structureTestObjectPartMapper;
+
+ private ProductPartLogMapper productPartLogMapper;
@Override
- public IPage<ProductPart> selectByProductId(IPage<ProductPart> page,ProductPart productPart) {
- return productPartMapper.selectListByProductId(page, QueryWrappers.queryWrappers(productPart),productPart.getProductId());
+ public IPage<ProductPart> selectByProductId(IPage<ProductPart> page, ProductPart productPart) {
+ return productPartMapper.selectListByProductId(page, QueryWrappers.queryWrappers(productPart), productPart.getProductId());
}
@Override
@@ -36,20 +48,130 @@
throw new BaseException("缂哄皯浜у搧瀵硅薄id");
}
this.isPartNoExist(productPart.getPartNo(), productPart.getProductId(), null);
+ productPart.setReview("寰呭鏍�");
productPartMapper.insert(productPart);
}
@Override
- public void updateProductPartById(ProductPart productPart) {
- this.isPartNoExist(productPart.getPartNo(), productPart.getProductId(), productPart.getId());
+ public int updateProductPartById(ProductPart productPart) {
if (productPart.getProductId() == null) {
throw new BaseException("缂哄皯浜у搧瀵硅薄id");
}
- productPartMapper.updateById(productPart);
+// this.isPartNoExist(productPart.getPartNo(), productPart.getProductId(), null);
+ if (!"宸插鏍�".equals(productPart.getReview())) {
+ productPart.setReview("寰呭鏍�");
+ }
+ return productPartMapper.updateById(productPart);
+ }
+
+ @Override
+ public List<Map<String, Object>> inspectionItems(String sample, String productName) {
+ // 浼樺厛澶勭悊涓や釜鍙傛暟鍧囬潪绌虹殑鍦烘櫙
+ if (StringUtils.isNotEmpty(productName) && StringUtils.isNotEmpty(sample)) {
+ //鍏堝樊浜у搧锛屾湁杩囨湁鍊肩洿鎺ヨ繑鍥烇紝娌″�煎啀鏌ュぇ绫�
+ List<Map<String, Object>> result = productPartMapper.inspectionItems(productName);
+ return result.isEmpty() ? productPartMapper.inspectionItems(sample) : result;
+ }
+
+ // 鍏朵粬鎯呭喌鐩存帴閫夊彇鏈夋晥鍙傛暟锛堜紭鍏坧roductName锛夋垨绌哄瓧绗︿覆
+ String param = StringUtils.isNotEmpty(productName) ? productName :
+ StringUtils.isNotEmpty(sample) ? sample : "";
+ return productPartMapper.inspectionItems(param);
+
+ }
+
+ @Override
+ public int productPartReviewById(ProductPartDto productPartDto) {
+ int userId = SecurityUtils.getUserId().intValue();
+ String username = SecurityUtils.getUsername();
+
+ // 瀹氫箟閫氱敤鐨勪骇鍝侀儴鍒嗗璞�
+ Object productPart = null;
+ if ("瀵硅薄".equals(productPartDto.getType())) {
+ productPart = structureTestObjectPartMapper.selectById(productPartDto.getId());
+ if (productPart != null && ((StructureTestObjectPart) productPart).getTestObjectId() == null) {
+ throw new BaseException("缂哄皯浜у搧瀵硅薄id");
+ }
+ } else {
+ productPart = productPartMapper.selectById(productPartDto.getId());
+ if (productPart != null && ((ProductPart) productPart).getProductId() == null) {
+ throw new BaseException("缂哄皯浜у搧瀵硅薄id");
+ }
+ }
+
+ if (productPart == null) {
+ return 0;
+ }
+
+ // 璁剧疆瀹℃牳鐘舵��
+ if (productPart instanceof StructureTestObjectPart) {
+ ((StructureTestObjectPart) productPart).setReview("宸插鏍�");
+ } else {
+ ((ProductPart) productPart).setReview("宸插鏍�");
+ }
+
+ // 鏇存柊浜у搧閮ㄥ垎淇℃伅
+ int num = 0;
+ if (productPart instanceof StructureTestObjectPart) {
+ num = structureTestObjectPartMapper.updateById((StructureTestObjectPart) productPart);
+ } else {
+ num = productPartMapper.updateById((ProductPart) productPart);
+ }
+
+ // 濡傛灉鏇存柊鎴愬姛锛屽垱寤烘垨鏇存柊鏃ュ織
+ if (num > 0) {
+ createOrUpdateProductPartLog(productPart, username, userId, productPartDto.getType(), productPartDto);
+ }
+
+ return num;
+ }
+
+ private void createOrUpdateProductPartLog(Object productPart, String username, int userId, String type, ProductPartDto productPartDto) {
+ ProductPartLog productPartLog = new ProductPartLog();
+ if (productPart instanceof StructureTestObjectPart) {
+ StructureTestObjectPart part = (StructureTestObjectPart) productPart;
+ productPartLog.setProductPartId(part.getId());
+ productPartLog.setColor(part.getColor());
+ productPartLog.setColorCode(part.getColorCode());
+ productPartLog.setPartNo(part.getPartNo());
+ productPartLog.setInspectionItem(part.getInspectionItem());
+ productPartLog.setReview(part.getReview());
+ } else {
+ ProductPart part = (ProductPart) productPart;
+ productPartLog.setProductPartId(part.getId());
+ productPartLog.setColor(part.getColor());
+ productPartLog.setColorCode(part.getColorCode());
+ productPartLog.setPartNo(part.getPartNo());
+ productPartLog.setInspectionItem(part.getInspectionItem());
+ productPartLog.setReview(part.getReview());
+ }
+ productPartLog.setOperName(username);
+ productPartLog.setOperId(userId);
+ productPartLog.setOperTime(LocalDateTime.now());
+ productPartLog.setType(type);
+
+ // 妫�鏌ユ槸鍚﹀瓨鍦ㄧ浉鍚� ProductPartId 鐨勬棩蹇楄褰�
+ ProductPartLog existingLog = productPartLogMapper.selectOne(new LambdaQueryWrapper<ProductPartLog>().eq(ProductPartLog::getProductPartId, productPartDto.getId()));
+ if (existingLog != null) {
+ // 濡傛灉瀛樺湪锛屾洿鏂拌褰�
+ productPartLog.setId(existingLog.getId()); // 璁剧疆鏇存柊璁板綍鐨� ID
+ productPartLogMapper.updateById(productPartLog);
+ } else {
+ // 濡傛灉涓嶅瓨鍦紝鎻掑叆鏂拌褰�
+ productPartLogMapper.insert(productPartLog);
+ }
+ }
+
+
+ @Override
+ public IPage<ProductPartLog> productPartLogList(Page page, Integer id, String type) {
+ return productPartLogMapper.selectPage(page, Wrappers.<ProductPartLog>lambdaQuery()
+ .eq(ProductPartLog::getProductPartId, id)
+ .eq(ProductPartLog::getType, type));
}
// 鍒ゆ柇闆朵欢鍙锋槸鍚﹀瓨鍦�
- public void isPartNoExist(String partNo,Integer productId, Integer id) {
+ public void isPartNoExist(String partNo, Integer productId, Integer id) {
// 闆朵欢鍙峰敮涓� 浣嗕笉蹇呭～
if (StringUtils.isNotBlank(partNo)) {
Long count = productPartMapper.selectCount(new LambdaQueryWrapper<ProductPart>()
--
Gitblit v1.9.3