From 0a305b633bb743f01cbb636670c2fc02620168d0 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 01 四月 2025 15:06:24 +0800
Subject: [PATCH] 标准库功能修改备份开发
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java | 122 ++++++++++++++++++++++++++++++++++------
1 files changed, 103 insertions(+), 19 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
index e0a265f..55ade8f 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
@@ -7,16 +7,17 @@
import com.baomidou.mybatisplus.core.toolkit.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.dto.*;
+import com.ruoyi.basic.enums.BasicTreeEnums;
+import com.ruoyi.basic.enums.StandardProductListChcekTypeEnums;
+import com.ruoyi.basic.enums.StandardProductListOperationTypeEnums;
import com.ruoyi.basic.mapper.*;
import com.ruoyi.basic.pojo.*;
import com.ruoyi.basic.service.StandardMethodListService;
import com.ruoyi.basic.service.StandardMethodService;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.basic.dto.CopyStandardProductListDto;
-import com.ruoyi.basic.dto.InsSampleReceiveDto;
-import com.ruoyi.basic.dto.ProductDto;
-import com.ruoyi.basic.dto.ResetTreeDragDTO;
import com.ruoyi.basic.service.StandardProductListService;
import lombok.AllArgsConstructor;
import org.apache.catalina.security.SecurityUtil;
@@ -59,9 +60,36 @@
@Autowired
private StructureItemParameterMapper structureItemParameterMapper;
+ @Autowired
+ private ModelMapper modelMapper;
+
+ @Autowired
+ private StandardProductListBackupRelMapper standardProductListBackupRelMapper;
+
+ @Autowired
+ private StandardProductListUpdateRecordMapper standardProductListUpdateRecordMapper;
+
@Override
public int upStandardProductList(StandardProductList list) {
+ // 鏍规嵁id 鏌ヨ鍒板師濮嬪��
+ StandardProductList standardProductList = standardProductListMapper.selectById(list.getId());
+ if(ObjectUtils.isEmpty(standardProductList)){
+ throw new RuntimeException("鏇存柊澶辫触,鏈煡鎵惧埌妫�鏌ラ」");
+ }
+ // 鍒ゆ柇褰撳墠鐘舵�� 濡傛灉鏄鏍镐腑
+ if(StandardProductListChcekTypeEnums.CHECK_ING.getCode().equals(list.getCheckStatus())){
+ throw new RuntimeException("瀹℃牳涓笉鏀寔淇敼");
+ }
+ // 鏌ヨ鏈�鏂扮殑涓�娆″叧鑱斿浠� 濡傛灉瀛樺湪璇存槑鏈鏍稿畬缁х画淇敼浜嗐�備笉鍋氭暟鎹鐞嗐��
+ StandardProductListBackupRel standardProductListBackupRel = standardProductListBackupRelMapper.selectById(list.getId());
+ if(ObjectUtils.isEmpty(standardProductListBackupRel)){
+ StandardProductListBackupRel productListBackupRel = new StandardProductListBackupRel();
+ BeanUtils.copyProperties(standardProductList, productListBackupRel);
+ standardProductListBackupRelMapper.insert(productListBackupRel);
+ }
+ // 淇敼鐘舵��
+ list.setCheckStatus(StandardProductListChcekTypeEnums.WAIT_CHECK.getCode());
return standardProductListMapper.updateById(list);
}
@@ -290,6 +318,7 @@
String sampleType = "";
String sample = "";
String model = "";
+ StringBuilder checkItemQueryTree = new StringBuilder(); // 妫�鏌ラ」鏌ヨ 鍙嫾鎺� 妫�鏌ュ璞�-浜у搧
// 杩斿洖缁撴灉
Map<String, Object> map = new HashMap<>();
@@ -303,57 +332,60 @@
if(trees == null && trees.length < 4){
return map;
}
- StringBuilder queryTreeBuilder = new StringBuilder();
// 杞﹂棿灞傜骇澶氫竴灞傜骇
if(existWorkShopFlag){
switch (trees.length) {
case 7:
- queryTreeBuilder.append("[").append("\"").append(trees[4]).append("\",\"").append(trees[5]).append("\",\"").append(trees[6]).append("\"").append("]");
sampleType = trees[4];
sample = trees[5];
model = trees[6];
+ checkItemQueryTree.append("[").append("\"").append(trees[4]).append("\",\"").append(trees[5]).append("\"").append("]");
break;
case 6:
- queryTreeBuilder.append("[").append("\"").append(trees[4]).append("\",\"").append(trees[5]).append("\"").append("]");
sampleType = trees[4];
sample = trees[5];
+ checkItemQueryTree.append("[").append("\"").append(trees[4]).append("\",\"").append(trees[5]).append("\"").append("]");
break;
case 5:
- queryTreeBuilder.append("[").append("\"").append(trees[4]).append("\"").append("]");
sampleType = trees[4];
+ checkItemQueryTree.append("[").append("\"").append(trees[4]).append("\"").append("]");
break;
}
}else {
switch (trees.length) {
case 6:
- queryTreeBuilder.append("[").append("\"").append(trees[3]).append("\",\"").append(trees[4]).append("\",\"").append(trees[5]).append("\"").append("]");
sampleType = trees[3];
sample = trees[4];
model = trees[5];
+ checkItemQueryTree.append("[").append("\"").append(trees[3]).append("\",\"").append(trees[4]).append("\"").append("]");
break;
case 5:
- queryTreeBuilder.append("[").append("\"").append(trees[3]).append("\",\"").append(trees[4]).append("\"").append("]");
sampleType = trees[3];
sample = trees[4];
+ checkItemQueryTree.append("[").append("\"").append(trees[3]).append("\",\"").append(trees[4]).append("\"").append("]");
break;
case 4:
- queryTreeBuilder.append("[").append("\"").append(trees[3]).append("\"").append("]");
sampleType = trees[3];
+ checkItemQueryTree.append("[").append("\"").append(trees[3]).append("\"").append("]");
break;
}
}
- if(StringUtils.isEmpty(queryTreeBuilder.toString())){
+ if(StringUtils.isEmpty(checkItemQueryTree.toString())){
return map;
}
- // 鏍规嵁妫�楠屽璞�/浜у搧/鍨嬪彿鏌ヨ妫�楠岄」
- List<StructureItemParameter> structureItemParameterList = structureItemParameterMapper.selectItemParameterBySample(queryTreeBuilder.toString());
+ // 鏍规嵁妫�楠屽璞�/浜у搧鏌ヨ妫�楠岄」
+ List<StructureItemParameter> structureItemParameterList = structureItemParameterMapper.selectItemParameterBySample(checkItemQueryTree.toString());
+ // 濡傛灉鏄骇鍝佺殑妫�鏌ラ」涓虹┖鍚戜笂鎺�
+ if(CollectionUtils.isEmpty(structureItemParameterList)){
+ String query = "[\"" + sampleType + "\"]";
+ structureItemParameterList = structureItemParameterMapper.selectItemParameterBySample(query);
+ }
// 鏌ヨ鏍囧噯搴撳凡缁戝畾妫�鏌ラ」鐩�
List<StandardProductList> standardProductList = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
.eq(StandardProductList::getStandardMethodListId, id)
.like(StandardProductList::getTree, tree)
.orderByAsc(StandardProductList::getSort));
-
// 灏佽鍙傛暟
List<StandardProductList> batchInsertStandardProductListArray = new ArrayList<>();
@@ -374,19 +406,18 @@
addStandProductList.setStructureItemParameterId(structureItemParameter.getId());
}
- addStandProductList.setId(null);
+ addStandProductList.setId(addStandProductList.getId() != null ? addStandProductList.getId() : IdWorker.getId());
batchInsertStandardProductListArray.add(addStandProductList);
}
-
// 鎺掑簭澶勭悊 宸叉湁椤哄簭鎸夌収鍘熼『搴� 娌℃湁椤哄簭鐨勬寜鐓ф楠岄」鐨刬d鍗囧簭锛岄粯璁ゆ帓鍦ㄦ渶鍚�
batchInsertStandardProductListArray.sort(Comparator.comparing((StandardProductList item) -> item.getSort() != null ? item.getSort() : Integer.MAX_VALUE)
.thenComparing(StandardProductList::getStructureItemParameterId));
// 鍒犻櫎鍘熺粦瀹氭暟鎹�
standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate()
- .eq(StandardProductList::getStandardMethodListId, id)
- .eq(StandardProductList::getTree, tree));
+ .eq(StandardProductList::getStandardMethodListId, id)
+ .eq(StandardProductList::getTree, tree));
for (int i = 0; i < batchInsertStandardProductListArray.size(); i++) {
StandardProductList productList = batchInsertStandardProductListArray.get(i);
@@ -611,6 +642,59 @@
this.updateBatchById(productLists);
return false;
}
+
+ /**
+ * 鏍囧噯鏍戜笅妫�楠岄」澶勭悊
+ * @param standardProductListDto
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void productListOperate(StandardProductListDto standardProductListDto) {
+ StandardProductList standardProductList = new StandardProductList();
+ standardProductList.setId(standardProductListDto.getId());
+ StandardProductListUpdateRecord standardProductListUpdateRecord = new StandardProductListUpdateRecord();
+ // 瀹℃牳閫氳繃
+ if(StandardProductListOperationTypeEnums.PASS_CHECK_OP.getCode().equals(standardProductListDto.getOperationStatus())){
+ // 鍒犻櫎澶囦唤鏁版嵁
+ standardProductListBackupRelMapper.deleteById(standardProductListDto.getId());
+ standardProductList.setCheckStatus(StandardProductListChcekTypeEnums.PASS_CHECK.getCode());
+ // 瀹℃牳涓嶉�氳繃
+ }else if(StandardProductListOperationTypeEnums.NO_PASS_CHECK_OP.getCode().equals(standardProductListDto.getOperationStatus())) {
+ // 杩樺師鏁版嵁
+ StandardProductListBackupRel standardProductListBackupRel = standardProductListBackupRelMapper.selectById(standardProductListDto.getId());
+ if(ObjectUtils.isEmpty(standardProductListBackupRel)){
+ throw new RuntimeException("澶囦唤鏁版嵁鏌ユ壘澶辫触");
+ }
+ BeanUtils.copyProperties(standardProductListBackupRel, standardProductList);
+ standardProductList.setCheckStatus(StandardProductListChcekTypeEnums.NO_PASS_CHECK.getCode());
+ // 鎻愪氦
+ }else if(StandardProductListOperationTypeEnums.SUBMIT_OP.getCode().equals(standardProductListDto.getOperationStatus())) {
+ standardProductListUpdateRecord.setOperationType(StandardProductListOperationTypeEnums.PASS_CHECK_OP.getCode());
+ standardProductList.setCheckStatus(StandardProductListChcekTypeEnums.CHECK_ING.getCode());
+ } else {
+ throw new RuntimeException("鎿嶄綔鏈夎");
+ }
+ // 鏂板鎿嶄綔璁板綍
+ standardProductListUpdateRecord.setStandardProductListId(standardProductListDto.getId());
+ standardProductListUpdateRecord.setOperationType(standardProductListDto.getOperationStatus());
+ standardProductListUpdateRecordMapper.insert(standardProductListUpdateRecord);
+ // 淇敼瀹℃牳鐘舵��
+ standardProductList.setCheckStatus(standardProductListDto.getOperationStatus());
+ standardProductListMapper.updateById(standardProductList);
+ }
+
+ /**
+ * 鏍囧噯鏍戜笅妫�楠岄」淇敼璁板綍鍒嗛〉鏌ヨ
+ * @param page
+ * @param record
+ * @return
+ */
+ @Override
+ public IPage<StandardProductListUpdateRecord> standardProductListRecordPage(Page page, StandardProductListUpdateRecord record) {
+ return standardProductListUpdateRecordMapper.standardProductListRecordPage(page,QueryWrappers.queryWrappers(record));
+ }
+
+
}
--
Gitblit v1.9.3