From cb12d489a1469ea7764760144928866abef4fe04 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 19 May 2025 14:19:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/demo/lwKhcl/entity/LwKhcl.java | 4 ++ .../demo/lwKhcl/mapper/xml/LwKhclMapper.xml | 6 ++ .../demo/lwKhclXz/entity/LwKhclXz.java | 4 ++ .../ShangbaoPracticePlanInfoXzController.java | 4 +- .../entity/ShangbaoPracticePlanInfoXz.java | 6 +- .../xml/ShangbaoPracticePlanInfoXzMapper.xml | 18 ++++-- .../modules/demo/vLwKhcl/entity/VLwKhcl.java | 4 ++ .../views/bl/lwKhclXz/LwKhclXzListIndex.vue | 63 ++++++++++++++++++- .../src/views/bl/lwKhclXz/Xzlwkhcl.vue | 52 ++++++++++++++- .../PracticePlanCkList.vue | 5 +- .../PracticePlanXzList.vue | 18 +++++- .../ShangbaoPracticePlanInfo.data.ts | 10 +++ .../bl/zjSqxx/components/ZjSqxxEditForm.vue | 2 +- 13 files changed, 178 insertions(+), 18 deletions(-) diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/entity/LwKhcl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/entity/LwKhcl.java index fcb9bc6..90cd771 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/entity/LwKhcl.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/entity/LwKhcl.java @@ -115,6 +115,10 @@ public class LwKhcl implements Serializable { private String ccjgdown; @ApiModelProperty(value = "知道记录单") private String zdjld; + + /**答辩记录单*/ + @ApiModelProperty(value = "答辩记录单") + private java.lang.String dbjld; private String zfx; diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/xml/LwKhclMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/xml/LwKhclMapper.xml index f41bcf3..d19b1d8 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/xml/LwKhclMapper.xml +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/xml/LwKhclMapper.xml @@ -154,6 +154,12 @@ and a.bylw_cj = #{lwKhcl.bylwCj} + + and a.zdjsxm like concat('%',#{lwKhcl.zdjsxm},'%') + + + and a.zdjszc like concat('%',#{lwKhcl.zdjszc},'%') + and a.ssyxmc in diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhclXz/entity/LwKhclXz.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhclXz/entity/LwKhclXz.java index 214a1cd..52d0f84 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhclXz/entity/LwKhclXz.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhclXz/entity/LwKhclXz.java @@ -102,6 +102,10 @@ public class LwKhclXz implements Serializable { @Excel(name = "中期检查", width = 15) @ApiModelProperty(value = "中期检查") private java.lang.String zqjc; + /**答辩记录单*/ + @Excel(name = "答辩记录单", width = 15) + @ApiModelProperty(value = "答辩记录单") + private java.lang.String dbjld; /**论文终稿*/ @Excel(name = "论文终稿", width = 15) @ApiModelProperty(value = "论文终稿") diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/shangbaoPracticePaln/controller/ShangbaoPracticePlanInfoXzController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/shangbaoPracticePaln/controller/ShangbaoPracticePlanInfoXzController.java index d35a90b..3a6ff24 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/shangbaoPracticePaln/controller/ShangbaoPracticePlanInfoXzController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/shangbaoPracticePaln/controller/ShangbaoPracticePlanInfoXzController.java @@ -217,9 +217,9 @@ public class ShangbaoPracticePlanInfoXzController extends JeecgController \ No newline at end of file diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/vLwKhcl/entity/VLwKhcl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/vLwKhcl/entity/VLwKhcl.java index c171579..deb5e9f 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/vLwKhcl/entity/VLwKhcl.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/vLwKhcl/entity/VLwKhcl.java @@ -104,6 +104,10 @@ public class VLwKhcl implements Serializable { @Excel(name = "中期检查", width = 15) @ApiModelProperty(value = "中期检查") private java.lang.String zqjc; + /**答辩记录单*/ + @Excel(name = "答辩记录单", width = 15) + @ApiModelProperty(value = "答辩记录单") + private java.lang.String dbjld; /**论文终稿*/ @Excel(name = "论文终稿", width = 15) @ApiModelProperty(value = "论文终稿") diff --git a/jeecgboot-vue3/src/views/bl/lwKhclXz/LwKhclXzListIndex.vue b/jeecgboot-vue3/src/views/bl/lwKhclXz/LwKhclXzListIndex.vue index e9829c7..2b6a51d 100644 --- a/jeecgboot-vue3/src/views/bl/lwKhclXz/LwKhclXzListIndex.vue +++ b/jeecgboot-vue3/src/views/bl/lwKhclXz/LwKhclXzListIndex.vue @@ -87,6 +87,18 @@ + + + + + + + + + + + + 查询 @@ -245,6 +257,15 @@
暂无文件
+ +
+
下载答辩记录单
+ +
+
暂无文件
+ @@ -263,11 +284,22 @@ class="query-criteria" > - + + + + + + @@ -306,7 +338,19 @@ - + + + + + + + + + + + + + 查询 @@ -358,6 +402,7 @@ const zqjcUrl = ref(''); const lwzgUrl = ref(''); const zdjldUrl = ref(''); const jcbgUrl = ref(''); +const dbjldUrl = ref(''); //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ @@ -435,6 +480,9 @@ async function handleChakan(record) { if (record.zdjld) { filename = filename+record.zdjld+","; } + if (record.dbjld) { + filename = filename+record.dbjld+","; + } if(filename){ console.log("filename--->",filename) @@ -497,6 +545,17 @@ async function handleChakan(record) { } else { jcbgUrl.value = ''; } + + dbjldUrl.value = ''; + if (record.dbjld) { + var file = record.dbjld; + file = file.substring(0,file.lastIndexOf(".")) + xsxh + file.substring(file.lastIndexOf("."),file.length); + console.log("🚀 ~ handleChakan ~ record.dbjld:", file) + var file1 = getFileAccessHttpUrl(file.replaceAll(" ","")); + dbjldUrl.value = 'https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file1)); + } else { + dbjldUrl.value = ''; + } } diff --git a/jeecgboot-vue3/src/views/bl/lwKhclXz/Xzlwkhcl.vue b/jeecgboot-vue3/src/views/bl/lwKhclXz/Xzlwkhcl.vue index 007579b..4363ea3 100644 --- a/jeecgboot-vue3/src/views/bl/lwKhclXz/Xzlwkhcl.vue +++ b/jeecgboot-vue3/src/views/bl/lwKhclXz/Xzlwkhcl.vue @@ -62,11 +62,23 @@ class="query-criteria" > - + + + + + + + @@ -105,7 +117,19 @@ - + + + + + + + + + + + + + 查询 @@ -258,6 +282,15 @@
暂无文件
+ +
+
下载答辩记录单
+ +
+
暂无文件
+ @@ -303,6 +336,7 @@ const zqjcUrl = ref(''); const lwzgUrl = ref(''); const zdjldUrl = ref(''); const jcbgUrl = ref(''); +const dbjldUrl = ref(''); let onlinePreviewDomain = ''; //注册table数据 @@ -380,6 +414,9 @@ async function handleChakan(record) { if (record.zdjld) { filename = filename+record.zdjld+","; } + if (record.dbjld) { + filename = filename+record.dbjld+","; + } if(filename){ console.log("filename--->",filename) @@ -443,6 +480,17 @@ async function handleChakan(record) { jcbgUrl.value = ''; } + + dbjldUrl.value = ''; + if (record.dbjld) { + var file = record.dbjld; + file = file.substring(0,file.lastIndexOf(".")) + xsxh + file.substring(file.lastIndexOf("."),file.length); + console.log("🚀 ~ handleChakan ~ record.dbjld:", file) + var file1 = getFileAccessHttpUrl(file.replaceAll(" ","")); + dbjldUrl.value = 'https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file1)); + } else { + dbjldUrl.value = ''; + } } const getViewFileDomain = () => defHttp.get({ url: '/sys/comment/getFileViewDomain' }); diff --git a/jeecgboot-vue3/src/views/bl/shangbaoPracticePaln/PracticePlanCkList.vue b/jeecgboot-vue3/src/views/bl/shangbaoPracticePaln/PracticePlanCkList.vue index 31e2c5e..a8e9be9 100644 --- a/jeecgboot-vue3/src/views/bl/shangbaoPracticePaln/PracticePlanCkList.vue +++ b/jeecgboot-vue3/src/views/bl/shangbaoPracticePaln/PracticePlanCkList.vue @@ -336,11 +336,12 @@ async function handleChakan(record) { dataList4.value = []; dataList5.value = []; //查询数量及要求 - defHttp.get({ url: '/shangbaoPracticePaln/shangbaoPracticePalnTimeTask/list',params:{planId:record.planId,pageSize:-1} }).then((res) => { + defHttp.get({ url: '/shangbaoPracticePaln/shangbaoPracticePalnTimeTask/list',params:{planId:record.planId,orgId:record.orgId,pageSize:-1} }).then((res) => { + console.log("🚀 ~ defHttp.get ~ res:", res) dataList2.value = res.records; }); //查询学生名单 - defHttp.get({ url: '/shangbaoPracticePaln/shangbaoPracticePalnUser/list',params:{planId:record.planId,pageSize:-1} }).then((res) => { + defHttp.get({ url: '/shangbaoPracticePaln/shangbaoPracticePalnUser/list',params:{planId:record.planId,orgId:record.orgId,pageSize:-1} }).then((res) => { dataList3.value = res.records; }); } diff --git a/jeecgboot-vue3/src/views/bl/shangbaoPracticePaln/PracticePlanXzList.vue b/jeecgboot-vue3/src/views/bl/shangbaoPracticePaln/PracticePlanXzList.vue index 2014a67..c2d8b26 100644 --- a/jeecgboot-vue3/src/views/bl/shangbaoPracticePaln/PracticePlanXzList.vue +++ b/jeecgboot-vue3/src/views/bl/shangbaoPracticePaln/PracticePlanXzList.vue @@ -44,6 +44,17 @@ class="query-criteria" > + + + + + + @@ -56,7 +67,7 @@ - + 查询 @@ -295,11 +306,12 @@ async function handleChakan(record) { dataList4.value = []; dataList5.value = []; //查询数量及要求 - defHttp.get({ url: '/shangbaoPracticePaln/shangbaoPracticePalnTimeTask/list',params:{planId:record.planId,pageSize:-1} }).then((res) => { + defHttp.get({ url: '/shangbaoPracticePaln/shangbaoPracticePalnTimeTask/list',params:{planId:record.planId,orgId:record.orgId,pageSize:-1} }).then((res) => { + console.log("🚀 ~ defHttp.get ~ res:", res) dataList2.value = res.records; }); //查询学生名单 - defHttp.get({ url: '/shangbaoPracticePaln/shangbaoPracticePalnUser/list',params:{planId:record.planId,pageSize:-1} }).then((res) => { + defHttp.get({ url: '/shangbaoPracticePaln/shangbaoPracticePalnUser/list',params:{planId:record.planId,orgId:record.orgId,pageSize:-1} }).then((res) => { dataList3.value = res.records; }); } diff --git a/jeecgboot-vue3/src/views/bl/shangbaoPracticePaln/ShangbaoPracticePlanInfo.data.ts b/jeecgboot-vue3/src/views/bl/shangbaoPracticePaln/ShangbaoPracticePlanInfo.data.ts index cee6d3e..266e0dc 100644 --- a/jeecgboot-vue3/src/views/bl/shangbaoPracticePaln/ShangbaoPracticePlanInfo.data.ts +++ b/jeecgboot-vue3/src/views/bl/shangbaoPracticePaln/ShangbaoPracticePlanInfo.data.ts @@ -28,6 +28,11 @@ export const columns2: BasicColumn[] = [ return parseInt(index) + 1; }, }, + { + title: '学院', + align: "center", + dataIndex: 'orgName' + }, { title: '实践计划名称', align: "center", @@ -47,6 +52,11 @@ export const columns2: BasicColumn[] = [ ]; export const columns3: BasicColumn[] = [ + { + title: '学院', + align: "center", + dataIndex: 'orgName' + }, { title: '实践计划名称', align: "center", diff --git a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue index b392c57..4056484 100644 --- a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue +++ b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue @@ -173,7 +173,7 @@ - +