From bb3bc1c8508dc28d1780c2b0e068595baedb5100 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 12 一月 2024 16:42:17 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
index a4fa86c..bdffbe7 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
@@ -2,6 +2,8 @@
import com.zt.common.service.BaseService;
import com.zt.common.utils.CommonUtils;
+import com.zt.core.context.User;
+import com.zt.core.context.UserContext;
import com.zt.core.sys.dto.DictDto;
import com.zt.core.sys.dto.DictItemDto;
import com.zt.core.sys.dto.DictLeafDto;
@@ -14,6 +16,7 @@
import com.zt.life.modules.project.model.SoftwareTestOrder;
import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
+import com.zt.life.modules.qaAuditReport.model.QaAuditReportIncongruent;
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
@@ -28,6 +31,7 @@
import java.io.FileNotFoundException;
import java.io.UnsupportedEncodingException;
import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -71,11 +75,17 @@
* @return
*/
public List<SoftwareTestOrder> page(QueryFilter queryFilter) {
+ User user = UserContext.getUser();
+ Integer secretClass = user.getSecretClass();
+ queryFilter.getQueryParams().put("secretClass",secretClass);
List<SoftwareTestOrder> list = baseDao.getList(queryFilter.getQueryParams());
if (list != null && list.size() > 0) {
sysOssService.setListOsses(list, "test_order");
}
return list;
+ }
+ public String selectOrderId(Long projectId) {
+ return baseDao.selectOrderId(projectId);
}
@@ -97,6 +107,8 @@
Map<String, String> map = new HashMap<>();
map.put("funCode", "software_test_order");
map.put("projectId",softwareTestOrderDto.getProjectId().toString());
+ /* DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ softwareTestOrderDto.getSoftwareTestOrder().getEntrustSignDate();*/
softwareTestOrderDto.getSoftwareTestOrder().setProjectId(softwareTestOrderDto.getProjectId());
softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map));
baseDao.insert(softwareTestOrderDto.getSoftwareTestOrder());
@@ -106,7 +118,10 @@
for (SoftwareTestOrderMeasured softwareTestOrderMeasured : softwareTestOrderDto.getMeasuredList()) {
softwareTestOrderMeasured.setOrderId(softwareTestOrderId);
if (softwareTestOrderMeasured.getId() != null) {
- softwareTestOrderMeasuredService.update(softwareTestOrderMeasured);
+ SoftwareTestOrderMeasured Measured = softwareTestOrderMeasuredService.get(softwareTestOrderMeasured.getId());
+ if (CommonUtils.isActureChangeData(softwareTestOrderMeasured,Measured)) {
+ softwareTestOrderMeasuredService.update(softwareTestOrderMeasured);
+ }
} else {
softwareTestOrderMeasured.setOrderId(softwareTestOrderId);
softwareTestOrderMeasuredService.insert(softwareTestOrderMeasured);
@@ -152,8 +167,8 @@
} else {
Project project = projectService.get(projectId);
String projectCode = project.getCode();
- String softName =project.getSoftwareName();
- List<?> testItemResult = baseDao.dictList("testItem_type", projectCode,softName);
+ String softIdentity =project.getSoftwareIdentity();
+ List<?> testItemResult = baseDao.dictList("testItem_type", projectCode,softIdentity);
List<?> measuredList = testItemResult;
data.setMeasuredList((List<SoftwareTestOrderMeasured>) measuredList);
@@ -244,7 +259,7 @@
dataObj.getSoftwareTestOrder().setTestLevelStr(testLevelStr);
String test = dataObj.getSoftwareTestOrder().getOtherRequire();
- String otherRequireStr = getShowDictList.getShowDictList(test, "other_require", false);
+ String otherRequireStr = getShowDictList.getShowDictList(test, "is_or_not", false);
dataObj.getSoftwareTestOrder().setOtherRequireStr(otherRequireStr);
String articleNatureStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getArticleNature(), "article_nature", false);
--
Gitblit v1.9.1