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

Merge branch 'main' of http://47.115.223.229:8888/yangjun/DBSD_ZJPT into main 

# Conflicts:
#	jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList3.vue
This commit is contained in:
kbing1981 2024-09-14 11:56:11 +08:00
parent 4b5392ecdc 4b0aaf0ee0
commit bc15e700fe
16 changed files with 116 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/controller/XxhbjwxtjxrwController.java
View File

@ -114,6 +114,7 @@ public class XxhbjwxtjxrwController extends JeecgController<Xxhbjwxtjxrw, IXxhbj
return Result.error("您未在授权期限内，不能进行查询！");
}
queryWrapper.eq(StringUtils.isNotBlank(xxhbjwxtjxrw.getZjxnxq()),"concat(xn,xqmc)",xxhbjwxtjxrw.getZjxnxq());
queryWrapper.like(StringUtils.isNotBlank(xxhbjwxtjxrw.getZhuanye()),"zymc",xxhbjwxtjxrw.getZhuanye());
queryWrapper.like(StringUtils.isNotBlank(xxhbjwxtjxrw.getZhicheng()),"teaxm",xxhbjwxtjxrw.getZhicheng());
@ -134,17 +135,22 @@ public class XxhbjwxtjxrwController extends JeecgController<Xxhbjwxtjxrw, IXxhbj
QueryWrapper<ZjXkxx> zjXkxxQueryWrapper = new QueryWrapper<>();
zjXkxxQueryWrapper.eq("user_id",sysUser.getUsername());
List<ZjXkxx> list = zjXkxxService.list(zjXkxxQueryWrapper);
zjXkxxQueryWrapper.eq(StringUtils.isNotBlank(xxhbjwxtjxrw.getZjxnxq()),"concat(xn,xqmc)",xxhbjwxtjxrw.getZjxnxq());
List<ZjXkxx> list = zjXkxxService.zjList(zjXkxxQueryWrapper);
if(list!=null&&list.size()>0){
StringBuffer sb = new StringBuffer();
for(ZjXkxx zjXkxx:list){
sb.append(zjXkxx.getKcrwdm()+",");
}
queryWrapper.in("kcrwdm",sb.toString().split(","));
}else{
IPage<Xxhbjwxtjxrw> pageList = new Page<>();
return Result.OK(pageList);
}
queryWrapper.eq(StringUtils.isNotBlank(xxhbjwxtjxrw.getZjxnxq()),"concat(xn,xqmc)",xxhbjwxtjxrw.getZjxnxq());
queryWrapper.like(StringUtils.isNotBlank(xxhbjwxtjxrw.getZhuanye()),"zymc",xxhbjwxtjxrw.getZhuanye());
queryWrapper.like(StringUtils.isNotBlank(xxhbjwxtjxrw.getZhicheng()),"teaxm",xxhbjwxtjxrw.getZhicheng());
queryWrapper.apply(StringUtils.isNotBlank(xxhbjwxtjxrw.getZhicheng()),"SUBSTRING(TEAXM,LOCATE('[',TEAXM)+1,locate(']',TEAXM)-locate('[',TEAXM)-1) = '"+xxhbjwxtjxrw.getZhicheng()+"'");
Page<Xxhbjwxtjxrw> page = new Page<Xxhbjwxtjxrw>(pageNo, pageSize);
IPage<Xxhbjwxtjxrw> pageList = xxhbjwxtjxrwService.page(page, queryWrapper);
return Result.OK(pageList);

2
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/entity/Xxhbjwxtjxrw.java
View File

@ -100,4 +100,6 @@ public class Xxhbjwxtjxrw implements Serializable {
private java.lang.String zhuanye;
@TableField(exist = false)
private java.lang.String zhicheng;
@TableField(exist = false)
private java.lang.String zjxnxq;//专家展示学年学期
}

4
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/mapper/xml/XxhbjwxtjxrwMapper.xml
View File

@ -2,4 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.demo.xxhbjwxtjxrw.mapper.XxhbjwxtjxrwMapper">
<select id="selectList" resultType="org.jeecg.modules.demo.xxhbjwxtjxrw.entity.Xxhbjwxtjxrw">
select *,concat(xn,xqmc) as zjxnxq from xxhbjwxtjxrw
${ew.customSqlSegment}
</select>
</mapper>

2
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/mapper/xml/XxhbjwxtxsmdMapper.xml
View File

@ -19,8 +19,8 @@
<foreach collection="xxhbjwxtxsmd.studentNo" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
and b.student_path is not null
</if>
and b.student_path is not null
order by b.student_path desc
</select>
</mapper>

12
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjXkxx/entity/ZjXkxx.java
View File

@ -4,10 +4,8 @@ import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
@ -72,7 +70,11 @@ public class ZjXkxx implements Serializable {
private java.lang.String zhuanye;//专业
private java.lang.String zxs;//学时
private java.lang.String zymc;//专业名称
private java.lang.String xkrs;//选课人数
private java.lang.String jxbrs;//选课人数
@TableField(exist = false)
private java.lang.String zjxnxq;//专家展示学年学期
}

3
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjXkxx/mapper/ZjXkxxMapper.java
View File

@ -2,6 +2,8 @@ package org.jeecg.modules.demo.zjXkxx.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.demo.zjXkxx.entity.ZjXkxx;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -14,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface ZjXkxxMapper extends BaseMapper<ZjXkxx> {
List<ZjXkxx> zjList(@Param(Constants.WRAPPER) QueryWrapper<ZjXkxx> zjXkxxQueryWrapper);
}

13
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjXkxx/mapper/xml/ZjXkxxMapper.xml
View File

@ -2,4 +2,17 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.demo.zjXkxx.mapper.ZjXkxxMapper">
<select id="zjList" resultType="org.jeecg.modules.demo.zjXkxx.entity.ZjXkxx">
select *,concat(xn,xqmc) as zjxnxq from zj_xkxx
${ew.customSqlSegment}
</select>
<select id="selectList" resultType="org.jeecg.modules.demo.zjXkxx.entity.ZjXkxx">
select *,concat(xn,xqmc) as zjxnxq from zj_xkxx
${ew.customSqlSegment}
</select>
</mapper>

4
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjXkxx/service/IZjXkxxService.java
View File

@ -1,8 +1,11 @@
package org.jeecg.modules.demo.zjXkxx.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.jeecg.modules.demo.zjXkxx.entity.ZjXkxx;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* @Description: 专家选课信息
* @Author: jeecg-boot
@ -11,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IZjXkxxService extends IService<ZjXkxx> {
List<ZjXkxx> zjList(QueryWrapper<ZjXkxx> zjXkxxQueryWrapper);
}

8
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjXkxx/service/impl/ZjXkxxServiceImpl.java
View File

@ -1,5 +1,6 @@
package org.jeecg.modules.demo.zjXkxx.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.jeecg.modules.demo.zjXkxx.entity.ZjXkxx;
import org.jeecg.modules.demo.zjXkxx.mapper.ZjXkxxMapper;
import org.jeecg.modules.demo.zjXkxx.service.IZjXkxxService;
@ -7,6 +8,9 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.Collections;
import java.util.List;
/**
* @Description: 专家选课信息
* @Author: jeecg-boot
@ -16,4 +20,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class ZjXkxxServiceImpl extends ServiceImpl<ZjXkxxMapper, ZjXkxx> implements IZjXkxxService {
@Override
public List<ZjXkxx> zjList(QueryWrapper<ZjXkxx> zjXkxxQueryWrapper) {
return baseMapper.zjList(zjXkxxQueryWrapper);
}
}

2
jeecgboot-vue3/.env.development
View File

@ -18,4 +18,4 @@ VITE_GLOB_API_URL=/jeecgboot
VITE_GLOB_API_URL_PREFIX=
#微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径
VITE_APP_SUB_jeecg-app-1 = '//192.168.2.13:8092'
VITE_APP_SUB_jeecg-app-1 = '//localhost:8092'

97
jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/Xxhbjwxtjxrw.data.ts
View File

@ -101,7 +101,7 @@ export const columns2: BasicColumn[] = [
{
title: '学年学期',
align: "center",
dataIndex: 'xnxqdm',
dataIndex: 'zjxnxq',
ellipsis: true,
},
{
@ -110,32 +110,32 @@ export const columns2: BasicColumn[] = [
dataIndex: 'kcmc',
ellipsis: true,
},
{
title: '课程号',
align: "center",
dataIndex: 'kcrwdm',
ellipsis: true,
},
// {
// title: '课程号',
// align: "center",
// dataIndex: 'kcrwdm',
// ellipsis: true,
// },
{
title: '课程类别',
align: "center",
dataIndex: 'kclb',
ellipsis: true,
},
{
title: '学分',
align: "center",
dataIndex: 'xf',
width: 80,
ellipsis: true,
},
{
title: '学时',
align: "center",
dataIndex: 'zxs',
width: 80,
ellipsis: true,
},
// {
// title: '学分',
// align: "center",
// dataIndex: 'xf',
// width: 80,
// ellipsis: true,
// },
// {
// title: '学时',
// align: "center",
// dataIndex: 'zxs',
// width: 80,
// ellipsis: true,
// },
{
title: '开课单位名称',
align: "center",
@ -155,28 +155,40 @@ export const columns2: BasicColumn[] = [
dataIndex: 'teaxm',
ellipsis: true,
},
// {
// title: '班级',
// align: "center",
// dataIndex: 'bjxx',
// ellipsis: true,
// },
// {
// title: '学年',
// align: "center",
// dataIndex: 'xn',
// ellipsis: true,
// },
// {
// title: '学期',
// align: "center",
// dataIndex: 'xqmc',
// ellipsis: true,
// },
// {
// title: '试卷份数',
// align: "center",
// dataIndex: 'sjfs',
// ellipsis: true,
// },
{
title: '班级',
title: '选课人数',
align: "center",
dataIndex: 'bjxx',
dataIndex: 'jxbrs',
ellipsis: true,
},
{
title: '学年',
title: '考试方式',
align: "center",
dataIndex: 'xn',
ellipsis: true,
},
{
title: '学期',
align: "center",
dataIndex: 'xqmc',
ellipsis: true,
},
{
title: '试卷份数',
align: "center",
dataIndex: 'sjfs',
dataIndex: 'khfsmc',
ellipsis: true,
},
{
@ -190,14 +202,9 @@ export const columns2: BasicColumn[] = [
//列表数据
export const columns3: BasicColumn[] = [
{
title: '学年',
title: '学年学期',
align: "center",
dataIndex: 'xn'
},
{
title: '学期',
align: "center",
dataIndex: 'xqmc'
dataIndex: 'zjxnxq'
},
{
title: '课程名称',
@ -231,7 +238,7 @@ export const columns3: BasicColumn[] = [
dataIndex: 'khfsmc'
},
// {
// title: '成绩单',
// title: '学生成绩',
// align: "center",
// dataIndex: 'cjd',
// slots: { customRender: 'cjd' },

2
jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/CjdForm.vue
View File

@ -10,7 +10,7 @@
</a-col>
<a-col :gutter="24">
<div style="text-align: center; font-size:24px; font-weight: 700; line-height: 50px" v-if="jxrwInfo.value">
{{ jxrwInfo?.value.xn }}{{ jxrwInfo?.value.xqmc }}学期《{{ jxrwInfo?.value.kcmc }}》课程考核材料
{{ jxrwInfo?.value.xn }}{{ jxrwInfo?.value.xqmc }}学期《{{ jxrwInfo?.value.kcmc }}》
</div>
<div v-if="jxrwInfo.value">
<div style="padding-left:14px; font-size:16px; font-weight: 700">概要信息</div>

2
jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/CjdModal.vue
View File

@ -32,7 +32,7 @@
* @param record
*/
function init(record) {
title.value = '成绩单';
title.value = '学生成绩';
visible.value = true;
nextTick(() => {
registerForm.value.init(record);

8
jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/XxhbjwxtscwjxxList.vue
View File

@ -83,8 +83,8 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
useSearchForm: false,
// showActionColumn: false,
actionColumn: {
width: 120,
fixed: 'right',
width: 320,
// fixed: 'right',
},
beforeFetch: async (params) => {
return Object.assign(params, queryParam);
@ -172,7 +172,7 @@ async function batchHandleDelete() {
* 批量下载事件
*/
async function batchHandleDown() {
var downName = '考核评价材料'+dayjs().format('YYYYMMDDHHmmss')+"";
var downName = '《'+jxrwInfo?.value.kcmc+'》考核评价材料'+dayjs().format('YYYYMMDDHHmmss')+"";
defHttp.post({ url: "/xxhbjwxtscwjxx/xxhbjwxtscwjxx/getBatchDown", params: { downPath: selectedRowKeys.value,downName } }).then((res) => {
console.log(res);
downloadFileLoacl(res.path);
@ -258,7 +258,7 @@ function searchReset() {
function init(record) {
queryParam.kcrwdm = record.kcrwdm;
queryParam.fjtype =
'过程性考核-论文,历次过程性考核-评分标准,课程目标达成情况评价报告,课程考核合理性审核记录单,历次过程性考核-内容及要求（或试题）,课程考核质量评价单,期未考试-试题（或内容及要求）,期末考试-评分标准';
'历次过程性考核-评分标准,课程目标达成情况评价报告,课程考核合理性审核记录单,历次过程性考核-内容及要求（或试题）,课程考核质量评价单,期未考试-试题（或内容及要求）,期末考试-评分标准';
// 平时成绩
// 期末成绩
// 期中成绩

6
jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts
View File

@ -286,6 +286,12 @@ export const columns3: BasicColumn[] = [
align: "center",
dataIndex: 'cj1',
width: 100,
// defaultHidden: ({text}) =>{
// if(text){
// }
// return true;
// },
},
{
title: '平时成绩2',

2
jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList4.vue
View File

@ -270,7 +270,7 @@ line-height: 30px;
color: #1890ff;
}
.query-criteria{
padding:10px 10px 15px 10px;
padding:15px 10px 15px 10px;
border:1px solid #e4e9f2;
border-radius:4px;
}