From 4f13ac2e50547847d4929bd20331ad688e08cf43 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 08 十二月 2023 09:27:37 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java | 129 +++++++++++++++++++++++++++++++------------
1 files changed, 93 insertions(+), 36 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
index fd355ae..70554ce 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java
@@ -11,14 +11,21 @@
import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder;
import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical;
import com.zt.life.modules.itemCirculatOrder.service.ItemCirculatOrderTechnicalService;
+import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
+import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
import com.zt.life.modules.project.service.ProjectService;
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
+import com.zt.life.modules.testCheckOrder.model.TestCheckOrder;
+import com.zt.life.modules.testCheckOrder.service.TestCheckOrderService;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import com.zt.modules.oss.service.SysOssService;
+import com.zt.modules.workflow.dto.FlowInfoDto;
+import com.zt.modules.workflow.service.WorkflowService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
+
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
@@ -28,11 +35,11 @@
/**
* config_item_warehouse
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-11-27
*/
@Service
-public class ConfigItemWarehouseService extends BaseService<ConfigItemWarehouseDao, ConfigItemWarehouse> {
+public class ConfigItemWarehouseService extends BaseService<ConfigItemWarehouseDao, ConfigItemWarehouse> {
@Autowired
private SysOssConfigService sysOssConfigService;
@@ -40,7 +47,7 @@
private SysOssService sysOssService;
@Autowired
- private TestAgencyInfoService testAgencyInfoService;
+ private WorkflowService workflowService;
@Autowired
private SysCodeRuleService sysCodeRuleService;
@@ -56,6 +63,9 @@
@Autowired
private WarehouseConfigItemService configItemService;
+
+ @Autowired
+ private TestCheckOrderService testCheckOrderService;
/**
* 鍒嗛〉鏌ヨ
@@ -76,39 +86,85 @@
super.deleteLogic(ids);
}
- /* public Boolean save(ItemCirculatOrderDto itemCirculatOrderDto) {
- Long circulatOrderid = itemCirculatOrderDto.getCirculatOrder().getId();
- if (circulatOrderid != null)
- baseDao.updateById(itemCirculatOrderDto.getCirculatOrder());
+ public Boolean save(ConfigItemWarehouseDto configItemDto) {
+ Long warehouseId = configItemDto.getConfigItemWarehouse().getId();
+ if (warehouseId != null)
+ baseDao.updateById(configItemDto.getConfigItemWarehouse());
else {
Map<String, String> map = new HashMap<>();
- map.put("funCode", "item_circulat_order");
- map.put("projectId",itemCirculatOrderDto.getProjectId().toString());
- itemCirculatOrderDto.getCirculatOrder().setProjectId(itemCirculatOrderDto.getProjectId());
- itemCirculatOrderDto.getCirculatOrder().setCode(sysCodeRuleService.getNewCode(map));
- baseDao.insert(itemCirculatOrderDto.getCirculatOrder());
- circulatOrderid = itemCirculatOrderDto.getCirculatOrder().getId();
+ map.put("funCode", "config_item_warehouse");
+ map.put("projectId", configItemDto.getProjectId().toString());
+ configItemDto.getConfigItemWarehouse().setProjectId(configItemDto.getProjectId());
+ configItemDto.getConfigItemWarehouse().setCode(sysCodeRuleService.getNewCode(map));
+ baseDao.insert(configItemDto.getConfigItemWarehouse());
+ warehouseId = configItemDto.getConfigItemWarehouse().getId();
}
- for (ItemCirculatOrderTechnical circulatOrderTechnical : itemCirculatOrderDto.getTechnicalList()) {
- circulatOrderTechnical.setCirculatOrderId(circulatOrderid);
- if (circulatOrderTechnical.getId() != null) {
- technicalService.update(circulatOrderTechnical);
+ for (WarehouseConfigItem configItem : configItemDto.getConfigItemList()) {
+ configItem.setWarehouseId(warehouseId);
+ 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+"H";
+ }else if (configItem.getItemName().equals("杞欢娴嬭瘯鎶ュ憡")){
+ code=code+"R";
+ }
+ configItem.setItemIdentify(code+"-"+projectCode);
+ }
+ configItemService.update(configItem);
} else {
- circulatOrderTechnical.setCirculatOrderId(circulatOrderid);
- technicalService.insert(circulatOrderTechnical);
+ configItem.setWarehouseId(warehouseId);
+ configItemService.insert(configItem);
}
- sysOssConfigService.updateOss(circulatOrderTechnical.getId(), circulatOrderTechnical.getFiles());// 淇濆瓨闄勪欢
+ Long checkId = configItem.getCheckId();
+ if (checkId != null) {
+ TestCheckOrder testCheckOrder = testCheckOrderService.get(checkId);
+ if (testCheckOrder.getConfigItemId() == null) {
+ Long configItemId = configItem.getId();
+ testCheckOrder.setConfigItemId(configItemId);
+ testCheckOrderService.update(testCheckOrder);
+ }
+ }
+ sysOssConfigService.updateOss(configItem.getId(), configItem.getFiles());// 淇濆瓨闄勪欢
}
- if (itemCirculatOrderDto.getTestAgencyInfo().getId() == 10000) {
- itemCirculatOrderDto.getTestAgencyInfo().setId(circulatOrderid);
- testAgencyInfoService.insert(itemCirculatOrderDto.getTestAgencyInfo());
- } else {
- testAgencyInfoService.update(itemCirculatOrderDto.getTestAgencyInfo());
+ for (WarehouseCmAudit cmAudit : configItemDto.getCmAuditList()) {
+ cmAudit.setWarehouseId(warehouseId);
+ if (cmAudit.getId() != null) {
+ cmAuditService.update(cmAudit);
+ } else {
+ cmAudit.setWarehouseId(warehouseId);
+ cmAuditService.insert(cmAudit);
+ }
+ }
+
+ for (WarehouseQaAudit qaAudit : configItemDto.getQaAuditList()) {
+ qaAudit.setWarehouseId(warehouseId);
+ if (qaAudit.getId() != null) {
+ qaAuditService.update(qaAudit);
+ } else {
+ qaAudit.setWarehouseId(warehouseId);
+ qaAuditService.insert(qaAudit);
+ }
+ }
+
+ Long bizId = configItemDto.getConfigItemWarehouse().getId();
+ FlowInfoDto flowInfoDto = configItemDto.getFlowInfoDto();
+
+ if (flowInfoDto != null && flowInfoDto.getSubmitType() != null && "tj,bl".contains(flowInfoDto.getSubmitType())) {
+ if ("tj".equals(flowInfoDto.getSubmitType())) {
+ workflowService.startFlow(flowInfoDto.getFlowCode(), bizId);
+ }
+ workflowService.approvePass(flowInfoDto.getFlowCode(), bizId, flowInfoDto.getStepIdMark());
}
return true;
- }*/
+ }
public ConfigItemWarehouseDto getDto(Long projectId, Long warehouseId) {
ConfigItemWarehouseDto data = new ConfigItemWarehouseDto();
@@ -117,10 +173,9 @@
ConfigItemWarehouse configItemWarehouse = this.get(warehouseId);
data.setConfigItemWarehouse(configItemWarehouse);
- projectId = configItemWarehouse.getProjectId();
-
- data.setTestAgencyInfo(testAgencyInfoService.get(warehouseId));
-
+ if (projectId == null) {
+ projectId = configItemWarehouse.getProjectId();
+ }
List<WarehouseCmAudit> CmAuditList = cmAuditService.getList(warehouseId);
data.setCmAuditList(CmAuditList);
List<WarehouseQaAudit> QaAuditList = qaAuditService.getList(warehouseId);
@@ -129,21 +184,23 @@
data.setConfigItemList(ConfigItemList);
} else {
- ConfigItemWarehouse configItemWarehouse =new ConfigItemWarehouse();
+ ConfigItemWarehouse configItemWarehouse = new ConfigItemWarehouse();
data.setConfigItemWarehouse(configItemWarehouse);
- List<?> cmList = cmAuditService.itemList(projectId);
+ List<?> cmList = baseDao.itemList("warehouse_cm_audit");
List<?> CmAuditList = cmList;
data.setCmAuditList((List<WarehouseCmAudit>) CmAuditList);
- List<?> resultList = qaAuditService.itemList(projectId);
+ List<?> qaList = baseDao.itemList("warehouse_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) {
data.setProjectId(projectId);
data.setProject(projectService.get(projectId));
}
-
- if (data.getTestAgencyInfo() == null)
- data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
return data;
}
--
Gitblit v1.9.1