Commit 992765bf authored by 黎博's avatar 黎博

恢复误改代码

parent 28846d9a
...@@ -8,7 +8,7 @@ target/ ...@@ -8,7 +8,7 @@ target/
.apt_generated .apt_generated
.classpath .classpath
.factorypath .factorypath
.autoProject .project
.settings .settings
.springBeans .springBeans
.sts4-cache .sts4-cache
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<autoProject xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<artifactId>holmes</artifactId> <artifactId>holmes</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<name>holmes</name> <name>holmes</name>
<description>QG QA autoProject</description> <description>QG QA project</description>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
</properties> </properties>
...@@ -140,4 +140,4 @@ ...@@ -140,4 +140,4 @@
</plugins> </plugins>
</build> </build>
</autoProject> </project>
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<select id="getAutoModuleList" resultType="cn.qg.holmes.entity.auto.AutoModule"> <select id="getAutoModuleList" resultType="cn.qg.holmes.entity.auto.AutoModule">
select a.*, select a.*,
p.`name` as projectName p.`name` as projectName
from `auto_module` a, autoProject p from `auto_module` a, auto_project p
where a.`project_id` = p.`id` where a.`project_id` = p.`id`
</select> </select>
</mapper> </mapper>
\ No newline at end of file
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<select id="getSceneTestcaseReportGroupByBatch" resultType="java.util.Map"> <select id="getSceneTestcaseReportGroupByBatch" resultType="java.util.Map">
SELECT st.`scene_id` as sceneId, st.`batch`, st.`namespace`, st.`project_id` as projectId, pro.`name` as projectName, st.`create_time` as createTime from `scene_testcase_report` st SELECT st.`scene_id` as sceneId, st.`batch`, st.`namespace`, st.`project_id` as projectId, pro.`name` as projectName, st.`create_time` as createTime from `scene_testcase_report` st
left join `autoProject` pro on st.`project_id` = pro.`id` WHERE 1=1 left join `auto_project` pro on st.`project_id` = pro.`id` WHERE 1=1
<if test="projectId != null and projectId !=''"> <if test="projectId != null and projectId !=''">
AND st.`project_id` = #{projectId} AND st.`project_id` = #{projectId}
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment