diff --git a/ruoyi-ui/src/api/device/pitConfig.js b/ruoyi-ui/src/api/device/pitConfig.js
index 15b4cd3a..0159f5bc 100644
--- a/ruoyi-ui/src/api/device/pitConfig.js
+++ b/ruoyi-ui/src/api/device/pitConfig.js
@@ -1,7 +1,6 @@
import request from '@/utils/request'
-// 查询项目基坑监测配置
-列表
+// 查询项目基坑监测配置列表
export function listPitConfig(query) {
return request({
url: '/device/pitConfig/list',
@@ -10,8 +9,7 @@ export function listPitConfig(query) {
})
}
-// 查询项目基坑监测配置
-详细
+// 查询项目基坑监测配置详细
export function getPitConfig(id) {
return request({
url: '/device/pitConfig/' + id,
diff --git a/ruoyi-ui/src/views/device/pitConfig/index.vue b/ruoyi-ui/src/views/device/pitConfig/index.vue
index c0734723..fda269e2 100644
--- a/ruoyi-ui/src/views/device/pitConfig/index.vue
+++ b/ruoyi-ui/src/views/device/pitConfig/index.vue
@@ -1,25 +1,18 @@
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
搜索
@@ -40,7 +33,7 @@
删除
-
+
导出
@@ -49,15 +42,16 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ 启用
+ 停用
+
+
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -113,6 +112,7 @@ import { listPitConfig, getPitConfig, delPitConfig, addPitConfig, updatePitConfi
export default {
name: "PitConfig",
+ dicts: ['pitmonit_vendors'],
data() {
return {
// 遮罩层
@@ -149,13 +149,67 @@ export default {
form: {},
// 表单校验
rules: {
- }
+ },
+ projectOptions: [],
+ depts: [],
+ dlgDepts: []
};
},
created() {
this.getList();
+ this.init();
},
methods: {
+ doQuerySub(type) {
+ let prjId = type == "query" ? this.queryParams.projectId : this.form.projectId;
+ if (!prjId) {
+ if (type == "query") {
+ this.depts = [];
+ this.queryParams.subDeptId = ""
+ } else {
+ this.dlgDepts = [];
+ this.form.subDeptId = ""
+ }
+ return;
+ }
+ let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
+ if (tmps.length > 0) {
+ if (type == 'query') {
+ this.depts = tmps;
+ this.queryParams.subDeptId = tmps.length == 1 ? tmps[0].deptId : '';
+ } else {
+ this.dlgDepts = tmps;
+ this.form.subDeptId = tmps.length == 1 ? tmps[0].deptId : '';
+ }
+ return;
+ }
+ this.$api.publics.queryUnitList({
+ projectId: prjId,
+ unitTypes: "2".split(","),
+ }).then((d) => {
+ let objs = d.rows || [];
+ if (!this.prjDept2) {
+ this.prjDept2 = {};
+ }
+ this.prjDept2[prjId] = objs;
+ let tmps = objs;
+ if (type == 'query') {
+ this.depts = tmps;
+ this.queryParams.subDeptId = tmps.length == 1 ? tmps[0].deptId : '';
+ } else {
+ this.dlgDepts = tmps;
+ this.form.subDeptId = tmps.length == 1 ? tmps[0].deptId : '';
+ }
+ });
+ },
+ init() {
+ if (this.projectOptions && this.projectOptions.length > 0) {
+ return;
+ }
+ this.$api.publics.getMyProjectList({}).then((response) => {
+ this.projectOptions = response.rows;
+ });
+ },
/** 查询项目基坑监测配置列表 */
getList() {
this.loading = true;
@@ -178,7 +232,7 @@ export default {
subDeptId: null,
vendorCode: null,
vendorParamter: null,
- enabled: null,
+ enabled: true,
state: null,
remark: null,
isDel: null,
@@ -209,7 +263,8 @@ export default {
handleAdd() {
this.reset();
this.open = true;
- this.title = "添加项目基坑监测配置";
+ this.title = "添加项目基坑监测配置";
+ this.form.vendorCode = this.dict.type.pitmonit_vendors[0].value;
},
/** 修改按钮操作 */
handleUpdate(row) {
@@ -244,19 +299,19 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('是否确认删除项目基坑监测配置编号为"' + ids + '"的数据项？').then(function() {
+ this.$modal.confirm('是否确认删除项目基坑监测配置编号为"' + ids + '"的数据项？').then(function () {
return delPitConfig(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("删除成功");
- }).catch(() => { });
- },
- /** 导出按钮操作 */
- handleExport() {
- this.download('device/pitConfig/export', {
- ...this.queryParams
- }, `pitConfig_${new Date().getTime()}.xlsx`)
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("删除成功");
+ }).catch(() => { });
+ },
+ /** 导出按钮操作 */
+ handleExport() {
+ this.download('device/pitConfig/export', {
+ ...this.queryParams
+ }, `pitConfig_${new Date().getTime()}.xlsx`)
+ }
}
-}
};
diff --git a/ruoyi-ui/src/views/project/attendanceConfig/index.vue b/ruoyi-ui/src/views/project/attendanceConfig/index.vue
index 61c6cbe6..8302ad88 100644
--- a/ruoyi-ui/src/views/project/attendanceConfig/index.vue
+++ b/ruoyi-ui/src/views/project/attendanceConfig/index.vue
@@ -133,8 +133,9 @@ export default {
},
methods: {
doQuerySub() {
- let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : [];
- if (tmps.length > 0) {
+ let prjId=this.queryParams.projectId;
+ let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
+ if (tmps.length > 0 || !prjId) {
this.depts = tmps;
if (tmps.length == 1) {
this.queryParams.subDeptId = tmps[0].deptId;
@@ -144,14 +145,14 @@ export default {
return;
}
this.$api.publics.queryUnitList({
- projectId: this.queryParams.projectId,
+ projectId: prjId,
unitTypes: "2".split(","),
}).then((d) => {
let objs = d.rows || [];
if (!this.prjDept2) {
this.prjDept2 = {};
}
- this.prjDept2[this.queryParams.projectId] = objs;
+ this.prjDept2[prjId] = objs;
this.depts = objs;
if (objs.length == 1) {
this.queryParams.subDeptId = objs[0].deptId;
diff --git a/ruoyi-ui/src/views/project/checkDetection/index.vue b/ruoyi-ui/src/views/project/checkDetection/index.vue
index 9eb6c7a3..a65e5731 100644
--- a/ruoyi-ui/src/views/project/checkDetection/index.vue
+++ b/ruoyi-ui/src/views/project/checkDetection/index.vue
@@ -501,8 +501,9 @@ export default {
},
methods: {
doQuerySub() {
- let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : [];
- if (tmps.length > 0) {
+ let prjId=this.queryParams.projectId;
+ let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
+ if (tmps.length > 0 || !prjId) {
this.depts = tmps;
if (tmps.length == 1) {
this.queryParams.deptId = tmps[0].deptId;
@@ -512,14 +513,14 @@ export default {
return;
}
this.$api.publics.queryUnitList({
- projectId: this.queryParams.projectId,
+ projectId: prjId,
unitTypes: "2".split(","),
}).then((d) => {
let objs = d.rows || [];
if (!this.prjDept2) {
this.prjDept2 = {};
}
- this.prjDept2[this.queryParams.projectId] = objs;
+ this.prjDept2[prjId] = objs;
this.depts = objs;
if (objs.length == 1) {
this.queryParams.deptId = objs[0].deptId;
diff --git a/ruoyi-ui/src/views/project/materialSeal/index.vue b/ruoyi-ui/src/views/project/materialSeal/index.vue
index 53dfbbd1..297fa344 100644
--- a/ruoyi-ui/src/views/project/materialSeal/index.vue
+++ b/ruoyi-ui/src/views/project/materialSeal/index.vue
@@ -370,8 +370,9 @@ export default {
},
methods: {
doQuerySub() {
- let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : [];
- if (tmps.length > 0) {
+ let prjId=this.queryParams.projectId;
+ let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
+ if (tmps.length > 0 || !prjId) {
this.depts = tmps;
if (tmps.length == 1) {
this.queryParams.deptId = tmps[0].deptId;
@@ -381,14 +382,14 @@ export default {
return;
}
this.$api.publics.queryUnitList({
- projectId: this.queryParams.projectId,
+ projectId: prjId,
unitTypes: "2".split(","),
}).then((d) => {
let objs = d.rows || [];
if (!this.prjDept2) {
this.prjDept2 = {};
}
- this.prjDept2[this.queryParams.projectId] = objs;
+ this.prjDept2[prjId] = objs;
this.depts = objs;
if (objs.length == 1) {
this.queryParams.deptId = objs[0].deptId;
diff --git a/ruoyi-ui/src/views/project/projectChecking/index.vue b/ruoyi-ui/src/views/project/projectChecking/index.vue
index 3607fb8b..e8ce9e2d 100644
--- a/ruoyi-ui/src/views/project/projectChecking/index.vue
+++ b/ruoyi-ui/src/views/project/projectChecking/index.vue
@@ -420,8 +420,9 @@ export default {
},
methods: {
doQuerySub() {
- let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : [];
- if (tmps.length > 0) {
+ let prjId=this.queryParams.projectId;
+ let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
+ if (tmps.length > 0 || !prjId) {
this.depts = tmps;
if (tmps.length == 1) {
this.queryParams.deptId = tmps[0].deptId;
@@ -431,14 +432,14 @@ export default {
return;
}
this.$api.publics.queryUnitList({
- projectId: this.queryParams.projectId,
+ projectId: prjId,
unitTypes: "2".split(","),
}).then((d) => {
let objs = d.rows || [];
if (!this.prjDept2) {
this.prjDept2 = {};
}
- this.prjDept2[this.queryParams.projectId] = objs;
+ this.prjDept2[prjId] = objs;
this.depts = objs;
if (objs.length == 1) {
this.queryParams.deptId = objs[0].deptId;
diff --git a/ruoyi-ui/src/views/project/projectFunVerify/index.vue b/ruoyi-ui/src/views/project/projectFunVerify/index.vue
index f037b03d..e4d860a5 100644
--- a/ruoyi-ui/src/views/project/projectFunVerify/index.vue
+++ b/ruoyi-ui/src/views/project/projectFunVerify/index.vue
@@ -356,8 +356,9 @@ export default {
},
methods: {
doQuerySub() {
- let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : [];
- if (tmps.length > 0) {
+ let prjId=this.queryParams.projectId;
+ let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
+ if (tmps.length > 0 || !prjId) {
this.depts = tmps;
if (tmps.length == 1) {
this.queryParams.deptId = tmps[0].deptId;
@@ -367,14 +368,14 @@ export default {
return;
}
this.$api.publics.queryUnitList({
- projectId: this.queryParams.projectId,
+ projectId: prjId,
unitTypes: "2".split(","),
}).then((d) => {
let objs = d.rows || [];
if (!this.prjDept2) {
this.prjDept2 = {};
}
- this.prjDept2[this.queryParams.projectId] = objs;
+ this.prjDept2[prjId] = objs;
this.depts = objs;
if (objs.length == 1) {
this.queryParams.deptId = objs[0].deptId;
diff --git a/ruoyi-ui/src/views/project/projectMeasure/index.vue b/ruoyi-ui/src/views/project/projectMeasure/index.vue
index 7e5a0c17..8519ae7a 100644
--- a/ruoyi-ui/src/views/project/projectMeasure/index.vue
+++ b/ruoyi-ui/src/views/project/projectMeasure/index.vue
@@ -389,8 +389,9 @@ export default {
},
methods: {
doQuerySub() {
- let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : [];
- if (tmps.length > 0) {
+ let prjId=this.queryParams.projectId;
+ let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
+ if (tmps.length > 0 || !prjId) {
this.depts = tmps;
if (tmps.length == 1) {
this.queryParams.deptId = tmps[0].deptId;
@@ -400,14 +401,14 @@ export default {
return;
}
this.$api.publics.queryUnitList({
- projectId: this.queryParams.projectId,
+ projectId: prjId,
unitTypes: "2".split(","),
}).then((d) => {
let objs = d.rows || [];
if (!this.prjDept2) {
this.prjDept2 = {};
}
- this.prjDept2[this.queryParams.projectId] = objs;
+ this.prjDept2[prjId] = objs;
this.depts = objs;
if (objs.length == 1) {
this.queryParams.deptId = objs[0].deptId;
diff --git a/ruoyi-ui/src/views/project/projectStandard/index.vue b/ruoyi-ui/src/views/project/projectStandard/index.vue
index 31c5dcb0..39a1d793 100644
--- a/ruoyi-ui/src/views/project/projectStandard/index.vue
+++ b/ruoyi-ui/src/views/project/projectStandard/index.vue
@@ -183,8 +183,9 @@ export default {
},
methods: {
doQuerySub() {
- let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : [];
- if (tmps.length > 0) {
+ let prjId=this.queryParams.projectId;
+ let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
+ if (tmps.length > 0 || !prjId) {
this.depts = tmps;
if (tmps.length == 1) {
this.queryParams.subDeptId = tmps[0].deptId;
@@ -194,14 +195,14 @@ export default {
return;
}
this.$api.publics.queryUnitList({
- projectId: this.queryParams.projectId,
+ projectId: prjId,
unitTypes: "2".split(","),
}).then((d) => {
let objs = d.rows || [];
if (!this.prjDept2) {
this.prjDept2 = {};
}
- this.prjDept2[this.queryParams.projectId] = objs;
+ this.prjDept2[prjId] = objs;
this.depts = objs;
if (objs.length == 1) {
this.queryParams.subDeptId = objs[0].deptId;
diff --git a/ruoyi-ui/src/views/project/surProjectInsurance/index.vue b/ruoyi-ui/src/views/project/surProjectInsurance/index.vue
index d817f4c1..89d51d7e 100644
--- a/ruoyi-ui/src/views/project/surProjectInsurance/index.vue
+++ b/ruoyi-ui/src/views/project/surProjectInsurance/index.vue
@@ -249,8 +249,9 @@ export default {
},
methods: {
doQuerySub() {
- let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : [];
- if (tmps.length > 0) {
+ let prjId=this.queryParams.projectId;
+ let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
+ if (tmps.length > 0 || !prjId) {
this.depts = tmps;
if (tmps.length == 1) {
this.queryParams.deptId = tmps[0].deptId;
@@ -260,14 +261,14 @@ export default {
return;
}
this.$api.publics.queryUnitList({
- projectId: this.queryParams.projectId,
+ projectId: prjId,
unitTypes: "2".split(","),
}).then((d) => {
let objs = d.rows || [];
if (!this.prjDept2) {
this.prjDept2 = {};
}
- this.prjDept2[this.queryParams.projectId] = objs;
+ this.prjDept2[prjId] = objs;
this.depts = objs;
if (objs.length == 1) {
this.queryParams.deptId = objs[0].deptId;
diff --git a/ruoyi-ui/src/views/project/surProjectSpecial/index.vue b/ruoyi-ui/src/views/project/surProjectSpecial/index.vue
index f4f012b5..1584fd2e 100644
--- a/ruoyi-ui/src/views/project/surProjectSpecial/index.vue
+++ b/ruoyi-ui/src/views/project/surProjectSpecial/index.vue
@@ -297,8 +297,9 @@ export default {
},
methods: {
doQuerySub() {
- let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : [];
- if (tmps.length > 0) {
+ let prjId=this.queryParams.projectId;
+ let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
+ if (tmps.length > 0 || !prjId) {
this.depts = tmps;
if (tmps.length == 1) {
this.queryParams.deptId = tmps[0].deptId;
@@ -308,14 +309,14 @@ export default {
return;
}
this.$api.publics.queryUnitList({
- projectId: this.queryParams.projectId,
+ projectId: prjId,
unitTypes: "2".split(","),
}).then((d) => {
let objs = d.rows || [];
if (!this.prjDept2) {
this.prjDept2 = {};
}
- this.prjDept2[this.queryParams.projectId] = objs;
+ this.prjDept2[prjId] = objs;
this.depts = objs;
if (objs.length == 1) {
this.queryParams.deptId = objs[0].deptId;
diff --git a/ruoyi-ui/src/views/work/emergencyDrill/index.vue b/ruoyi-ui/src/views/work/emergencyDrill/index.vue
index f9f7927b..79b6718d 100644
--- a/ruoyi-ui/src/views/work/emergencyDrill/index.vue
+++ b/ruoyi-ui/src/views/work/emergencyDrill/index.vue
@@ -290,9 +290,9 @@ export default {
},
methods: {
doQuerySub() {
- let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : [];
- if (tmps.length > 0) {
- this.depts = tmps;
+ let prjId=this.queryParams.projectId;
+ let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
+ if (tmps.length > 0 || !prjId) {
if (tmps.length == 1) {
this.queryParams.trainDeptIds = tmps[0].deptId;
} else {
@@ -301,14 +301,14 @@ export default {
return;
}
this.$api.publics.queryUnitList({
- projectId: this.queryParams.projectId,
+ projectId: prjId,
unitTypes: "2".split(","),
}).then((d) => {
let objs = d.rows || [];
if (!this.prjDept2) {
this.prjDept2 = {};
}
- this.prjDept2[this.queryParams.projectId] = objs;
+ this.prjDept2[prjId] = objs;
this.depts = objs;
if (objs.length == 1) {
this.queryParams.trainDeptIds = objs[0].deptId;
diff --git a/ruoyi-ui/src/views/work/workTrain/index.vue b/ruoyi-ui/src/views/work/workTrain/index.vue
index a79e1183..4589583f 100644
--- a/ruoyi-ui/src/views/work/workTrain/index.vue
+++ b/ruoyi-ui/src/views/work/workTrain/index.vue
@@ -287,8 +287,9 @@ export default {
},
methods: {
doQuerySub() {
- let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : [];
- if (tmps.length > 0) {
+ let prjId=this.queryParams.projectId;
+ let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
+ if (tmps.length > 0 || !prjId) {
this.depts = tmps;
if (tmps.length == 1) {
this.queryParams.trainDeptIds = tmps[0].deptId;
@@ -298,14 +299,14 @@ export default {
return;
}
this.$api.publics.queryUnitList({
- projectId: this.queryParams.projectId,
+ projectId: prjId,
unitTypes: "2".split(","),
}).then((d) => {
let objs = d.rows || [];
if (!this.prjDept2) {
this.prjDept2 = {};
}
- this.prjDept2[this.queryParams.projectId] = objs;
+ this.prjDept2[prjId] = objs;
this.depts = objs;
if (objs.length == 1) {
this.queryParams.trainDeptIds = objs[0].deptId;
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/ProjectPitMonitCfg.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/ProjectPitMonitCfg.java
index 903e2bda..67881205 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/ProjectPitMonitCfg.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/device/domain/ProjectPitMonitCfg.java
@@ -39,6 +39,25 @@ public class ProjectPitMonitCfg extends BaseEntity
@Excel(name = "1-启用,0-停用")
private Long enabled;
+ private String projectName;
+ private String deptName;
+
+ public String getProjectName() {
+ return projectName;
+ }
+
+ public void setProjectName(String projectName) {
+ this.projectName = projectName;
+ }
+
+ public String getDeptName() {
+ return deptName;
+ }
+
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
+ }
+
/** 状态 */
@Excel(name = "状态")
private Long state;
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProject.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProject.java
index 9e8f120f..5050851a 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProject.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProject.java
@@ -177,6 +177,31 @@ public class SurProject extends BaseEntity
@Excel(name = "项目区域名称")
private String projectRegionalName;
+ /**
+ * 基坑平面图
+ */
+ private String prjPlanUrl;
+ /**
+ * 效果图
+ */
+ private String prjRenderingUrl;
+
+ public String getPrjPlanUrl() {
+ return prjPlanUrl;
+ }
+
+ public void setPrjPlanUrl(String prjPlanUrl) {
+ this.prjPlanUrl = prjPlanUrl;
+ }
+
+ public String getPrjRenderingUrl() {
+ return prjRenderingUrl;
+ }
+
+ public void setPrjRenderingUrl(String prjRenderingUrl) {
+ this.prjRenderingUrl = prjRenderingUrl;
+ }
+
public void setId(Long id)
{
this.id = id;
diff --git a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDeviceMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDeviceMapper.xml
index 1ccd6209..363a2073 100644
--- a/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDeviceMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/device/PitmonitSouthsmosDeviceMapper.xml
@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and devShadow = #{devShadow}
and devType = #{devType}
and devTypeName like concat('%', #{devTypeName}, '%')
- and key = #{key}
+ and `key` = #{key}
and manufacturer = #{manufacturer}
and name like concat('%', #{name}, '%')
and orgId = #{orgId}
@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
devShadow,
devType,
devTypeName,
- key,
+ `key`,
manufacturer,
name,
orgId,
@@ -159,7 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
devShadow = #{devShadow},
devType = #{devType},
devTypeName = #{devTypeName},
- key = #{key},
+ `key` = #{key},
manufacturer = #{manufacturer},
name = #{name},
orgId = #{orgId},
diff --git a/yanzhu-jh/src/main/resources/mapper/device/ProjectPitMonitCfgMapper.xml b/yanzhu-jh/src/main/resources/mapper/device/ProjectPitMonitCfgMapper.xml
index 6603aeb2..413ae18b 100644
--- a/yanzhu-jh/src/main/resources/mapper/device/ProjectPitMonitCfgMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/device/ProjectPitMonitCfgMapper.xml
@@ -18,10 +18,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
- select id, project_id, sub_dept_id, vendor_code, vendor_paramter, enabled, state, remark, is_del, create_by, create_time, update_by, update_time from sur_project_pit_monit_cfg
+
+ select id, project_id, sub_dept_id, vendor_code, vendor_paramter, enabled, state, remark, is_del, create_by, create_time, update_by, update_time,projectName,deptName
+ from (
+
+ select a.*,p.projectName,b.unitName as deptName
+ from sur_project_pit_monit_cfg a
+ JOIN sur_project p on a.project_id =p.id
+ join sur_project_unit_info b on a.sub_dept_id=b.unitId and a.project_id=b.projectId ) sur_project_pit_monit_cfg
+