From 7ce2d2cc98ee4ed0361d8376b8d49d567af7b268 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 21 十一月 2023 08:36:45 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/resources/mapper/project/EnvironAnalysisDao.xml | 4 ++--
modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml | 1 -
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java | 10 +++++++++-
modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironDao.java | 1 +
modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml | 1 -
5 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironDao.java
index 3af63fe..31bda2b 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironDao.java
@@ -2,6 +2,7 @@
import com.zt.common.dao.BaseDao;
import com.zt.life.modules.project.model.Environ;
+import com.zt.life.modules.project.model.EnvironSoftwareResources;
import org.apache.ibatis.annotations.Mapper;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
index 7c835b6..3347e6f 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
@@ -117,31 +117,39 @@
environId = softwareTestOrderDto.getEnviron().getId();
}
+ int i = 0;
for (EnvironSoftwareResources environSoftwareResources : softwareTestOrderDto.getSoftwareResourcesList()) {
environSoftwareResources.setEnvironId(environId);
if (environSoftwareResources.getId() != null) {
environSoftwareResourcesService.update(environSoftwareResources);
} else {
+ i++;
+ environSoftwareResources.setNo(i);
environSoftwareResources.setEnvironId(environId);
environSoftwareResourcesService.insert(environSoftwareResources);
}
}
-
+ i = 0;
for (EnvironHardwareResources environHardwareResources : softwareTestOrderDto.getHardwareResourcesList()) {
environHardwareResources.setEnvironId(environId);
if (environHardwareResources.getId() != null) {
environHardwareResourcesService.update(environHardwareResources);
} else {
+ i++;
+ environHardwareResources.setNo(i);
environHardwareResources.setEnvironId(environId);
environHardwareResourcesService.insert(environHardwareResources);
}
}
+ i = 0;
for (EnvironAnalysis environAnalysis : softwareTestOrderDto.getEnvironAnalysisList()) {
environAnalysis.setEnvironId(environId);
if (environAnalysis.getId() != null) {
environAnalysisService.update(environAnalysis);
} else {
+ i++;
+ environAnalysis.setNo(i);
environAnalysis.setEnvironId(environId);
environAnalysisService.insert(environAnalysis);
}
diff --git a/modules/mainPart/src/main/resources/mapper/project/EnvironAnalysisDao.xml b/modules/mainPart/src/main/resources/mapper/project/EnvironAnalysisDao.xml
index 7c61953..093ab20 100644
--- a/modules/mainPart/src/main/resources/mapper/project/EnvironAnalysisDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/EnvironAnalysisDao.xml
@@ -8,8 +8,8 @@
from environ_analysis a
<where>
a.is_delete = 0
- <if test="whereSql!=null">
- and ${whereSql}
+ <if test="environId!=null">
+ and environ_id = ${environId}
</if>
</where>
<if test="orderBySql!=null">
diff --git a/modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml b/modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml
index 6843d79..bb4bcc9 100644
--- a/modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml
@@ -2,7 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zt.life.modules.project.dao.EnvironDao">
-
<select id="getList" resultType="com.zt.life.modules.project.model.Environ">
SELECT a.*, p.*
FROM environ a
diff --git a/modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml b/modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml
index 7eff245..96b2144 100644
--- a/modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml
@@ -2,7 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zt.life.modules.project.dao.EnvironSoftwareResourcesDao">
-
<select id="getList" resultType="com.zt.life.modules.project.model.EnvironSoftwareResources">
select a.*
from environ_software_resources a
--
Gitblit v1.9.1