From 39f2e9b35977420ba8afc64151cb9c424f4d26c7 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 06 十二月 2023 16:42:08 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderDao.xml | 4 ++--
modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/model/TestCheckOrder.java | 17 ++++++++++-------
web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue | 2 +-
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/model/TestCheckOrder.java b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/model/TestCheckOrder.java
index 568795e..21658a5 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/model/TestCheckOrder.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/model/TestCheckOrder.java
@@ -1,5 +1,6 @@
package com.zt.life.modules.testCheckOrder.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zt.common.entity.BusiEntity;
@@ -32,16 +33,10 @@
private Long configItemId;
@ApiModelProperty(value = "閰嶇疆椤圭被鍨�")
- private Long configItemType;
+ private Long pageCode;
@ApiModelProperty(value = "缂栧彿")
private String code;
-
- @ApiModelProperty(value = "椤圭洰鏍囪瘑")
- private String softwareIdentity;
-
- @ApiModelProperty(value = "椤圭洰鍚嶇О")
- private String softwareName;
@ApiModelProperty(value = "妫�鏌ヤ汉")
private String examiner;
@@ -79,4 +74,12 @@
@ApiModelProperty(value = "骞翠唤")
private String year;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "椤圭洰鏍囪瘑")
+ private String softwareIdentity;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ private String softwareName;
+
}
diff --git a/modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderDao.xml b/modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderDao.xml
index 176226c..27dd8e7 100644
--- a/modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderDao.xml
@@ -4,9 +4,9 @@
<mapper namespace="com.zt.life.modules.testCheckOrder.dao.TestCheckOrderDao">
<select id="getList" resultType="com.zt.life.modules.testCheckOrder.model.TestCheckOrder">
- select a.* ,p.*
+ select a.* ,p.software_identity,p.software_name
from test_check_order a
- INNER JOIN project p ON p.id = a.project_id
+ INNER JOIN project p ON p.id = a.project_id
<where>
a.is_delete = 0 and p.is_delete = 0
<if test="whereSql!=null">
diff --git a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
index 5002cc8..ca96bf9 100644
--- a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
+++ b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
@@ -382,7 +382,7 @@
},
// 琛ㄥ崟鎻愪氦
async formSubmit(submitType) {
-/* if (this.stepMarker=='' && submitType == 'bl') {
+/* if (this.stepMarker=='wplz_first' && submitType == 'bl') {
for(666)
if (this.pageNameCode[row.itemName] && !row.isCheck) {
alert(444)
--
Gitblit v1.9.1