Changes

jinlin

2023-11-21 7ce2d2cc98ee4ed0361d8376b8d49d567af7b268

Changes

 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;



 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);
            }

 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">

 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

 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