From 96905176e38f8ebfbc44da1dd9adc650357bfc4f Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 14 十一月 2023 12:10:37 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/ProjectService.java | 4
modules/mainPart/src/main/resources/mapper/project/ProjectDao.xml | 7 +
web/src/views/modules/project/Project-AddOrUpdate.vue | 4
web/src/views/modules/project/Project.vue | 2
web/src/views/modules/project/SoftwareTestOrder.vue | 8 +-
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java | 40 +++++----
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 10 ++
web/src/views/modules/project/Project-select.vue | 131 ++++++++++++++++++++------------
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java | 4
modules/mainPart/src/main/java/com/zt/life/modules/project/dao/ProjectDao.java | 4
10 files changed, 127 insertions(+), 87 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
index 897ab38..68a39b7 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/ProjectController.java
@@ -32,12 +32,12 @@
/**
* project
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-11-07
*/
@RestController
@RequestMapping("/project/Project/")
-@Api(tags="project")
+@Api(tags = "project")
public class ProjectController {
@Autowired
private ProjectService projectService;
@@ -47,24 +47,26 @@
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = "softwareName", value = "杞欢鍚嶇О", dataType = Constant.QT.STRING, format = "software_name^LK"),
- @ApiImplicitParam(name = "secretClass", value = "瀵嗙骇", dataType = Constant.QT.STRING, format = "secret_class^EQ"),
- @ApiImplicitParam(name = "criticalLevel", value = "鍏抽敭绛夌骇", dataType = Constant.QT.STRING, format = "critical_level^EQ"),
- @ApiImplicitParam(name = "testLevel", value = "娴嬭瘯绾у埆", dataType = Constant.QT.STRING, format = "test_level^EQ"),
- @ApiImplicitParam(name = "softwareType", value = "杞欢绫诲瀷", dataType = Constant.QT.STRING, format = "software_type^EQ"),
- @ApiImplicitParam(name = "isContract", value = "鏄惁绛剧讲鍚堝悓", dataType = Constant.QT.STRING, format = "is_contract^EQ") })
- public PageResult<Project> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
+ @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = "softwareName", value = "杞欢鍚嶇О", dataType = Constant.QT.STRING, format = "software_name^LK"),
+ @ApiImplicitParam(name = "secretClass", value = "瀵嗙骇", dataType = Constant.QT.STRING, format = "secret_class^EQ"),
+ @ApiImplicitParam(name = "criticalLevel", value = "鍏抽敭绛夌骇", dataType = Constant.QT.STRING, format = "critical_level^EQ"),
+ @ApiImplicitParam(name = "testLevel", value = "娴嬭瘯绾у埆", dataType = Constant.QT.STRING, format = "test_level^EQ"),
+ @ApiImplicitParam(name = "softwareType", value = "杞欢绫诲瀷", dataType = Constant.QT.STRING, format = "software_type^EQ"),
+ @ApiImplicitParam(name = "isContract", value = "鏄惁绛剧讲鍚堝悓", dataType = Constant.QT.STRING, format = "is_contract^EQ"),
+ @ApiImplicitParam(name = "tableName", value = "鍔熻兘琛�", dataType = Constant.QT.STRING)
+ })
+ public PageResult<Project> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
return PageResult.ok(projectService.page(queryFilter));
}
@GetMapping("{id}")
@ApiOperation("淇℃伅")
- public Result<Project> get(@PathVariable("id") Long id){
+ public Result<Project> get(@PathVariable("id") Long id) {
Project data = projectService.get(id);
return Result.ok(data);
}
@@ -72,11 +74,11 @@
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
- public Result insert(@RequestBody Project project){
+ public Result insert(@RequestBody Project project) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(project, AddGroup.class, DefaultGroup.class);
- Map<String,String> map = new HashMap<>();
- map.put("funCode","project");
+ Map<String, String> map = new HashMap<>();
+ map.put("funCode", "project");
project.setCode(sysCodeRuleService.getNewCode(map));
projectService.insert(project);
return Result.ok();
@@ -85,7 +87,7 @@
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody Project project){
+ public Result update(@RequestBody Project project) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(project, UpdateGroup.class, DefaultGroup.class);
projectService.update(project);
@@ -96,7 +98,7 @@
@DeleteMapping
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
- public Result delete(@RequestBody Long[] ids){
+ public Result delete(@RequestBody Long[] ids) {
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
projectService.delete(ids);
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 6fa1726..18b8d2b 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
@@ -130,7 +130,7 @@
softwareTestOrderService.exportWord(id, request, response);
}
- @GetMapping("getCode")
+ /* @GetMapping("getCode")
@ApiOperation("缂栧彿")
public Result<List<String>> getCode() {
return Result.ok( projectService.getCode());
@@ -140,5 +140,5 @@
@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 5db0068..ab054c3 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,7 @@
List<Project> getList(Map<String, Object> params);
- List<String> getCode();
+/* List<String> getCode();
- Project getProject(String code);
+ Project getProject(String code);*/
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/ProjectService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/ProjectService.java
index 6df9406..7bcbc33 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/ProjectService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/ProjectService.java
@@ -40,12 +40,12 @@
super.deleteLogic(ids);
}
-
+/*
public List<String> getCode() {
return baseDao.getCode();
}
public Project getProject(String code) {
return baseDao.getProject(code);
- }
+ }*/
}
diff --git a/modules/mainPart/src/main/resources/mapper/project/ProjectDao.xml b/modules/mainPart/src/main/resources/mapper/project/ProjectDao.xml
index 9a369f0..cc066ac 100644
--- a/modules/mainPart/src/main/resources/mapper/project/ProjectDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/ProjectDao.xml
@@ -11,13 +11,16 @@
<if test="whereSql!=null">
and ${whereSql}
</if>
+ <if test="tableName!=null">
+ and id not in (select project_id from ${tableName} where is_delete = 0)
+ </if>
</where>
<if test="orderBySql!=null">
ORDER BY ${orderBySql}
</if>
</select>
- <select id="getCode" resultType="java.lang.String">
+ <!--<select id="getCode" resultType="java.lang.String">
SELECT p.CODE FROM Project p where p.is_delete =0
</select>
@@ -26,6 +29,6 @@
FROM project
WHERE code = #{code}
and is_delete = 0
- </select>
+ </select>-->
</mapper>
diff --git a/web/src/views/modules/project/Project-AddOrUpdate.vue b/web/src/views/modules/project/Project-AddOrUpdate.vue
index 4d364e3..7f32aeb 100644
--- a/web/src/views/modules/project/Project-AddOrUpdate.vue
+++ b/web/src/views/modules/project/Project-AddOrUpdate.vue
@@ -67,7 +67,7 @@
</zt-form-item>
<!-- 鑱旂郴浜� -->
<zt-form-item class="marginTopAndMarginBottom" label="杞欢鏍囪瘑" prop="identity" style="width: 49%" rules="required">
- <el-input v-model="dataForm.identity" placeholder="璇疯緭鍏ヨ蒋浠舵爣璇�"></el-input>
+ <el-input v-model="dataForm.softwareIdentity" placeholder="璇疯緭鍏ヨ蒋浠舵爣璇�"></el-input>
</zt-form-item>
<!-- 璇︾粏鍦板潃 -->
<zt-form-item label="瀵嗙骇" prop="secretClass" style="width: 49%" rules="required">
@@ -189,7 +189,7 @@
softwareType: '',
softwareName: '',
code: '',
- identity: '',
+ softwareIdentity: '',
secretClass: '',
criticalLevel: '',
testLevel: '',
diff --git a/web/src/views/modules/project/Project-select.vue b/web/src/views/modules/project/Project-select.vue
index 2cdb80b..41b857f 100644
--- a/web/src/views/modules/project/Project-select.vue
+++ b/web/src/views/modules/project/Project-select.vue
@@ -1,62 +1,91 @@
<template>
<zt-dialog ref="dialog" column="2">
- <el-card shadow="never" class="aui-card--fill">
- <div class="mod-project-project}">
- <zt-table-wraper query-url="/project/Project/page" delete-url="/project/Project" v-slot="{ table }">
- <el-table v-loading="table.dataLoading"
- :data="table.dataList" height="100px"
- v-adaptive="{bottomOffset:70}"
- border
- @row-dblclick="selectedProject"
- @selection-change="table.selectionChangeHandle">
- <el-table-column prop="entrustUnitName" label="濮旀墭鍗曚綅鍚嶇О"/>
- <el-table-column prop="developUnitName" label="寮�鍙戝崟浣嶅悕绉�"/>
- <el-table-column prop="softwareName" label="杞欢鍚嶇О"/>
- <el-table-column prop="code" label="椤圭洰缂栧彿"/>
- <el-table-column prop="identity" label="椤圭洰鏍囪瘑"/>
- <zt-table-column-dict prop="secretClass" label="瀵嗙骇" dict="secret_class"/>
- <zt-table-column-dict prop="criticalLevel" label="鍏抽敭绛夌骇" dict="critical_level"/>
- <zt-table-column-dict prop="testLevel" label="娴嬭瘯绾у埆" dict="test_level"/>
- <zt-table-column-dict prop="softwareType" label="杞欢绫诲瀷" dict="software_type"/>
- <el-table-column prop="projectLeader" label="椤圭洰璐熻矗浜�"/>
- <zt-table-column-dict prop="isContract" label="鏄惁绛剧讲鍚堝悓" dict="is_or_not"/>
- </el-table>
- </zt-table-wraper>
- </div>
- </el-card>
+ <el-card shadow="never" class="aui-card--fill">
+ <div class="mod-project-project}">
+ <zt-table-wraper query-url="/project/Project/page" delete-url="/project/Project" v-slot="{ table }">
+ <el-form :inline="true" class="form-input-width-1" :model="dataForm" @keyup.enter.native="table.query()">
+ <el-form-item>
+ <el-input v-model="dataForm.softwareName" placeholder="璇疯緭鍏ヨ蒋浠跺悕绉�" clearable></el-input>
+
+ </el-form-item>
+ <el-form-item>
+ <zt-dict v-model="dataForm.secretClass" placeholder="瀵嗙骇" dict="secret_class" clearable></zt-dict>
+
+ </el-form-item>
+ <el-form-item>
+ <zt-dict v-model="dataForm.criticalLevel" placeholder="鍏抽敭绛夌骇" dict="critical_level" clearable></zt-dict>
+
+ </el-form-item>
+ <el-form-item>
+ <zt-dict v-model="dataForm.testLevel" placeholder="娴嬭瘯绾у埆" dict="test_level" clearable></zt-dict>
+
+ </el-form-item>
+ <el-form-item>
+ <zt-dict v-model="dataForm.softwareType" placeholder="杞欢绫诲瀷" dict="software_type" clearable></zt-dict>
+
+ </el-form-item>
+ <el-form-item>
+ <zt-dict v-model="dataForm.isContract" placeholder="鏄惁绛剧讲鍚堝悓" dict="is_or_not" clearable></zt-dict>
+
+ </el-form-item>
+ <el-form-item style="float: right">
+ <zt-button type="query" @click="table.query()"/>
+ </el-form-item>
+ </el-form>
+ <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}"
+ border @selection-change="table.selectionChangeHandle">
+ <el-table-column type="selection" align="center" width="40"/>
+ <el-table-column prop="entrustUnitName" label="濮旀墭鍗曚綅鍚嶇О"/>
+ <el-table-column prop="developUnitName" label="寮�鍙戝崟浣嶅悕绉�"/>
+ <el-table-column prop="softwareName" label="杞欢鍚嶇О"/>
+ <el-table-column prop="code" label="椤圭洰缂栧彿"/>
+ <el-table-column prop="softwareIdentity" label="椤圭洰鏍囪瘑"/>
+ <zt-table-column-dict prop="secretClass" label="瀵嗙骇" dict="secret_class"/>
+ <zt-table-column-dict prop="criticalLevel" label="鍏抽敭绛夌骇" dict="critical_level"/>
+ <zt-table-column-dict prop="testLevel" label="娴嬭瘯绾у埆" dict="test_level"/>
+ <zt-table-column-dict prop="softwareType" label="杞欢绫诲瀷" dict="software_type"/>
+ <el-table-column prop="projectLeader" label="椤圭洰璐熻矗浜�"/>
+ <zt-table-column-dict prop="isContract" label="鏄惁绛剧讲鍚堝悓" dict="is_or_not"/>
+ </el-table>
+ </zt-table-wraper>
+ </div>
+ </el-card>
</zt-dialog>
</template>
<script>
-export default {
- name:'Project-select',
- data() {
- return {
- dataForm: {
- softwareName: '',
- secretClass: '',
- criticalLevel: '',
- testLevel: '',
- softwareType: '',
- isContract: '',
+ export default {
+ name: 'Project-select',
+ data() {
+ return {
+ dataForm: {
+ softwareName: '',
+ secretClass: '',
+ criticalLevel: '',
+ testLevel: '',
+ softwareType: '',
+ isContract: '',
+ tableName: null
+ }
}
- }
- },
- methods:{
- init(){
- // console.log(this.dataForm,'this.dataForm')
},
- async selectedProject(row){
- console.log(row,'row')
- await this.$tip.success()
- this.$refs.dialog.close()
- this.$emit('setConstructionInfo',row)
- }
- },
-}
+ methods: {
+ init(tableName) {
+ this.dataForm.tableName = tableName
+ this.$refs.tableObj.query()
+ // console.log(this.dataForm,'this.dataForm')
+ },
+ async selectedProject(row) {
+ console.log(row, 'row')
+ await this.$tip.success()
+ this.$refs.dialog.close()
+ this.$emit('setProjectInfo', row)
+ }
+ },
+ }
</script>
<style>
-.form-input-width-1 .el-form-item>.el-form-item__content .el-input{
- width: 150px;
-}
+ .form-input-width-1 .el-form-item > .el-form-item__content .el-input {
+ width: 150px;
+ }
</style>
diff --git a/web/src/views/modules/project/Project.vue b/web/src/views/modules/project/Project.vue
index 0c4607c..6f90a3b 100644
--- a/web/src/views/modules/project/Project.vue
+++ b/web/src/views/modules/project/Project.vue
@@ -39,7 +39,7 @@
<el-table-column prop="developUnitName" label="寮�鍙戝崟浣嶅悕绉�"/>
<el-table-column prop="softwareName" label="杞欢鍚嶇О"/>
<el-table-column prop="code" label="椤圭洰缂栧彿"/>
- <el-table-column prop="identity" label="椤圭洰鏍囪瘑"/>
+ <el-table-column prop="softwareIdentity" label="椤圭洰鏍囪瘑"/>
<zt-table-column-dict prop="secretClass" label="瀵嗙骇" dict="secret_class"/>
<zt-table-column-dict prop="criticalLevel" label="鍏抽敭绛夌骇" dict="critical_level"/>
<zt-table-column-dict prop="testLevel" label="娴嬭瘯绾у埆" dict="test_level"/>
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index 3a1c953..c7e5be6 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -76,7 +76,7 @@
</el-form-item>
<!-- 鑱旂郴浜� -->
<el-form-item class="marginTopAndMarginBottom" label="杞欢鏍囪瘑" style="width: 49%">
- <el-input readonly v-model="dataForm.project.identity" placeholder="璇疯緭鍏ヨ蒋浠舵爣璇�"></el-input>
+ <el-input readonly v-model="dataForm.project.softwareIdentity" placeholder="璇疯緭鍏ヨ蒋浠舵爣璇�"></el-input>
</el-form-item>
<!-- 璇︾粏鍦板潃 -->
<el-form-item label="瀵嗙骇" style="width: 49%">
@@ -500,6 +500,12 @@
})
console.log(this.editingCell, 'this.editingCell')
},
+
+ init(data){
+ this.dataForm.id = null
+ this.dataForm.projectId = data.id
+ this.getInfo()
+ },
// 鑾峰彇淇℃伅
async getInfo() {
let params = {
@@ -512,9 +518,9 @@
...res.data
}
}
-
console.log(this.dataForm, "this.dataForm")
},
+
// 琛ㄥ崟鎻愪氦
async formSubmit() {
console.log(this.dataForm, ' this.dataForm')
diff --git a/web/src/views/modules/project/SoftwareTestOrder.vue b/web/src/views/modules/project/SoftwareTestOrder.vue
index 7261028..87d17a3 100644
--- a/web/src/views/modules/project/SoftwareTestOrder.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder.vue
@@ -26,7 +26,7 @@
<el-table-column type="selection" align="center" width="40"/>
<el-table-column prop="softwareName" label="杞欢鍚嶇О"/>
<el-table-column prop="code" label="濮旀墭鍗曠紪鍙�"/>
- <el-table-column prop="identity" label="椤圭洰鏍囪瘑"/>
+ <el-table-column prop="softwareIdentity" label="椤圭洰鏍囪瘑"/>
<zt-table-column-dict prop="testBasis" label="娴嬭瘯渚濇嵁" dict="test_basis"/>
<zt-table-column-dict prop="testStandard" width="370px" label="娴嬭瘯鏍囧噯" dict="test_standard"/>
<zt-table-column-dict prop="articleNature" label="鐗╁搧鎬ц川" dict="article_nature"/>
@@ -36,7 +36,7 @@
<add-or-update ref="addOrUpdate" @refreshDataList="table.query"/>
<ProjectSelect ref="projectSelect"
@refreshDataList="table.query"
- @setConstructionInfo="getConstructionInfo">
+ @setProjectInfo="openAddWin">
</ProjectSelect>
</zt-table-wraper>
@@ -64,9 +64,9 @@
},
methods:{
add(){
- this.$refs.projectSelect.$refs.dialog.init()
+ this.$refs.projectSelect.$refs.dialog.init("software_test_order")
},
- getConstructionInfo(row){
+ openAddWin(row){
this.$refs.addOrUpdate.$refs.dialog.init(row)
}
}
--
Gitblit v1.9.1