From 7cfb3068b1d2ff6ac549bb6775ce2be0e0d6ec49 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 08 十二月 2023 16:30:29 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java | 60 ++++++++++++++++++++++--------------------------------------
1 files changed, 22 insertions(+), 38 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java
index 8cc5af7..3a2244c 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java
@@ -82,39 +82,26 @@
}
public Boolean save(ConfigItemChangeDto configItemDto) {
- Long warehouseId = configItemDto.getConfigItemChange().getId();
- if (warehouseId != null)
+ Long changeId = configItemDto.getConfigItemChange().getId();
+ if (changeId != null)
baseDao.updateById(configItemDto.getConfigItemChange());
else {
Map<String, String> map = new HashMap<>();
- map.put("funCode", "config_item_warehouse");
+ map.put("funCode", "config_item_change");
map.put("projectId", configItemDto.getProjectId().toString());
configItemDto.getConfigItemChange().setProjectId(configItemDto.getProjectId());
configItemDto.getConfigItemChange().setCode(sysCodeRuleService.getNewCode(map));
baseDao.insert(configItemDto.getConfigItemChange());
- warehouseId = configItemDto.getConfigItemChange().getId();
+ changeId = configItemDto.getConfigItemChange().getId();
}
- for (WarehouseConfigItem configItem : configItemDto.getConfigItemList()) {
- configItem.setWarehouseId(warehouseId);
+ for (WarehouseConfigItem configItem : configItemDto.getConfigChangeList()) {
+ configItem.setWarehouseId(changeId);
if (configItem.getId() != null) {
- if (configItem.getCheckId()!=null){
- String code ="719CTC-09-ST";
- String projectCode = configItemDto.getProject().getCode();
- if (configItem.getItemName().equals("杞欢娴嬭瘯璁″垝")){
- code=code+"P";
- }else if (configItem.getItemName().equals("杞欢娴嬭瘯璇存槑")){
- code=code+"D";
- }else if (configItem.getItemName().equals("杞欢娴嬭瘯璁板綍")){
- code=code+"L";
- }else if (configItem.getItemName().equals("杞欢娴嬭瘯鎶ュ憡")){
- code=code+"R";
- }
- configItem.setItemIdentify(code+"-"+projectCode);
- }
configItemService.update(configItem);
} else {
- configItem.setWarehouseId(warehouseId);
+ configItem.setWarehouseId(changeId);
+ configItem.setProjectId(configItemDto.getConfigItemChange().getProjectId());
configItemService.insert(configItem);
}
Long checkId = configItem.getCheckId();
@@ -130,21 +117,21 @@
}
for (WarehouseCmAudit cmAudit : configItemDto.getCmAuditList()) {
- cmAudit.setWarehouseId(warehouseId);
+ cmAudit.setWarehouseId(changeId);
if (cmAudit.getId() != null) {
cmAuditService.update(cmAudit);
} else {
- cmAudit.setWarehouseId(warehouseId);
+ cmAudit.setWarehouseId(changeId);
cmAuditService.insert(cmAudit);
}
}
for (WarehouseQaAudit qaAudit : configItemDto.getQaAuditList()) {
- qaAudit.setWarehouseId(warehouseId);
+ qaAudit.setWarehouseId(changeId);
if (qaAudit.getId() != null) {
qaAuditService.update(qaAudit);
} else {
- qaAudit.setWarehouseId(warehouseId);
+ qaAudit.setWarehouseId(changeId);
qaAuditService.insert(qaAudit);
}
}
@@ -161,35 +148,32 @@
return true;
}
- public ConfigItemChangeDto getDto(Long projectId, Long warehouseId) {
+ public ConfigItemChangeDto getDto(Long projectId, Long changeId) {
ConfigItemChangeDto data = new ConfigItemChangeDto();
- if (warehouseId != null) {
- data.setId(warehouseId);
- ConfigItemChange configItemChange = this.get(warehouseId);
+ if (changeId != null) {
+ data.setId(changeId);
+ ConfigItemChange configItemChange = this.get(changeId);
data.setConfigItemChange(configItemChange);
if (projectId == null) {
projectId = configItemChange.getProjectId();
}
- List<WarehouseCmAudit> CmAuditList = cmAuditService.getList(warehouseId);
+ List<WarehouseCmAudit> CmAuditList = cmAuditService.getList(changeId);
data.setCmAuditList(CmAuditList);
- List<WarehouseQaAudit> QaAuditList = qaAuditService.getList(warehouseId);
+ List<WarehouseQaAudit> QaAuditList = qaAuditService.getList(changeId);
data.setQaAuditList(QaAuditList);
- List<WarehouseConfigItem> ConfigItemList = configItemService.getList(warehouseId);
- data.setConfigItemList(ConfigItemList);
+ List<WarehouseConfigItem> configChangeList = configItemService.getList(changeId);
+ data.setConfigChangeList(configChangeList);
} else {
ConfigItemChange configItemChange = new ConfigItemChange();
data.setConfigItemChange(configItemChange);
- List<?> cmList = baseDao.itemList("warehouse_cm_audit");
+ List<?> cmList = baseDao.itemList("change_cm_audit");
List<?> CmAuditList = cmList;
data.setCmAuditList((List<WarehouseCmAudit>) CmAuditList);
- List<?> qaList = baseDao.itemList("warehouse_qa_audit");
+ List<?> qaList = baseDao.itemList("change_qa_audit");
List<?> QaAuditList = qaList;
data.setQaAuditList((List<WarehouseQaAudit>) QaAuditList);
- List<?> resultList = configItemService.ConfigItemList(projectId);
- List<?> ConfigItemList = resultList;
- data.setConfigItemList((List<WarehouseConfigItem>) ConfigItemList);
}
if (projectId != null) {
--
Gitblit v1.9.1