From 55313f7b1d3dc7959b6d1e93f9e652be0b0bc646 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 14 十一月 2023 14:15:18 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/resources/mapper/project/ProjectDao.xml | 18 +++---------------
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 2 +-
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java | 12 ------------
modules/mainPart/src/main/java/com/zt/life/modules/project/dao/ProjectDao.java | 3 ---
4 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
index 18b8d2b..b6a7f29 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
@@ -129,16 +129,4 @@
public void exportWord(@PathVariable("id") Long id, HttpServletRequest request, HttpServletResponse response) {
softwareTestOrderService.exportWord(id, request, response);
}
-
- /* @GetMapping("getCode")
- @ApiOperation("缂栧彿")
- public Result<List<String>> getCode() {
- return Result.ok( projectService.getCode());
- }
-
- @GetMapping("getProject/{code}")
- @ApiOperation("椤圭洰鏁版嵁")
- public Result<Project> getProject(@Param("code") String code) {
- return Result.ok(projectService.getProject(code));
- }*/
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/ProjectDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/ProjectDao.java
index ab054c3..a5b0fb4 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/ProjectDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/ProjectDao.java
@@ -20,7 +20,4 @@
List<Project> getList(Map<String, Object> params);
-/* List<String> getCode();
-
- Project getProject(String code);*/
}
diff --git a/modules/mainPart/src/main/resources/mapper/project/ProjectDao.xml b/modules/mainPart/src/main/resources/mapper/project/ProjectDao.xml
index cc066ac..719f9d1 100644
--- a/modules/mainPart/src/main/resources/mapper/project/ProjectDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/ProjectDao.xml
@@ -4,10 +4,10 @@
<mapper namespace="com.zt.life.modules.project.dao.ProjectDao">
<select id="getList" resultType="com.zt.life.modules.project.model.Project">
- select a.*
- from project a
+ select *
+ from project
<where>
- a.is_delete = 0
+ is_delete = 0
<if test="whereSql!=null">
and ${whereSql}
</if>
@@ -19,16 +19,4 @@
ORDER BY ${orderBySql}
</if>
</select>
-
- <!--<select id="getCode" resultType="java.lang.String">
- SELECT p.CODE FROM Project p where p.is_delete =0
- </select>
-
- <select id="getProject" resultType="com.zt.life.modules.project.model.Project">
- SELECT *
- FROM project
- WHERE code = #{code}
- and is_delete = 0
- </select>-->
-
</mapper>
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index c7e5be6..9286c4a 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -460,7 +460,7 @@
entrustUnitContWay: '',
entrustUnitContact: '',
entrustUnitName: '',
- identity: '',
+ softwareIdentity: '',
isContract: '',
projectLeader: '',
projectReviewer: '',
--
Gitblit v1.9.1