From 02b942d804cfa1ea094256b914a08083288695ed Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 08 十二月 2023 16:28:04 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/ConfigItemWarehouseService.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 7 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 862c230..234f400 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
@@ -15,12 +15,17 @@
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;
@@ -30,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;
@@ -42,7 +47,7 @@
private SysOssService sysOssService;
@Autowired
- private TestAgencyInfoService testAgencyInfoService;
+ private WorkflowService workflowService;
@Autowired
private SysCodeRuleService sysCodeRuleService;
@@ -58,6 +63,9 @@
@Autowired
private WarehouseConfigItemService configItemService;
+
+ @Autowired
+ private TestCheckOrderService testCheckOrderService;
/**
* 鍒嗛〉鏌ヨ
@@ -85,7 +93,7 @@
else {
Map<String, String> map = new HashMap<>();
map.put("funCode", "config_item_warehouse");
- map.put("projectId",configItemDto.getProjectId().toString());
+ map.put("projectId", configItemDto.getProjectId().toString());
configItemDto.getConfigItemWarehouse().setProjectId(configItemDto.getProjectId());
configItemDto.getConfigItemWarehouse().setCode(sysCodeRuleService.getNewCode(map));
baseDao.insert(configItemDto.getConfigItemWarehouse());
@@ -95,10 +103,34 @@
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 {
configItem.setWarehouseId(warehouseId);
+ configItem.setProjectId(configItemDto.getConfigItemWarehouse().getProjectId());
configItemService.insert(configItem);
+ }
+ 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());// 淇濆瓨闄勪欢
}
@@ -122,6 +154,16 @@
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;
}
@@ -132,8 +174,9 @@
ConfigItemWarehouse configItemWarehouse = this.get(warehouseId);
data.setConfigItemWarehouse(configItemWarehouse);
- projectId = configItemWarehouse.getProjectId();
-
+ if (projectId == null) {
+ projectId = configItemWarehouse.getProjectId();
+ }
List<WarehouseCmAudit> CmAuditList = cmAuditService.getList(warehouseId);
data.setCmAuditList(CmAuditList);
List<WarehouseQaAudit> QaAuditList = qaAuditService.getList(warehouseId);
@@ -142,7 +185,7 @@
data.setConfigItemList(ConfigItemList);
} else {
- ConfigItemWarehouse configItemWarehouse =new ConfigItemWarehouse();
+ ConfigItemWarehouse configItemWarehouse = new ConfigItemWarehouse();
data.setConfigItemWarehouse(configItemWarehouse);
List<?> cmList = baseDao.itemList("warehouse_cm_audit");
List<?> CmAuditList = cmList;
--
Gitblit v1.9.1