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 | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 8526b69..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;
@@ -72,6 +75,9 @@
* @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");
@@ -112,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);
@@ -250,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