yangjun
/
DBSD_ZJPT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2025-05-19 14:19:36 +08:00
parent 45013d350b
commit cb12d489a1
13 changed files with 178 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/entity/LwKhcl.java
View File

@ -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;

6
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhcl/mapper/xml/LwKhclMapper.xml
View File

@ -154,6 +154,12 @@
<if test="lwKhcl.bylwCj != null and lwKhcl.bylwCj != ''">
and a.bylw_cj = #{lwKhcl.bylwCj}
</if>
<if test="lwKhcl.zdjsxm != null and lwKhcl.zdjsxm != ''">
and a.zdjsxm like concat('%',#{lwKhcl.zdjsxm},'%')
</if>
<if test="lwKhcl.zdjszc != null and lwKhcl.zdjszc != ''">
and a.zdjszc like concat('%',#{lwKhcl.zdjszc},'%')
</if>
<if test="lwKhcl.inSsyxmc != null and lwKhcl.inSsyxmc != ''">
and a.ssyxmc in

4
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/lwKhclXz/entity/LwKhclXz.java
View File

@ -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 = "论文终稿")

4
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/shangbaoPracticePaln/controller/ShangbaoPracticePlanInfoXzController.java
View File

@ -217,9 +217,9 @@ public class ShangbaoPracticePlanInfoXzController extends JeecgController<Shangb
int i=0;
for(String ta : zjSqxx.getKkdw().split(",")){
if(i==0){
sqlParams = sqlParams + " FIND_IN_SET('"+ta+"',c.org_name) ";
sqlParams = sqlParams + " c.org_name like '%"+ta+"%' ";
}else{
sqlParams = sqlParams + " or FIND_IN_SET('"+ta+"',c.org_name) ";
sqlParams = sqlParams + " or c.org_name like '%"+ta+"%' ";
}
i++;
}

6
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/shangbaoPracticePaln/entity/ShangbaoPracticePlanInfoXz.java
View File

@ -57,7 +57,11 @@ public class ShangbaoPracticePlanInfoXz implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "createTime")
private java.util.Date createTime;
/**orgId*/
private java.lang.String orgId;
/**orgName*/
private java.lang.String orgName;
@TableField(exist = false)
private String orgName;
private String corgName;
}

18
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/shangbaoPracticePaln/mapper/xml/ShangbaoPracticePlanInfoXzMapper.xml
View File

@ -3,9 +3,9 @@
<mapper namespace="org.jeecg.modules.demo.shangbaoPracticePaln.mapper.ShangbaoPracticePlanInfoXzMapper">
<select id="getZjList" resultType="org.jeecg.modules.demo.shangbaoPracticePaln.entity.ShangbaoPracticePlanInfoXz">
select a.id,a.plan_id,a.plan_name,a.plan_type_name,b.create_by,c.org_name from shangbao_practice_plan_info a
left join shangbao_practice_plan_info_xz b on a.plan_id = b.plan_id and b.create_by = #{sxsjkhcl.createBy}
left join (select plan_id,GROUP_CONCAT(org_name) as org_name from shangbao_practice_plan_org GROUP BY plan_id ) c on a.plan_id = c.plan_id
select a.id,a.plan_id,a.plan_name,a.plan_type_name,b.create_by,c.org_name as orgName,c.org_id from shangbao_practice_plan_info a
left join shangbao_practice_plan_org c on a.plan_id = c.plan_id
left join shangbao_practice_plan_info_xz b on a.plan_id = b.plan_id and b.org_id = c.org_id and b.create_by = #{sxsjkhcl.createBy}
where 1=1
<if test="sxsjkhcl.planName != null and sxsjkhcl.planName != ''">
and a.plan_name like concat('%',#{sxsjkhcl.planName},'%')
@ -16,8 +16,16 @@
<if test="sxsjkhcl.orgName != null and sxsjkhcl.orgName != ''">
and ${sxsjkhcl.orgName}
</if>
<if test="sxsjkhcl.planYear != null and sxsjkhcl.planYear != ''">
and a.plan_year = #{sxsjkhcl.planYear}
<if test="sxsjkhcl.orgId != null and sxsjkhcl.orgId != ''">
and c.org_id = #{sxsjkhcl.orgId}
</if>
<if test="sxsjkhcl.planYear != null and sxsjkhcl.planYear != ''">
and a.plan_year in
<foreach item="item" index="index" collection="sxsjkhcl.planYear.split(',')" open="(" separator="," close=")">
#{item}
</foreach>
</if>
order by c.org_id
</select>
</mapper>

4
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/vLwKhcl/entity/VLwKhcl.java
View File

@ -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 = "论文终稿")

63
jeecgboot-vue3/src/views/bl/lwKhclXz/LwKhclXzListIndex.vue
View File

@ -87,6 +87,18 @@
</a-select>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="zdjsxm">
<template #label><span title="指导教师">指导教师</span></template>
<a-input placeholder="请输入指导教师" v-model:value="queryParam2.zdjsxm" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="zdjszc">
<template #label><span title="职称">职称</span></template>
<a-input placeholder="请输入职称" v-model:value="queryParam2.zdjszc" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12" style="text-align: right">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery2">查询</a-button>
</a-col>
@ -245,6 +257,15 @@
</div>
<div v-else style="height: 300px; line-height: 300px; text-align: center">暂无文件</div>
</a-tab-pane>
<a-tab-pane key="7" tab="答辩记录单">
<div v-if="lwinfo.value.dbjld">
<div style="width: 100; text-align: right; padding: 10px"
><a-button type="primary" @click="handleDownload(lwinfo.value.dbjld)">下载答辩记录单</a-button></div
>
<iframe :src="dbjldUrl" width="100%" height="600px"></iframe>
</div>
<div v-else style="height: 300px; line-height: 300px; text-align: center">暂无文件</div>
</a-tab-pane>
</a-tabs>
</a-form>
</div>
@ -263,11 +284,22 @@
class="query-criteria"
>
<a-row :gutter="24">
<a-col :lg="6">
<!-- <a-col :lg="6">
<a-form-item name="ssyxmc">
<template #label><span title="院系名称">院系名称</span></template>
<j-input placeholder="请输入院系名称" v-model:value="queryParam.ssyxmc" allow-clear></j-input>
</a-form-item>
</a-col> -->
<a-col :lg="6">
<a-form-item name="ssyxmc">
<template #label><span title="院系名称">院系名称</span></template>
<j-dict-select-tag
placeholder="请选择院系名称"
v-model:value="queryParam.ssyxmc"
:dictCode="`v_kkdw,kkyxmc,kkyxmc`"
allow-clear
/>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="ssxnzymc">
@ -306,7 +338,19 @@
</a-select>
</a-form-item>
</a-col>
<a-col :span="12" style="text-align: right">
<a-col :lg="6">
<a-form-item name="zdjsxm">
<template #label><span title="指导教师">指导教师</span></template>
<a-input placeholder="请输入指导教师" v-model:value="queryParam.zdjsxm" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="zdjszc">
<template #label><span title="职称">职称</span></template>
<a-input placeholder="请输入职称" v-model:value="queryParam.zdjszc" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="24" style="text-align: right">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
</a-col>
</a-row>
@ -358,6 +402,7 @@ const zqjcUrl = ref<string>('');
const lwzgUrl = ref<string>('');
const zdjldUrl = ref<string>('');
const jcbgUrl = ref<string>('');
const dbjldUrl = ref<string>('');
//注册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 = '';
}
}

52
jeecgboot-vue3/src/views/bl/lwKhclXz/Xzlwkhcl.vue
View File

@ -62,11 +62,23 @@
class="query-criteria"
>
<a-row :gutter="24">
<a-col :lg="6">
<!-- <a-col :lg="6">
<a-form-item name="ssyxmc">
<template #label><span title="院系名称">院系名称</span></template>
<a-input placeholder="请输入院系名称" v-model:value="queryParam2.ssyxmc" allow-clear></a-input>
</a-form-item>
</a-col> -->
<a-col :lg="6">
<a-form-item name="ssyxmc">
<template #label><span title="院系名称">院系名称</span></template>
<j-dict-select-tag
placeholder="请选择院系名称"
v-model:value="queryParam2.ssyxmc"
:dictCode="`v_kkdw,kkyxmc,kkyxmc`"
allow-clear
/>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="ssxnzymc">
@ -105,7 +117,19 @@
</a-select>
</a-form-item>
</a-col>
<a-col :span="12" style="text-align: right">
<a-col :lg="6">
<a-form-item name="zdjsxm">
<template #label><span title="指导教师">指导教师</span></template>
<a-input placeholder="请输入指导教师" v-model:value="queryParam2.zdjsxm" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="zdjszc">
<template #label><span title="职称">职称</span></template>
<a-input placeholder="请输入职称" v-model:value="queryParam2.zdjszc" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="24" style="text-align: right">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery2">查询</a-button>
</a-col>
</a-row>
@ -258,6 +282,15 @@
</div>
<div v-else style="height: 300px; line-height: 300px; text-align: center">暂无文件</div>
</a-tab-pane>
<a-tab-pane key="7" tab="答辩记录单">
<div v-if="lwinfo.value.dbjld">
<div style="width: 100; text-align: right; padding: 10px"
><a-button type="primary" @click="handleDownload(lwinfo.value.dbjld)">下载答辩记录单</a-button></div
>
<iframe :src="dbjldUrl" width="100%" height="600px"></iframe>
</div>
<div v-else style="height: 300px; line-height: 300px; text-align: center">暂无文件</div>
</a-tab-pane>
</a-tabs>
</a-form>
</div>
@ -303,6 +336,7 @@ const zqjcUrl = ref<string>('');
const lwzgUrl = ref<string>('');
const zdjldUrl = ref<string>('');
const jcbgUrl = ref<string>('');
const dbjldUrl = ref<string>('');
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' });

5
jeecgboot-vue3/src/views/bl/shangbaoPracticePaln/PracticePlanCkList.vue
View File

@ -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;
});
}

18
jeecgboot-vue3/src/views/bl/shangbaoPracticePaln/PracticePlanXzList.vue
View File

@ -44,6 +44,17 @@
class="query-criteria"
>
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="planTypeName">
<template #label><span title="学院">学院</span></template>
<j-dict-select-tag
placeholder="请选择学院"
v-model:value="queryParam2.orgId"
:dictCode="`v_shangbao_org,org_name,org_id`"
allow-clear
/>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="planName">
<template #label><span title="实践计划名称">实践计划名称</span></template>
@ -56,7 +67,7 @@
<a-input placeholder="请输入实践计划类型" v-model:value="queryParam2.planTypeName" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12" style="text-align: right">
<a-col :span="6" style="text-align: right">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery2">查询</a-button>
</a-col>
</a-row>
@ -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;
});
}

10
jeecgboot-vue3/src/views/bl/shangbaoPracticePaln/ShangbaoPracticePlanInfo.data.ts
View File

@ -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",

2
jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue
View File

@ -173,7 +173,7 @@
<a-row>
<a-col :span="24">
<a-form-item label="学年学期" id="ZjSqxxForm-xnxq" name="xnxq">
<j-dict-select-tag v-model:value="formData.xnxq" dictCode="xnxq" placeholder="请选择学年学期，如果不选，默认全部" allow-clear />
<JSelectMultiple v-model:value="formData.xnxq" placeholder="请选择学年学期，如果不选，默认全部" dictCode="xnxq"></JSelectMultiple>
</a-form-item>
</a-col>
<a-col :span="24">