修改样式

This commit is contained in:
yangjun 2025-01-14 10:05:12 +08:00
parent 824f575cff
commit f6b24005a1
41 changed files with 1922 additions and 108 deletions

View File

@ -2,6 +2,7 @@ package org.jeecg.common.system.query;
import java.beans.PropertyDescriptor;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.net.URLDecoder;
import java.text.ParseException;
@ -11,6 +12,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.annotation.TableField;
import org.apache.commons.beanutils.PropertyUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
@ -113,6 +115,187 @@ public class QueryGenerator {
}
//update-end---author:chenrui ---date:20240527 for[TV360X-378]增加自定义字段查询规则功能------------
/**
* 获取查询条件构造器QueryWrapper实例 通用查询条件已被封装完成
* @param searchObj 查询实体
* @param parameterMap request.getParameterMap()
* @return QueryWrapper实例
*/
public static <T> QueryWrapper<T> initQueryWrapper(String columnPrefix,T searchObj,Map<String, String[]> parameterMap){
long start = System.currentTimeMillis();
QueryWrapper<T> queryWrapper = new QueryWrapper<T>();
installMplus(queryWrapper, columnPrefix, searchObj, parameterMap);
log.debug("---查询条件构造器初始化完成,耗时:"+(System.currentTimeMillis()-start)+"毫秒----");
return queryWrapper;
}
/**
* 组装Mybatis Plus 查询条件
* <p>使用此方法 需要有如下几点注意:
* <br>1.使用QueryWrapper 而非LambdaQueryWrapper;
* <br>2.实例化QueryWrapper时不可将实体传入参数
* <br>错误示例:如QueryWrapper<JeecgDemo> queryWrapper = new QueryWrapper<JeecgDemo>(jeecgDemo);
* <br>正确示例:QueryWrapper<JeecgDemo> queryWrapper = new QueryWrapper<JeecgDemo>();
* <br>3.也可以不使用这个方法直接调用 {@link #initQueryWrapper}直接获取实例
*/
private static void installMplus(QueryWrapper<?> queryWrapper,String columnPrefix,Object searchObj,Map<String, String[]> parameterMap) {
/*
* 注意:权限查询由前端配置数据规则 当一个人有多个所属部门时候 可以在规则配置包含条件 orgCode 包含 #{sys_org_code}
但是不支持在自定义SQL中写orgCode in #{sys_org_code}
当一个人只有一个部门 就直接配置等于条件: orgCode 等于 #{sys_org_code} 或者配置自定义SQL: orgCode = '#{sys_org_code}'
*/
//区间条件组装 模糊查询 高级查询组装 简单排序 权限查询
PropertyDescriptor[] origDescriptors = PropertyUtils.getPropertyDescriptors(searchObj);
Map<String,SysPermissionDataRuleModel> ruleMap = getRuleMap();
//权限规则自定义SQL表达式
for (String c : ruleMap.keySet()) {
if(oConvertUtils.isNotEmpty(c) && c.startsWith(SQL_RULES_COLUMN)){
queryWrapper.and(i ->i.apply(getSqlRuleValue(ruleMap.get(c).getRuleValue())));
}
}
String name, type, column;
// update-begin--Author:taoyan Date:20200923 forissues/1671 如果字段加注解了@TableField(exist = false),不走DB查询-------
//定义实体字段和数据库字段名称的映射 高级查询中 只能获取实体字段 如果设置TableField注解 那么查询条件会出问题
Map<String,String> fieldColumnMap = new HashMap<>(5);
for (int i = 0; i < origDescriptors.length; i++) {
//aliasName = origDescriptors[i].getName(); mybatis 不存在实体属性 不用处理别名的情况
name = origDescriptors[i].getName();
type = origDescriptors[i].getPropertyType().toString();
try {
if (judgedIsUselessField(name)|| !PropertyUtils.isReadable(searchObj, name)) {
continue;
}
Object value = PropertyUtils.getSimpleProperty(searchObj, name);
column = getTableFieldName(searchObj.getClass(), name);
if(column==null){
//column为null只有一种情况 那就是 添加了注解@TableField(exist = false) 后续都不用处理了
continue;
}
//二开项目组新增为了支持多表添加别名
if(oConvertUtils.isNotEmpty(columnPrefix)){
column = columnPrefix + "." + column;
}
fieldColumnMap.put(name,column);
//数据权限查询
if(ruleMap.containsKey(name)) {
addRuleToQueryWrapper(ruleMap.get(name), column, origDescriptors[i].getPropertyType(), queryWrapper);
}
//区间查询
doIntervalQuery(queryWrapper, parameterMap, type, name, column);
//判断单值 参数带不同标识字符串 走不同的查询
//TODO 这种前后带逗号的支持分割后模糊查询(多选字段查询生效) 示例,1,3,
if (null != value && value.toString().startsWith(COMMA) && value.toString().endsWith(COMMA)) {
String multiLikeval = value.toString().replace(",,", COMMA);
String[] vals = multiLikeval.substring(1, multiLikeval.length()).split(COMMA);
final String field = oConvertUtils.camelToUnderline(column);
if(vals.length>1) {
queryWrapper.and(j -> {
log.info("---查询过滤器Query规则---field:{}, rule:{}, value:{}", field, "like", vals[0]);
j = j.like(field,vals[0]);
for (int k=1;k<vals.length;k++) {
j = j.or().like(field,vals[k]);
log.info("---查询过滤器Query规则 .or()---field:{}, rule:{}, value:{}", field, "like", vals[k]);
}
//return j;
});
}else {
log.info("---查询过滤器Query规则---field:{}, rule:{}, value:{}", field, "like", vals[0]);
queryWrapper.and(j -> j.like(field,vals[0]));
}
}else {
//根据参数值带什么关键字符串判断走什么类型的查询
QueryRuleEnum rule = convert2Rule(value);
value = replaceValue(rule,value);
// add -begin 添加判断为字符串时设为全模糊查询
//if( (rule==null || QueryRuleEnum.EQ.equals(rule)) && "class java.lang.String".equals(type)) {
// 可以设置左右模糊或全模糊因人而异
//rule = QueryRuleEnum.LIKE;
//}
// add -end 添加判断为字符串时设为全模糊查询
addEasyQuery(queryWrapper, column, rule, value);
}
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
// 排序逻辑 处理
doMultiFieldsOrder(queryWrapper, parameterMap, fieldColumnMap);
//高级查询
doSuperQuery(queryWrapper, parameterMap, fieldColumnMap);
// update-end--Author:taoyan Date:20200923 forissues/1671 如果字段加注解了@TableField(exist = false),不走DB查询-------
}
/**
* 获取表字段名
* @param clazz
* @param name
* @return
*/
private static String getTableFieldName(Class<?> clazz, String name) {
try {
//如果字段加注解了@TableField(exist = false),不走DB查询
Field field = null;
try {
field = clazz.getDeclaredField(name);
} catch (NoSuchFieldException e) {
//e.printStackTrace();
}
//如果为空则去父类查找字段
if (field == null) {
List<Field> allFields = getClassFields(clazz);
List<Field> searchFields = allFields.stream().filter(a -> a.getName().equals(name)).collect(Collectors.toList());
if(searchFields!=null && searchFields.size()>0){
field = searchFields.get(0);
}
}
if (field != null) {
TableField tableField = field.getAnnotation(TableField.class);
if (tableField != null){
if(tableField.exist() == false){
//如果设置了TableField false 这个字段不需要处理
return null;
}else{
String column = tableField.value();
//如果设置了TableField value 这个字段是实体字段
if(!"".equals(column)){
return column;
}
}
}
}
} catch (Exception e) {
e.printStackTrace();
}
return name;
}
/**
* 获取class的 包括父类的
* @param clazz
* @return
*/
private static List<Field> getClassFields(Class<?> clazz) {
List<Field> list = new ArrayList<Field>();
Field[] fields;
do{
fields = clazz.getDeclaredFields();
for(int i = 0;i<fields.length;i++){
list.add(fields[i]);
}
clazz = clazz.getSuperclass();
}while(clazz!= Object.class&&clazz!=null);
return list;
}
/**
* 组装Mybatis Plus 查询条件
* <p>使用此方法 需要有如下几点注意:

View File

@ -190,6 +190,14 @@ public class BlJbzdjsController extends JeecgController<BlJbzdjs, IBlJbzdjsServi
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, BlJbzdjs blJbzdjs) {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(StringUtils.indexOf(loginUser.getRoleCode(),"admin")>-1){
}else{
blJbzdjs.setDwmc(loginUser.getDepartIds());
}
return super.exportXls(request, blJbzdjs, BlJbzdjs.class, "bl_jbzdjs");
}

View File

@ -81,16 +81,19 @@ public class BlJbzdjs implements Serializable {
@ApiModelProperty(value = "年度")
private java.lang.String years;
/**修订情况*/
@Excel(name = "修订情况", width = 15, dicCode = "zd_xdqk")
@Dict(dicCode = "zd_xdqk")
@ApiModelProperty(value = "修订情况")
private java.lang.String yearsType;
/**附件*/
@Excel(name = "附件", width = 15)
@ApiModelProperty(value = "附件")
private java.lang.String filePath;
/**文件服务器*/
@Excel(name = "文件服务器", width = 15)
@ApiModelProperty(value = "文件服务器")
private java.lang.String ftpPath;
/**修订情况说明*/
@ApiModelProperty(value = "修订情况说明")
private java.lang.String xdqksmPath;
/**文件服务器修订情况说明位置*/
@ApiModelProperty(value = "文件服务器修订情况说明位置")
private java.lang.String ftpXdqksmPath;
}

View File

@ -0,0 +1,176 @@
package org.jeecg.modules.demo.blKckhclbl.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.blKckhclbl.entity.BlKckhclbl;
import org.jeecg.modules.demo.blKckhclbl.service.IBlKckhclblService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
* @Description: 课程考核材料补录信息
* @Author: jeecg-boot
* @Date: 2024-12-25
* @Version: V1.0
*/
@Api(tags="课程考核材料补录信息")
@RestController
@RequestMapping("/blKckhclbl/blKckhclbl")
@Slf4j
public class BlKckhclblController extends JeecgController<BlKckhclbl, IBlKckhclblService> {
@Autowired
private IBlKckhclblService blKckhclblService;
/**
* 分页列表查询
*
* @param blKckhclbl
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "课程考核材料补录信息-分页列表查询")
@ApiOperation(value="课程考核材料补录信息-分页列表查询", notes="课程考核材料补录信息-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<BlKckhclbl>> queryPageList(BlKckhclbl blKckhclbl,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<BlKckhclbl> queryWrapper = QueryGenerator.initQueryWrapper(blKckhclbl, req.getParameterMap());
Page<BlKckhclbl> page = new Page<BlKckhclbl>(pageNo, pageSize);
IPage<BlKckhclbl> pageList = blKckhclblService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param blKckhclbl
* @return
*/
@AutoLog(value = "课程考核材料补录信息-添加")
@ApiOperation(value="课程考核材料补录信息-添加", notes="课程考核材料补录信息-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody BlKckhclbl blKckhclbl) {
blKckhclblService.save(blKckhclbl);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param blKckhclbl
* @return
*/
@AutoLog(value = "课程考核材料补录信息-编辑")
@ApiOperation(value="课程考核材料补录信息-编辑", notes="课程考核材料补录信息-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody BlKckhclbl blKckhclbl) {
blKckhclblService.updateById(blKckhclbl);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "课程考核材料补录信息-通过id删除")
@ApiOperation(value="课程考核材料补录信息-通过id删除", notes="课程考核材料补录信息-通过id删除")
@RequiresPermissions("blKckhclbl:bl_kckhclbl:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
blKckhclblService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "课程考核材料补录信息-批量删除")
@ApiOperation(value="课程考核材料补录信息-批量删除", notes="课程考核材料补录信息-批量删除")
@RequiresPermissions("blKckhclbl:bl_kckhclbl:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.blKckhclblService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "课程考核材料补录信息-通过id查询")
@ApiOperation(value="课程考核材料补录信息-通过id查询", notes="课程考核材料补录信息-通过id查询")
@GetMapping(value = "/queryById")
public Result<BlKckhclbl> queryById(@RequestParam(name="id",required=true) String id) {
BlKckhclbl blKckhclbl = blKckhclblService.getById(id);
if(blKckhclbl==null) {
return Result.error("未找到对应数据");
}
return Result.OK(blKckhclbl);
}
/**
* 导出excel
*
* @param request
* @param blKckhclbl
*/
@RequiresPermissions("blKckhclbl:bl_kckhclbl:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, BlKckhclbl blKckhclbl) {
return super.exportXls(request, blKckhclbl, BlKckhclbl.class, "课程考核材料补录信息");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("blKckhclbl:bl_kckhclbl:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, BlKckhclbl.class);
}
}

View File

@ -0,0 +1,68 @@
package org.jeecg.modules.demo.blKckhclbl.entity;
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 lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 课程考核材料补录信息
* @Author: jeecg-boot
* @Date: 2024-12-25
* @Version: V1.0
*/
@Data
@TableName("bl_kckhclbl")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="bl_kckhclbl对象", description="课程考核材料补录信息")
public class BlKckhclbl implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.String id;
/**createBy*/
@ApiModelProperty(value = "createBy")
private java.lang.String createBy;
/**createTime*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "createTime")
private java.util.Date createTime;
/**updateBy*/
@ApiModelProperty(value = "updateBy")
private java.lang.String updateBy;
/**updateTime*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "updateTime")
private java.util.Date updateTime;
/**课程任务代码*/
@Excel(name = "课程任务代码", width = 15)
@ApiModelProperty(value = "课程任务代码")
private java.lang.String kcrwdm;
/**补录类型*/
@Excel(name = "补录类型", width = 15, dicCode = "kckhcl_bltype")
@Dict(dicCode = "kckhcl_bltype")
@ApiModelProperty(value = "补录类型")
private java.lang.String blType;
/**补录附件*/
@Excel(name = "补录附件", width = 15)
@ApiModelProperty(value = "补录附件")
private java.lang.String blFilePath;
}

View File

@ -0,0 +1,17 @@
package org.jeecg.modules.demo.blKckhclbl.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.demo.blKckhclbl.entity.BlKckhclbl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 课程考核材料补录信息
* @Author: jeecg-boot
* @Date: 2024-12-25
* @Version: V1.0
*/
public interface BlKckhclblMapper extends BaseMapper<BlKckhclbl> {
}

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-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.blKckhclbl.mapper.BlKckhclblMapper">
</mapper>

View File

@ -0,0 +1,14 @@
package org.jeecg.modules.demo.blKckhclbl.service;
import org.jeecg.modules.demo.blKckhclbl.entity.BlKckhclbl;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 课程考核材料补录信息
* @Author: jeecg-boot
* @Date: 2024-12-25
* @Version: V1.0
*/
public interface IBlKckhclblService extends IService<BlKckhclbl> {
}

View File

@ -0,0 +1,21 @@
package org.jeecg.modules.demo.blKckhclbl.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import org.jeecg.modules.demo.blKckhclbl.entity.BlKckhclbl;
import org.jeecg.modules.demo.blKckhclbl.mapper.BlKckhclblMapper;
import org.jeecg.modules.demo.blKckhclbl.service.IBlKckhclblService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 课程考核材料补录信息
* @Author: jeecg-boot
* @Date: 2024-12-25
* @Version: V1.0
*/
@Service
@DS("multi-datasource1")
public class BlKckhclblServiceImpl extends ServiceImpl<BlKckhclblMapper, BlKckhclbl> implements IBlKckhclblService {
}

View File

@ -107,6 +107,20 @@ public class XxhbjwxtjxrwController extends JeecgController<Xxhbjwxtjxrw, IXxhbj
if(StringUtils.isNotBlank(zjSqxx.getKclb())){
queryWrapper.in("kclb",zjSqxx.getKclb().split(","));
}
if(StringUtils.isNotBlank(zjSqxx.getZydl())){
String arr[] = zjSqxx.getZydl().split(",");
String likeArr = "";
int i=0;
for(String ta : arr){
if(i==0){
likeArr = " zymc like concat('%','"+ta+"','%')";
}else{
likeArr = likeArr + " or zymc like concat('%','"+ta+"','%')";
}
}
queryWrapper.apply(likeArr);
// queryWrapper.like("zymc",zjSqxx.getZydl().split(","));
}
}
if(StringUtils.equals("1",sfjx)){
return Result.error("您未在授权期限内,不能进行查询!");
@ -289,4 +303,53 @@ public class XxhbjwxtjxrwController extends JeecgController<Xxhbjwxtjxrw, IXxhbj
return super.importExcel(request, response, Xxhbjwxtjxrw.class);
}
/**
* 课程考核材料补录信息查询
* @param xxhbjwxtjxrw
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@GetMapping(value = "/listbl")
public Result<IPage<Xxhbjwxtjxrw>> listbl(Xxhbjwxtjxrw xxhbjwxtjxrw,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<Xxhbjwxtjxrw> queryWrapper = QueryGenerator.initQueryWrapper("a",xxhbjwxtjxrw, req.getParameterMap());
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String xnxq = "0";
if(StringUtils.isNotBlank(xxhbjwxtjxrw.getZjxnxq())){
queryWrapper.eq(StringUtils.isNotBlank(xxhbjwxtjxrw.getZjxnxq()),"concat(a.xn,a.xqmc)",xxhbjwxtjxrw.getZjxnxq());
}else if(StringUtils.equals(xnxq,"0")){
String dqxq = commonApi.translateDict("dqxq","1");
queryWrapper.eq("concat(a.xn,a.xqmc)",dqxq);
}
if(StringUtils.isNotBlank(xxhbjwxtjxrw.getSfxybl())){
if(StringUtils.equals("0",xxhbjwxtjxrw.getSfxybl())){
queryWrapper.apply(" b.bl_type is not null");
}else{
queryWrapper.apply(" b.bl_type is null");
}
}
queryWrapper.eq( "a.file_shztmc","审核通过");
queryWrapper.like(StringUtils.isNotBlank(xxhbjwxtjxrw.getZhuanye()),"a.zymc",xxhbjwxtjxrw.getZhuanye());
queryWrapper.apply(StringUtils.isNotBlank(xxhbjwxtjxrw.getZhicheng()),"SUBSTRING(a.TEAXM,LOCATE('[',a.TEAXM)+1,locate(']',a.TEAXM)-locate('[',a.TEAXM)-1) = '"+xxhbjwxtjxrw.getZhicheng()+"'");
Page<Xxhbjwxtjxrw> page = new Page<Xxhbjwxtjxrw>(pageNo, pageSize);
IPage<Xxhbjwxtjxrw> pageList = xxhbjwxtjxrwService.listbl(page, queryWrapper);
return Result.OK(pageList);
}
}

View File

@ -101,4 +101,13 @@ public class Xxhbjwxtjxrw implements Serializable {
private java.lang.String zjxnxq;//专家展示学年学期
@TableField(exist = false)
private java.lang.String sfxk;//是否选课 0未选 1已选
@TableField(exist = false)
private java.lang.String blFilePath;//补录材料地址
@TableField(exist = false)
private java.lang.String blType;//补录类型
@TableField(exist = false)
private java.lang.String sfxybl;//是否需要补录
}

View File

@ -2,6 +2,10 @@ package org.jeecg.modules.demo.xxhbjwxtjxrw.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.demo.xxhbjwxtjxrw.entity.Xxhbjwxtjxrw;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -14,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface XxhbjwxtjxrwMapper extends BaseMapper<Xxhbjwxtjxrw> {
IPage<Xxhbjwxtjxrw> listbl(Page<Xxhbjwxtjxrw> page, @Param(Constants.WRAPPER) QueryWrapper<Xxhbjwxtjxrw> queryWrapper);
}

View File

@ -6,4 +6,12 @@
select *,concat(xn,xqmc) as zjxnxq from xxhbjwxtjxrw
${ew.customSqlSegment}
</select>
<select id="listbl" resultType="org.jeecg.modules.demo.xxhbjwxtjxrw.entity.Xxhbjwxtjxrw">
select a.*,concat(xn,xqmc) as zjxnxq,b.bl_file_path,b.bl_type from xxhbjwxtjxrw a
left join bl_kckhclbl b on a.KCRWDM = b.KCRWDM
${ew.customSqlSegment}
</select>
</mapper>

View File

@ -1,5 +1,8 @@
package org.jeecg.modules.demo.xxhbjwxtjxrw.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.demo.xxhbjwxtjxrw.entity.Xxhbjwxtjxrw;
import com.baomidou.mybatisplus.extension.service.IService;
@ -14,4 +17,6 @@ import java.util.List;
public interface IXxhbjwxtjxrwService extends IService<Xxhbjwxtjxrw> {
void syncList(List<Xxhbjwxtjxrw> outDataList);
IPage<Xxhbjwxtjxrw> listbl(Page<Xxhbjwxtjxrw> page, QueryWrapper<Xxhbjwxtjxrw> queryWrapper);
}

View File

@ -2,6 +2,8 @@ package org.jeecg.modules.demo.xxhbjwxtjxrw.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.demo.xxhbjwxtjxrw.entity.Xxhbjwxtjxrw;
import org.jeecg.modules.demo.xxhbjwxtjxrw.mapper.XxhbjwxtjxrwMapper;
import org.jeecg.modules.demo.xxhbjwxtjxrw.service.IXxhbjwxtjxrwService;
@ -29,6 +31,11 @@ public class XxhbjwxtjxrwServiceImpl extends ServiceImpl<XxhbjwxtjxrwMapper, Xxh
syncList(entityList, true);
}
@Override
public IPage<Xxhbjwxtjxrw> listbl(Page<Xxhbjwxtjxrw> page, QueryWrapper<Xxhbjwxtjxrw> queryWrapper) {
return baseMapper.listbl(page,queryWrapper);
}
@Transactional(rollbackFor = {Exception.class})
public boolean syncList(Collection<Xxhbjwxtjxrw> entityList, boolean isDelete) {
QueryWrapper dqw = new QueryWrapper();

View File

@ -102,7 +102,7 @@ public class XxhbjwxtscwjxxController extends JeecgController<Xxhbjwxtscwjxx, IX
}
QueryWrapper<Xxhbjwxtscwjxx> queryWrapper = QueryGenerator.initQueryWrapper(xxhbjwxtscwjxx, req.getParameterMap());
Page<Xxhbjwxtscwjxx> page = new Page<Xxhbjwxtscwjxx>(pageNo, pageSize);
IPage<Xxhbjwxtscwjxx> pageList = xxhbjwxtscwjxxService.page(page, queryWrapper);
IPage<Xxhbjwxtscwjxx> pageList = xxhbjwxtscwjxxService.khcllist(page, queryWrapper);
pageList.getRecords().forEach(item->{
item.setId(item.getPath());
});
@ -111,7 +111,7 @@ public class XxhbjwxtscwjxxController extends JeecgController<Xxhbjwxtscwjxx, IX
List<Xxhbjwxtscwjxx> list = pageList.getRecords();
if(list.size()>0){
List<Xxhbjwxtscwjxx> list2 = new ArrayList<>();
String sorts[] = ("历次过程性考核-评分标准,历次过程性考核-内容及要求(或试题),课程考核合理性审核记录单,期末考试-评分标准,期未考试-试题(或内容及要求),课程考核质量评价单,课程目标达成情况评价报告").split(",");
String sorts[] = ("历次过程性考核-评分标准,历次过程性考核-内容及要求(或试题),课程考核合理性审核记录单,期末考试-评分标准,期未考试-试题(或内容及要求),课程考核质量评价单,课程目标达成情况评价报告,课程教学大纲").split(",");
for (String par : sorts){
list2.add(list.stream().filter(item->item.getFjtype().equals(par)).findFirst().orElse(null));

View File

@ -2,6 +2,10 @@ package org.jeecg.modules.demo.xxhbjwxtscwjxx.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.demo.xxhbjwxtscwjxx.entity.Xxhbjwxtscwjxx;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -14,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface XxhbjwxtscwjxxMapper extends BaseMapper<Xxhbjwxtscwjxx> {
IPage<Xxhbjwxtscwjxx> khclList(Page<Xxhbjwxtscwjxx> page, @Param(Constants.WRAPPER) QueryWrapper<Xxhbjwxtscwjxx> queryWrapper);
}

View File

@ -2,4 +2,14 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.demo.xxhbjwxtscwjxx.mapper.XxhbjwxtscwjxxMapper">
<select id="khclList" resultType="org.jeecg.modules.demo.xxhbjwxtscwjxx.entity.Xxhbjwxtscwjxx">
select * from (
SELECT kcrwdm, name, path, cjr, cjsj, fjtype FROM xxhbjwxtscwjxx
union all
SELECT kcrwdm, create_by as name, bl_file_path as path, '专家平台补录' as cjr, create_time as cjsj, bl_type as fjtype FROM bl_kckhclbl
) t
${ew.customSqlSegment}
</select>
</mapper>

View File

@ -1,5 +1,8 @@
package org.jeecg.modules.demo.xxhbjwxtscwjxx.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.demo.xxhbjwxtjxrw.entity.Xxhbjwxtjxrw;
import org.jeecg.modules.demo.xxhbjwxtscwjxx.entity.Xxhbjwxtscwjxx;
import com.baomidou.mybatisplus.extension.service.IService;
@ -18,4 +21,6 @@ public interface IXxhbjwxtscwjxxService extends IService<Xxhbjwxtscwjxx> {
void syncList(List<Xxhbjwxtscwjxx> outDataList);
Xxhbjwxtscwjxx getBatchDown(Xxhbjwxtscwjxx xxhbjwxtscwjxx, HttpServletResponse response);
IPage<Xxhbjwxtscwjxx> khcllist(Page<Xxhbjwxtscwjxx> page, QueryWrapper<Xxhbjwxtscwjxx> queryWrapper);
}

View File

@ -2,6 +2,8 @@ package org.jeecg.modules.demo.xxhbjwxtscwjxx.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.demo.xxhbjwxtjxrw.entity.Xxhbjwxtjxrw;
import org.jeecg.modules.demo.xxhbjwxtscwjxx.entity.Xxhbjwxtscwjxx;
import org.jeecg.modules.demo.xxhbjwxtscwjxx.mapper.XxhbjwxtscwjxxMapper;
@ -134,6 +136,11 @@ public class XxhbjwxtscwjxxServiceImpl extends ServiceImpl<XxhbjwxtscwjxxMapper,
return par2;
}
@Override
public IPage<Xxhbjwxtscwjxx> khcllist(Page<Xxhbjwxtscwjxx> page, QueryWrapper<Xxhbjwxtscwjxx> queryWrapper) {
return baseMapper.khclList(page,queryWrapper);
}
private String getDownloadPath(String path){
String filePath = "";
// if(StringUtils.isNotBlank(path)){

View File

@ -20,9 +20,11 @@ import org.jeecg.common.util.oConvertUtils;
import org.jeecg.config.JeecgBaseConfig;
import org.jeecg.modules.tjbb.tjbb141.entity.Tjbb_141;
import org.jeecg.modules.tjbb.tjbb141.service.ITjbb_141Service;
import org.jeecg.modules.tjbb.tjbb151.entity.Tjbb_151;
import org.jeecg.modules.tjbb.tjbb151.service.ITjbb_151Service;
import org.jeecg.modules.tjbb.tjbb152.entity.Tjbb_152;
import org.jeecg.modules.tjbb.tjbb152.service.ITjbb_152Service;
import org.jeecg.modules.tjbb.tjbb153.entity.Tjbb_153;
import org.jeecg.modules.tjbb.tjbb153.service.ITjbb_153Service;
import org.jeecg.modules.tjbb.tjbb16.entity.Tjbb_16;
import org.jeecg.modules.tjbb.tjbb16.service.ITjbb_16Service;
@ -123,6 +125,68 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
map.put("tsf8",tsf8);
map.put("tsf9",tsf9);
map.put("tsf11",tsf11);
QueryWrapper<Tjbb_16> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.last("limit 1");
Tjbb_16 tjbb_16 = tjbb_16Service.getOne(queryWrapper1);
map.put("t16time",tjbb_16.getCreateTime());
QueryWrapper<Tjbb_24> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.last("limit 1");
Tjbb_24 tjbb_24 = tjbb_24Service.getOne(queryWrapper2);
map.put("t24time",tjbb_24.getCreateTime());
QueryWrapper<Tjbb_141> queryWrapper3 = new QueryWrapper<>();
queryWrapper3.last("limit 1");
Tjbb_141 tjbb_141 = tjbb_141Service.getOne(queryWrapper3);
map.put("t141time",tjbb_141.getCreateTime());
QueryWrapper<Tjbb_151> queryWrapper4 = new QueryWrapper<>();
queryWrapper4.last("limit 1");
Tjbb_151 tjbb_151 = tjbb_151Service.getOne(queryWrapper4);
map.put("t151time",tjbb_151.getCreateTime());
QueryWrapper<Tjbb_152> queryWrapper5 = new QueryWrapper<>();
queryWrapper5.last("limit 1");
Tjbb_152 tjbb_152 = tjbb_152Service.getOne(queryWrapper5);
map.put("t152time",tjbb_152.getCreateTime());
QueryWrapper<Tjbb_153> queryWrapper6 = new QueryWrapper<>();
queryWrapper6.last("limit 1");
Tjbb_153 tjbb_153 = tjbb_153Service.getOne(queryWrapper6);
map.put("t153time",tjbb_153.getCreateTime());
QueryWrapper<TjbbSf3> queryWrapper7 = new QueryWrapper<>();
queryWrapper7.last("limit 1");
TjbbSf3 tjbbSf3 = tjbbSf3Service.getOne(queryWrapper7);
map.put("tsf3time",tjbbSf3.getCreateTime());
QueryWrapper<TjbbSf5> queryWrapper8 = new QueryWrapper<>();
queryWrapper8.last("limit 1");
TjbbSf5 tjbbSf5 = tjbbSf5Service.getOne(queryWrapper8);
map.put("tsf5time",tjbbSf5.getCreateTime());
QueryWrapper<TjbbSf6> queryWrapper9 = new QueryWrapper<>();
queryWrapper9.last("limit 1");
TjbbSf6 TjbbSf6 = tjbbSf6Service.getOne(queryWrapper9);
map.put("tsf6time",TjbbSf6.getCreateTime());
QueryWrapper<TjbbSf8> queryWrapper10 = new QueryWrapper<>();
queryWrapper10.last("limit 1");
TjbbSf8 TjbbSf8 = tjbbSf8Service.getOne(queryWrapper10);
map.put("tsf8time",TjbbSf8.getCreateTime());
QueryWrapper<TjbbSf9> queryWrapper11 = new QueryWrapper<>();
queryWrapper11.last("limit 1");
TjbbSf9 TjbbSf9 = tjbbSf9Service.getOne(queryWrapper11);
map.put("tsf9time",TjbbSf9.getCreateTime());
QueryWrapper<TjbbSf11> queryWrapper12 = new QueryWrapper<>();
queryWrapper12.last("limit 1");
TjbbSf11 TjbbSf11 = tjbbSf11Service.getOne(queryWrapper12);
map.put("tsf11time",TjbbSf11.getCreateTime());
return Result.OK(map);
}

View File

@ -11,7 +11,7 @@ VITE_GLOB_APP_SHORT_NAME = 智慧教学服务中心
VITE_GLOB_APP_CAS_BASE_URL=https://authserver.nenu.edu.cn/authserver
# 是否开启单点登录
VITE_GLOB_APP_OPEN_SSO = false
VITE_GLOB_APP_OPEN_SSO = true
# 开启微前端模式
VITE_GLOB_APP_OPEN_QIANKUN=true

View File

@ -0,0 +1,11 @@
修订情况说明
1.修订内容说明
标题黑体加粗小三号正文宋体四号1.5倍行距)
2.修订过程说明
标题黑体加粗小三号正文宋体四号1.5倍行距)
3.修订过程中形成的调研和论证材料
标题黑体加粗小三号正文宋体四号1.5倍行距)

View File

@ -35,28 +35,16 @@ export const columns: BasicColumn[] = [
dataIndex: 'status_dictText'
},
// {
// title: '当年度修订情况',
// align: "center",
// dataIndex: 'years',
// customRender:({text,record}) =>{
// text = text+"年"+record.yearsType_dictText;
// return text;
// },
// },
// {
// title: '修订情况',
// align: "center",
// dataIndex: 'yearsType_dictText'
// },
// {
// title: '附件',
// title: '文件原文',
// align: "center",
// dataIndex: 'filePath',
// width: 180,
// },
// {
// title: '文件服务器',
// title: '修订情况说明',
// align: "center",
// dataIndex: 'ftpPath',
// dataIndex: 'xdqksmPath',
// width: 180,
// },
];

View File

@ -1,5 +1,6 @@
<template>
<div class="p-2">
<div v-show="showType == '1'">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -62,21 +63,39 @@
<TableAction :actions="getTableAction(record)" />
</template>
<template v-slot:bodyCell="{ column, record, index, text }">
<template v-if="column.dataIndex==='filePath'">
<!--文件字段回显插槽-->
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">{{dqnd}}下载</a-button>
<a-button :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="handleYulan(text)">预览</a-button>
</template>
<template v-if="column.dataIndex==='ftpPath'">
<!--文件字段回显插槽-->
<!-- <template v-if="column.dataIndex==='filePath'">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
<a-button v-if="text" style="margin-left: 10px;" :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="handleYulan(text)">预览</a-button>
</template>
<template v-if="column.dataIndex==='xdqksmPath'">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
<a-button v-if="text" style="margin-left: 10px;" :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="handleYulan(text)">预览</a-button>
</template> -->
</template>
</BasicTable>
</div>
<div v-show="showType == '2'">
<div style="width: 100; text-align: right; padding: 10px">
<a-button type="primary" @click="handleFanhui">返回</a-button>
<a-button type="primary" @click="handleYwxiazai" style="margin-left: 10px;">下载</a-button>
</div>
<iframe :src="wjywUrl" width="100%" height="600px"></iframe>
</div>
<div v-show="showType == '3'">
<div style="width: 100; text-align: right; padding: 10px">
<a-button type="primary" @click="handleFanhui">返回</a-button>
<a-button type="primary" @click="handleXdxiazai" style="margin-left: 10px;">下载</a-button>
</div>
<iframe :src="xdqkUrl" width="100%" height="600px"></iframe>
</div>
<!-- 表单区域 -->
<BlJbzdjsModal ref="registerModal" @success="handleSuccess"></BlJbzdjsModal>
</div>
</template>
@ -97,6 +116,10 @@
const formRef = ref();
const queryParam = reactive<any>({});
const ylxxInfo = ref<any>({});
const wjywUrl = ref<string>('');
const xdqkUrl = ref<string>('');
const showType = ref<string>('1');
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
const userStore = useUserStore();
@ -110,9 +133,10 @@
canResize:false,
useSearchForm: false,
actionColumn: {
width: 220,
width: 260,
},
beforeFetch: async (params) => {
params.column = 'status,createTime',params.order = 'desc';
return Object.assign(params, queryParam);
},
},
@ -179,21 +203,55 @@
}
/**
* 预览
* 返回
*/
function handleYulan(record){
function handleFanhui(){
showType.value = '1';
wjywUrl.value = '';
xdqkUrl.value = '';
}
/**
* 文件原文预览
*/
function handleWjywYulan(record){
showType.value='2'
ylxxInfo.value = record
var file = record.filePath;
console.log("🚀 ~ handleChakan ~ record.ktbg:", file)
var file1 = getFileAccessHttpUrl(file);
var url = 'https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file1));
window.open(url,"_blank");
wjywUrl.value = url;
// window.open(url,"_blank");
}
/**
* 修订说明预览
*/
function handleXdsmYulan(record){
showType.value='3'
ylxxInfo.value = record
var file = record.xdqksmPath;
console.log("🚀 ~ handleChakan ~ record.ktbg:", file)
var file1 = getFileAccessHttpUrl(file);
var url = 'https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file1));
xdqkUrl.value = url;
}
/**
* 下载
* 原文下载
*/
function handleXiazai(record){
var file = record.filePath;
function handleYwxiazai(){
var file = ylxxInfo.value.filePath;
downloadFile(file);
}
/**
* 修订下载
*/
function handleXdxiazai(){
var file = ylxxInfo.value.xdqksmPath;
downloadFile(file);
}
@ -202,19 +260,19 @@
*/
function getTableAction(record) {
return [
{
label: '更新状态',
onClick: handleZtEdit.bind(null, record),
ifShow: () => {
return record.years < dqnd; //
},
},
// {
// label: '',
// onClick: handleZtEdit.bind(null, record),
// ifShow: () => {
// return record.years < dqnd; //
// },
// },
{
label: '编辑',
onClick: handleEdit.bind(null, record),
ifShow: () => {
return record.years === dqnd; //
},
// ifShow: () => {
// return record.years === dqnd; //
// },
},
{
label: '删除',
@ -223,24 +281,24 @@
confirm: handleDelete.bind(null, record),
placement: 'topLeft',
},
ifShow: () => {
return record.years === dqnd; //
},
// ifShow: () => {
// return record.years === dqnd; //
// },
},
{
label: '下载',
onClick: handleXiazai.bind(null, record),
ifShow: () => {
return record.filePath; //
},
},
{
label: '预览',
onClick: handleYulan.bind(null, record),
label: '文件原文',
onClick: handleWjywYulan.bind(null, record),
ifShow: () => {
return record.filePath; //
},
},
{
label: '修订说明',
onClick: handleXdsmYulan.bind(null, record),
ifShow: () => {
return record.xdqksmPath; //
},
},
];
}

View File

@ -1,5 +1,6 @@
<template>
<div class="p-2">
<div v-show="showType == '1'">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@ -34,11 +35,18 @@
<a-date-picker placeholder="请选择修订时间" v-model:value="queryParam.years" value-format="YYYY" picker="year" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<!-- <a-col :lg="6">
<a-form-item name="yearsType">
<template #label><span title="修订情况">修订情况</span></template>
<j-dict-select-tag placeholder="请选择修订情况" v-model:value="queryParam.yearsType" dictCode="zd_xdqk" allow-clear />
</a-form-item>
</a-col> -->
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
<a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
<a-button type="primary" preIcon="ant-design:download" @click="onExportXls" style="margin-left: 8px">导出</a-button>
</a-col>
</span>
</a-col>
@ -48,13 +56,36 @@
<!--引用表格-->
<BasicTable @register="registerTable" >
<!--插槽:table标题-->
<template #tableTitle>
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" />
</template>
<template v-slot:bodyCell="{ column, record, index, text }">
</template>
</BasicTable>
</div>
<div v-show="showType == '2'">
<div style="width: 100; text-align: right; padding: 10px">
<a-button type="primary" @click="handleFanhui">返回</a-button>
<a-button type="primary" @click="handleYwxiazai" style="margin-left: 10px;">下载</a-button>
</div>
<iframe :src="wjywUrl" width="100%" height="600px"></iframe>
</div>
<div v-show="showType == '3'">
<div style="width: 100; text-align: right; padding: 10px">
<a-button type="primary" @click="handleFanhui">返回</a-button>
<a-button type="primary" @click="handleXdxiazai" style="margin-left: 10px;">下载</a-button>
</div>
<iframe :src="xdqkUrl" width="100%" height="600px"></iframe>
</div>
<!-- 表单区域 -->
<BlJbzdjsModal ref="registerModal" @success="handleSuccess"></BlJbzdjsModal>
</div>
</template>
@ -68,31 +99,39 @@
import BlJbzdjsModal from './components/BlJbzdjsModal.vue'
import { useUserStore } from '/@/store/modules/user';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import { getFileAccessHttpUrl } from '@/utils/common/compUtils';
import { encryptByBase64 } from '@/utils/cipher';
import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
import { getFileAccessHttpUrl } from '@/utils/common/compUtils';
import { encryptByBase64 } from '@/utils/cipher';
import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
import dayjs from 'dayjs';
const formRef = ref();
const queryParam = reactive<any>({});
const ylxxInfo = ref<any>({});
const wjywUrl = ref<string>('');
const xdqkUrl = ref<string>('');
const showType = ref<string>('1');
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
const userStore = useUserStore();
const dqnd = dayjs().format('YYYY');
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
title: 'bl_jbzdjs',
api: zjList,
columns,
canResize:false,
useSearchForm: false,
actionColumn: {
width: 220,
width: 260,
},
beforeFetch: async (params) => {
params.column = 'status,createTime',params.order = 'desc';
return Object.assign(params, queryParam);
},
},
exportConfig: {
name: "bl_jbzdjs",
name: "基本制度建设",
url: getExportUrl,
params: queryParam,
},
@ -112,6 +151,39 @@ import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
xs: 24,
sm: 20,
});
/**
* 新增事件
*/
function handleAdd() {
registerModal.value.disableSubmit = false;
registerModal.value.add();
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
registerModal.value.disableSubmit = false;
registerModal.value.edit(record);
}
/**
* 只修改状态字段
*/
function handleZtEdit(record: Recordable) {
registerModal.value.disableSubmit = false;
record.ztSfxg = '1';//
registerModal.value.edit(record);
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
/**
* 成功回调
@ -120,22 +192,57 @@ import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
(selectedRowKeys.value = []) && reload();
}
/**
* 预览文件
* 返回
*/
function handleYulan(record){
function handleFanhui(){
showType.value = '1';
wjywUrl.value = '';
xdqkUrl.value = '';
}
/**
* 文件原文预览
*/
function handleWjywYulan(record){
showType.value='2'
ylxxInfo.value = record
var file = record.filePath;
console.log("🚀 ~ handleChakan ~ record.ktbg:", file)
var file1 = getFileAccessHttpUrl(file);
var url = 'https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file1));
window.open(url,"_blank");
wjywUrl.value = url;
// window.open(url,"_blank");
}
/**
* 修订说明预览
*/
function handleXdsmYulan(record){
showType.value='3'
ylxxInfo.value = record
var file = record.xdqksmPath;
console.log("🚀 ~ handleChakan ~ record.ktbg:", file)
var file1 = getFileAccessHttpUrl(file);
var url = 'https://jxdd.nenu.edu.cn/onlinePreview/onlinePreview?url=' + encodeURIComponent(encryptByBase64(file1));
xdqkUrl.value = url;
}
/**
* 下载文件
* 原文下载
*/
function handleXiazai(record){
var file = record.filePath;
function handleYwxiazai(){
var file = ylxxInfo.value.filePath;
downloadFile(file);
}
/**
* 修订下载
*/
function handleXdxiazai(){
var file = ylxxInfo.value.xdqksmPath;
downloadFile(file);
}
@ -145,17 +252,17 @@ import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
function getTableAction(record) {
return [
{
label: '下载',
onClick: handleXiazai.bind(null, record),
label: '文件原文',
onClick: handleWjywYulan.bind(null, record),
ifShow: () => {
return record.filePath; //
return record.filePath; //
},
},
{
label: '预览',
onClick: handleYulan.bind(null, record),
label: '修订说明',
onClick: handleXdsmYulan.bind(null, record),
ifShow: () => {
return record.filePath; //
return record.xdqksmPath; //
},
},
];

View File

@ -11,7 +11,7 @@
</a-col>
<a-col :span="24">
<a-form-item label="修订时间" v-bind="validateInfos.zxsj" id="BlJbzdjsForm-zxsj" name="zxsj">
<a-date-picker placeholder="请选择修订时间" v-model:value="formData.zxsj" value-format="YYYY-MM-DD" style="width: 100%" allow-clear :disabled="ztSfxg"/>
<a-date-picker placeholder="请选择修订时间" v-model:value="formData.zxsj" value-format="YYYY-MM-DD" @change="handleXdsj" style="width: 100%" allow-clear :disabled="ztSfxg"/>
</a-form-item>
</a-col>
<a-col :span="24">
@ -25,10 +25,20 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="附件" v-bind="validateInfos.filePath" id="BlJbzdjsForm-filePath" name="filePath">
<a-form-item label="文件原文" v-bind="validateInfos.filePath" id="BlJbzdjsForm-filePath" name="filePath">
<j-upload v-model:value="formData.filePath" :bizPath="dqnd" :max-count="1" :disabled="ztSfxg"></j-upload>
</a-form-item>
</a-col>
<a-col :span="24" v-show="xdnfDisabled || formData.xdqksmPath">
<a-form-item label="修订说明" v-bind="validateInfos.xdqksmPath" id="BlJbzdjsForm-filePath" name="filePath">
<div style="line-height: 40px;" v-show="!ztSfxg">
<a @click="downloadByUrl({ url: '/download/xdqksm.docx', target: '_self', fileName: '修订情况说明.docx' })">
<Icon icon="ant-design:download-outlined" :size="20" />修订说明模板下载
</a>
</div>
<j-upload v-model:value="formData.xdqksmPath" :bizPath="dqnd" :max-count="1" :disabled="ztSfxg"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form>
</template>
@ -46,6 +56,7 @@
import { saveOrUpdate } from '../BlJbzdjs.api';
import { Form } from 'ant-design-vue';
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
import { downloadByUrl } from '/@/utils/file/download';
import dayjs from 'dayjs';
const props = defineProps({
formDisabled: { type: Boolean, default: false },
@ -64,19 +75,23 @@
status: '',
years: '',
filePath: '',
xdqksmPath: '',
});
const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 8 } });
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 14 } });
const confirmLoading = ref<boolean>(false);
const dqnd = ref<string>('');
const xdnf = ref<string>('');
const xdnfDisabled = ref<boolean>(false);
//
const validatorRules = reactive({
zdmc: [{ required: true, message: '请输入制度名称!' }],
zxsj: [{ required: true, message: '请选择修订时间!' }],
sfyz: [{ required: true, message: '请选择对应的学校上位文件!' }],
status: [{ required: true, message: '请选择状态!' }],
filePath: [{ required: true, message: '请选择附件!' }],
filePath: [{ required: true, message: '请选择文件原文!' }],
xdqksmPath: [{ required: xdnfDisabled, message: '请选择修订说明!' }],
});
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
@ -92,11 +107,25 @@
return props.formDisabled;
});
/**
* 修订时间变更
*/
function handleXdsj(record){
console.log("🚀 ~ handleXdsj ~ record:", record)
const dqnf = dayjs().format('YYYY');
xdnf.value = record.substring(0,4);
if(dqnf == xdnf.value){
xdnfDisabled.value = true;
}else{
xdnfDisabled.value = false;
}
}
/**
* 新增
*/
function add() {
xdnfDisabled.value = false;
edit({status:'1'});
}
@ -124,6 +153,13 @@
}
console.log("🚀 ~ nextTick ~ ztSfxg:", ztSfxg)
if(record.xdqksmPath){
xdnfDisabled.value = true;//
}else{
handleXdsj(record.zxsj)
}
});
}
@ -167,6 +203,12 @@
var nd = zxsj.substring(0,4);
model.years = nd;
// if(!model.id && xdnfDisabled && !model.xdqksmPath){
// createMessage.error("");
// confirmLoading.value = false;
// return ;
// }
await saveOrUpdate(model, isUpdate.value)
.then((res) => {
if (res.success) {

View File

@ -0,0 +1,72 @@
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from "/@/hooks/web/useMessage";
const { createConfirm } = useMessage();
enum Api {
list = '/blKckhclbl/blKckhclbl/list',
save='/blKckhclbl/blKckhclbl/add',
edit='/blKckhclbl/blKckhclbl/edit',
deleteOne = '/blKckhclbl/blKckhclbl/delete',
deleteBatch = '/blKckhclbl/blKckhclbl/deleteBatch',
importExcel = '/blKckhclbl/blKckhclbl/importExcel',
exportXls = '/blKckhclbl/blKckhclbl/exportXls',
}
/**
* api
* @param params
*/
export const getExportUrl = Api.exportXls;
/**
* api
*/
export const getImportUrl = Api.importExcel;
/**
*
* @param params
*/
export const list = (params) => defHttp.get({ url: Api.list, params });
/**
*
* @param params
* @param handleSuccess
*/
export const deleteOne = (params,handleSuccess) => {
return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
/**
*
* @param params
* @param handleSuccess
*/
export const batchDelete = (params, handleSuccess) => {
createConfirm({
iconType: 'warning',
title: '确认删除',
content: '是否删除选中数据',
okText: '确认',
cancelText: '取消',
onOk: () => {
return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
});
}
/**
*
* @param params
* @param isUpdate
*/
export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save;
return defHttp.post({ url: url, params }, { isTransformResponse: false });
}

View File

@ -0,0 +1,30 @@
import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
import { rules} from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '课程任务代码',
align: "center",
dataIndex: 'kcrwdm'
},
{
title: '补录类型',
align: "center",
dataIndex: 'blType_dictText'
},
{
title: '补录附件',
align: "center",
dataIndex: 'blFilePath',
},
];
// 高级查询数据
export const superQuerySchema = {
kcrwdm: {title: '课程任务代码',order: 0,view: 'text', type: 'string',},
blType: {title: '补录类型',order: 1,view: 'radio', type: 'string',dictCode: 'kckhcl_bltype',},
blFilePath: {title: '补录附件',order: 2,view: 'file', type: 'string',},
};

View File

@ -0,0 +1,240 @@
<template>
<div class="p-2">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24">
</a-row>
</a-form>
</div>
<!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" v-auth="'blKckhclbl:bl_kckhclbl:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
<a-button type="primary" v-auth="'blKckhclbl:bl_kckhclbl:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<j-upload-button type="primary" v-auth="'blKckhclbl:bl_kckhclbl:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay>
<a-menu>
<a-menu-item key="1" @click="batchHandleDelete">
<Icon icon="ant-design:delete-outlined"></Icon>
删除
</a-menu-item>
</a-menu>
</template>
<a-button v-auth="'blKckhclbl:bl_kckhclbl:deleteBatch'">批量操作
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
<!-- 高级查询 -->
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
</template>
<template v-slot:bodyCell="{ column, record, index, text }">
<template v-if="column.dataIndex==='blFilePath'">
<!--文件字段回显插槽-->
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
</template>
</template>
</BasicTable>
<!-- 表单区域 -->
<BlKckhclblModal ref="registerModal" @success="handleSuccess"></BlKckhclblModal>
</div>
</template>
<script lang="ts" name="blKckhclbl-blKckhclbl" setup>
import { ref, reactive } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { columns, superQuerySchema } from './BlKckhclbl.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './BlKckhclbl.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import BlKckhclblModal from './components/BlKckhclblModal.vue'
import { useUserStore } from '/@/store/modules/user';
const formRef = ref();
const queryParam = reactive<any>({});
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
const userStore = useUserStore();
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
title: '课程考核材料补录信息',
api: list,
columns,
canResize:false,
useSearchForm: false,
actionColumn: {
width: 120,
fixed: 'right',
},
beforeFetch: async (params) => {
return Object.assign(params, queryParam);
},
},
exportConfig: {
name: "课程考核材料补录信息",
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess
},
});
const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
const labelCol = reactive({
xs:24,
sm:4,
xl:6,
xxl:4
});
const wrapperCol = reactive({
xs: 24,
sm: 20,
});
//
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
searchQuery();
}
/**
* 新增事件
*/
function handleAdd() {
registerModal.value.disableSubmit = false;
registerModal.value.add();
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
registerModal.value.disableSubmit = false;
registerModal.value.edit(record);
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
registerModal.value.disableSubmit = true;
registerModal.value.edit(record);
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
* 操作栏
*/
function getTableAction(record) {
return [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
auth: 'blKckhclbl:bl_kckhclbl:edit'
},
];
}
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}, {
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
placement: 'topLeft',
},
auth: 'blKckhclbl:bl_kckhclbl:delete'
}
]
}
/**
* 查询
*/
function searchQuery() {
reload();
}
/**
* 重置
*/
function searchReset() {
formRef.value.resetFields();
selectedRowKeys.value = [];
//
reload();
}
</script>
<style lang="less" scoped>
.jeecg-basic-table-form-container {
padding: 0;
.table-page-search-submitButtons {
display: block;
margin-bottom: 24px;
white-space: nowrap;
}
.query-group-cust{
min-width: 100px !important;
}
.query-group-split-cust{
width: 30px;
display: inline-block;
text-align: center
}
.ant-form-item:not(.ant-form-item-with-help){
margin-bottom: 16px;
height: 32px;
}
:deep(.ant-picker),:deep(.ant-input-number){
width: 100%;
}
}
</style>

View File

@ -0,0 +1,172 @@
<template>
<a-spin :spinning="confirmLoading">
<JFormContainer :disabled="disabled">
<template #detail>
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="BlKckhclblForm">
<a-row>
<a-col :span="24" hidden>
<a-form-item label="课程任务代码" v-bind="validateInfos.kcrwdm" id="BlKckhclblForm-kcrwdm" name="kcrwdm">
<a-input v-model:value="formData.kcrwdm" placeholder="请输入课程任务代码" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="24" hidden>
<a-form-item label="补录类型" v-bind="validateInfos.blType" id="BlKckhclblForm-blType" name="blType">
<!-- <j-dict-select-tag type='radio' v-model:value="formData.blType" dictCode="kckhcl_bltype" placeholder="请选择补录类型" allow-clear /> -->
<a-input v-model:value="formData.blType" placeholder="请输入课程任务代码" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="补录附件" v-bind="validateInfos.blFilePath" id="BlKckhclblForm-blFilePath" name="blFilePath">
<j-upload v-model:value="formData.blFilePath" :bizPath="dqnd" :max-count="1" ></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form>
</template>
</JFormContainer>
</a-spin>
</template>
<script lang="ts" setup>
import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from '/@/hooks/web/useMessage';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
import { getValueType } from '/@/utils';
import { saveOrUpdate } from '../BlKckhclbl.api';
import { Form } from 'ant-design-vue';
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
import dayjs from 'dayjs';
const props = defineProps({
formDisabled: { type: Boolean, default: false },
formData: { type: Object, default: () => ({})},
formBpm: { type: Boolean, default: true }
});
const formRef = ref();
const useForm = Form.useForm;
const emit = defineEmits(['register', 'ok']);
const formData = reactive<Record<string, any>>({
id: '',
kcrwdm: '',
blType: '',
blFilePath: '',
});
const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
const confirmLoading = ref<boolean>(false);
const dqnd = ref<string>('');
//
const validatorRules = reactive({
blFilePath: [{ required: true, message: '请选择补录附件' }],
});
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
//
const disabled = computed(()=>{
if(props.formBpm === true){
if(props.formData.disabled === false){
return false;
}else{
return true;
}
}
return props.formDisabled;
});
/**
* 新增
*/
function add() {
edit({});
}
/**
* 编辑
*/
function edit(record) {
nextTick(() => {
resetFields();
const tmpData = {};
Object.keys(formData).forEach((key) => {
if(record.hasOwnProperty(key)){
tmpData[key] = record[key]
}
})
//
Object.assign(formData, tmpData);
});
}
/**
* 提交数据
*/
async function submitForm() {
try {
//
await validate();
} catch ({ errorFields }) {
if (errorFields) {
const firstField = errorFields[0];
if (firstField) {
formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
}
}
return Promise.reject(errorFields);
}
confirmLoading.value = true;
const isUpdate = ref<boolean>(false);
//
let model = formData;
if (model.id) {
isUpdate.value = true;
}
//
for (let data in model) {
//
if (model[data] instanceof Array) {
let valueType = getValueType(formRef.value.getProps, data);
//
if (valueType === 'string') {
model[data] = model[data].join(',');
}
}
}
model.blType = "课程教学大纲";
await saveOrUpdate(model, isUpdate.value)
.then((res) => {
if (res.success) {
createMessage.success(res.message);
emit('ok');
} else {
createMessage.warning(res.message);
}
})
.finally(() => {
confirmLoading.value = false;
});
}
//
onMounted(() => {
const yearstr = dayjs().format('YYYY');
const monthstr = dayjs().format('MM');
dqnd.value = "/jxdd/khkhclbl/"+yearstr+"/"+monthstr
});
defineExpose({
add,
edit,
submitForm,
});
</script>
<style lang="less" scoped>
.antd-modal-form {
padding: 14px;
}
</style>

View File

@ -0,0 +1,81 @@
<template>
<j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
<BlKckhclblForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></BlKckhclblForm>
</j-modal>
</template>
<script lang="ts" setup>
import { ref, nextTick, defineExpose } from 'vue';
import BlKckhclblForm from './BlKckhclblForm.vue'
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const title = ref<string>('');
const width = ref<number>(800);
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();
const emit = defineEmits(['register', 'success']);
/**
* 新增
*/
function add() {
title.value = '新增';
visible.value = true;
nextTick(() => {
registerForm.value.add();
});
}
/**
* 编辑
* @param record
*/
function edit(record) {
title.value = disableSubmit.value ? '详情' : '编辑';
visible.value = true;
nextTick(() => {
registerForm.value.edit(record);
});
}
/**
* 确定按钮点击事件
*/
function handleOk() {
registerForm.value.submitForm();
}
/**
* form保存回调事件
*/
function submitCallback() {
handleCancel();
emit('success');
}
/**
* 取消按钮回调事件
*/
function handleCancel() {
visible.value = false;
}
defineExpose({
add,
edit,
disableSubmit,
});
</script>
<style lang="less">
/**隐藏样式-modal确定按钮 */
.jee-hidden {
display: none !important;
}
.ant-modal .ant-modal-body {
padding: 0;
height: 300px !important;
}
</style>
<style lang="less" scoped></style>

View File

@ -0,0 +1,295 @@
<template>
<div class="p-2">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol" class="query-criteria">
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="zjxnxq">
<template #label><span title="学年学期" class="xn-title">学年学期</span></template>
<j-dict-select-tag placeholder="请选择学年学期" v-model:value="queryParam.zjxnxq" :dictCode="`v_xqxn,xqxn,xqxn`" allow-clear />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="kkyxmc">
<template #label><span title="开课单位名称" class="xn-title">开课单位名称</span></template>
<j-dict-select-tag
placeholder="请选择开课单位名称"
v-model:value="queryParam.kkyxmc"
:dictCode="`v_kkdw,kkyxmc,kkyxmc`"
allow-clear
/>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="zhunaye">
<template #label><span title="所属专业" class="xn-title">所属专业</span></template>
<j-dict-select-tag
placeholder="请选择所属专业"
v-model:value="queryParam.zhuanye"
:dictCode="`v_zhuanye,dept_name,dept_name`"
allow-clear
/>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="kcmc">
<template #label><span title="任课教师" class="xn-title">任课教师</span></template>
<j-input placeholder="请输入任课教师" v-model:value="queryParam.teaxm" allow-clear></j-input>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="zhicheng">
<template #label><span title="职称" class="xn-title">职称</span></template>
<j-dict-select-tag
placeholder="请选择职称"
v-model:value="queryParam.zhicheng"
:dictCode="`v_zhicheng,zhicheng,zhicheng`"
allow-clear
/>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="kcmc">
<template #label><span title="课程名称" class="xn-title">课程名称</span></template>
<j-input placeholder="请输入课程名称" v-model:value="queryParam.kcmc" allow-clear></j-input>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="zhicheng">
<template #label><span title="是否需要补录" class="xn-title">是否需要补录</span></template>
<j-dict-select-tag
placeholder="请选择职称"
v-model:value="queryParam.sfxybl"
dictCode="yn"
allow-clear
/>
</a-form-item>
</a-col>
<a-col :span="6" style="text-align: right">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
</a-col>
</a-row>
</a-form>
</div>
<!--引用表格-->
<BasicTable @register="registerTable" >
<!--插槽:table标题-->
<template #tableTitle>
<!-- <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button> -->
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)"/>
</template>
<template v-slot:bodyCell="{ column, record, index, text }">
</template>
</BasicTable>
<!-- 表单区域 -->
<!-- <XxhbjwxtjxrwModal ref="registerModal" @success="handleSuccess"></XxhbjwxtjxrwModal> -->
<BlKckhclblModal ref="registerModal" @success="handleSuccess"></BlKckhclblModal>
</div>
</template>
<script lang="ts" name="xxhbjwxtjxrw-xxhbjwxtjxrw" setup>
import { ref, reactive } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { columnsBl, superQuerySchema } from './Xxhbjwxtjxrw.data';
import { listbl, deleteOne, batchDelete, getImportUrl, getExportUrl } from './Xxhbjwxtjxrw.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import XxhbjwxtjxrwModal from './components/XxhbjwxtjxrwModal.vue'
import { useUserStore } from '/@/store/modules/user';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
import BlKckhclblModal from '/@/views/bl/blKckhclbl/components/BlKckhclblModal.vue';
const formRef = ref();
const queryParam = reactive<any>({});
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
const userStore = useUserStore();
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
title: '补录考核材料',
api: listbl,
columns: columnsBl,
canResize:false,
useSearchForm: false,
actionColumn: {
width: 120,
fixed: 'right',
},
beforeFetch: async (params) => {
return Object.assign(params, queryParam);
},
},
exportConfig: {
name: "教务系统教学任务",
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess
},
});
const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
const labelCol = reactive({
xs:24,
sm:8,
xl: 8,
xxl:8
});
const wrapperCol = reactive({
xs: 24,
sm: 16,
});
//
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
searchQuery();
}
/**
* 新增事件
*/
function handleAdd() {
registerModal.value.disableSubmit = false;
registerModal.value.add();
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
record.id = null
registerModal.value.disableSubmit = false;
registerModal.value.edit(record);
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
registerModal.value.disableSubmit = true;
registerModal.value.edit(record);
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
* 操作栏
*/
function getTableAction(record) {
return [
{
label: '补录',
onClick: handleEdit.bind(null, record),
// ifShow: () => {
// return !record.blType; //
// },
},
// {
// label: '',
// onClick: handleDetail.bind(null, record),
// },
];
}
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}, {
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
placement: 'topLeft',
},
auth: 'xxhbjwxtjxrw:xxhbjwxtjxrw:delete'
}
]
}
/**
* 查询
*/
function searchQuery() {
reload();
}
/**
* 重置
*/
function searchReset() {
formRef.value.resetFields();
selectedRowKeys.value = [];
//
reload();
}
</script>
<style lang="less" scoped>
.jeecg-basic-table-form-container {
padding: 0;
.table-page-search-submitButtons {
display: block;
margin-bottom: 24px;
white-space: nowrap;
}
.query-group-cust{
min-width: 100px !important;
}
.query-group-split-cust{
width: 30px;
display: inline-block;
text-align: center
}
.ant-form-item:not(.ant-form-item-with-help){
margin-bottom: 16px;
height: 32px;
}
:deep(.ant-picker),:deep(.ant-input-number){
width: 100%;
}
}
</style>

View File

@ -5,6 +5,7 @@ const { createConfirm } = useMessage();
enum Api {
list = '/xxhbjwxtjxrw/xxhbjwxtjxrw/list',
listbl = '/xxhbjwxtjxrw/xxhbjwxtjxrw/listbl',
zjList = '/xxhbjwxtjxrw/xxhbjwxtjxrw/zjList',
save='/xxhbjwxtjxrw/xxhbjwxtjxrw/add',
edit='/xxhbjwxtjxrw/xxhbjwxtjxrw/edit',
@ -32,6 +33,7 @@ export const getImportUrl = Api.importExcel;
*/
export const list = (params) => defHttp.get({ url: Api.list, params });
export const zjList = (params) => defHttp.get({ url: Api.zjList, params });
export const listbl = (params) => defHttp.get({ url: Api.listbl, params });
/**
*

View File

@ -94,6 +94,52 @@ export const columns: BasicColumn[] = [
];
export const columnsBl: BasicColumn[] = [
{
title: '学年学期',
align: "center",
dataIndex: 'zjxnxq'
},
{
title: '课程名称',
align: "center",
dataIndex: 'kcmc'
},
{
title: '课程类别',
align: "center",
dataIndex: 'kclb'
},
{
title: '开课单位',
align: "center",
dataIndex: 'kkyxmc'
},
{
title: '专业名称',
align: "center",
dataIndex: 'zymc',
width: 220
},
{
title: '任课教师[职称]',
align: "center",
dataIndex: 'teaxm'
},
{
title: '是否需要补录',
align: "center",
dataIndex: 'blType',
customRender: function ({ text }) {
if (text) {
return '否';
} else {
return '是';
}
},
},
];
//列表数据
export const columns2: BasicColumn[] = [
{

View File

@ -225,8 +225,7 @@ function searchReset() {
function init(record) {
queryParam.kcrwdm = record.kcrwdm;
// queryParam.fjtype = ',,,-,-,-,-';
queryParam.fjtype = '历次过程性考核-评分标准,历次过程性考核-内容及要求(或试题),课程考核合理性审核记录单,期末考试-评分标准,期未考试-试题(或内容及要求),课程考核质量评价单,课程目标达成情况评价报告';
queryParam.fjtype = '历次过程性考核-评分标准,历次过程性考核-内容及要求(或试题),课程考核合理性审核记录单,期末考试-评分标准,期未考试-试题(或内容及要求),课程考核质量评价单,课程目标达成情况评价报告,课程教学大纲';
//
//
//

View File

@ -272,8 +272,7 @@ function searchReset() {
function init(record) {
queryParam.kcrwdm = record.kcrwdm;
// queryParam.fjtype = ',,,-,-,-,-';
queryParam.fjtype = '历次过程性考核-评分标准,历次过程性考核-内容及要求(或试题),课程考核合理性审核记录单,期末考试-评分标准,期未考试-试题(或内容及要求),课程考核质量评价单,课程目标达成情况评价报告';
queryParam.fjtype = '历次过程性考核-评分标准,历次过程性考核-内容及要求(或试题),课程考核合理性审核记录单,期末考试-评分标准,期未考试-试题(或内容及要求),课程考核质量评价单,课程目标达成情况评价报告,课程教学大纲';
//
//
//

View File

@ -48,11 +48,11 @@ export const columns: BasicColumn[] = [
align: "center",
dataIndex: 'xnxq'
},
// {
// title: '课程所属专业',
// align: "center",
// dataIndex: 'zydl'
// },
{
title: '所属专业',
align: "center",
dataIndex: 'zydl'
},
{
title: '课程名称',
align: "center",

View File

@ -51,11 +51,11 @@
<JSelectMultiple v-model:value="formData.kkdw" placeholder="请选择开课单位,如果不选,默认全部" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
</a-form-item>
</a-col>
<!-- <a-col :span="24">
<a-form-item label="校内专业(大类)" v-bind="validateInfos.zydl" id="ZjSqxxForm-zydl" name="zydl">
<a-input v-model:value="formData.zydl" placeholder="请输入校内专业(大类)" allow-clear></a-input>
<a-col :span="24">
<a-form-item label="校内专业(大类)" id="ZjSqxxForm-zydl" name="zydl">
<JSelectMultiple v-model:value="formData.zydl" placeholder="请选择校内专业,如果不选,默认全部" :dictCode="`v_zhuanye,dept_name,dept_name`"></JSelectMultiple>
</a-form-item>
</a-col> -->
</a-col>
<a-col :span="24">
<a-form-item label="课程类别" id="ZjSqxxForm-kclb" name="kclb">
<JSelectMultiple v-model:value="formData.kclb" placeholder="请选择开课单位,如果不选,默认全部" dictCode="kcxz"></JSelectMultiple>

View File

@ -55,11 +55,11 @@
<JSelectMultiple v-model:value="item.kkdw" placeholder="请选择开课单位,如果不选,默认全部" :dictCode="`v_kkdw,KKYXMC,KKYXMC`"></JSelectMultiple>
</a-form-item>
</a-col>
<!-- <a-col :span="24">
<a-col :span="24">
<a-form-item label="校内专业(大类)" v-bind="validateInfos.zydl" id="ZjSqxxForm-zydl" name="zydl">
<a-input v-model:value="item.zydl" placeholder="请输入校内专业(大类)" allow-clear></a-input>
<JSelectMultiple v-model:value="item.zydl" placeholder="请选择校内专业,如果不选,默认全部" :dictCode="`v_zhuanye,dept_name,dept_name`"></JSelectMultiple>
</a-form-item>
</a-col> -->
</a-col>
<a-col :span="24">
<a-form-item label="课程类别" id="ZjSqxxForm-kclb" name="kclb">
<JSelectMultiple v-model:value="item.kclb" placeholder="请选择课程类别,如果不选,默认全部" dictCode="kcxz"></JSelectMultiple>

View File

@ -9,7 +9,7 @@
<div><img src="/src/assets/images/step.png" class="step-img" ><p class="step-text">第1步</p></div>
<div class="buttonClass">
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls141">导入表1-4-1专业基本情况数据</j-upload-button>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei">{{dataList.t141}}</span></a-col>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei">{{dataList.t141}}</span> <span>{{dataList.t141time}}</span></a-col>
</div>
</div>
</a-col>
@ -18,7 +18,7 @@
<div><img src="/src/assets/images/step.png" class="step-img" ><p class="step-text">第2步</p></div>
<div class="buttonClass">
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls151">导入表1-5-1教职工基本信息数据</j-upload-button>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei">{{dataList.t151}}</span></a-col>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei">{{dataList.t151}}</span> <span>{{dataList.t151time}}</span></a-col>
</div>
</div>
</a-col>
@ -27,7 +27,7 @@
<div><img src="/src/assets/images/step.png" class="step-img" ><p class="step-text">第3步</p></div>
<div class="buttonClass">
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls152">导入表1-5-2教职工其他信息数据</j-upload-button>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei">{{dataList.t152}}</span></a-col>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei">{{dataList.t152}}</span> <span>{{dataList.t152time}}</span></a-col>
</div>
</div>
</a-col>
@ -36,7 +36,7 @@
<div><img src="/src/assets/images/step.png" class="step-img" ><p class="step-text">第4步</p></div>
<div class="buttonClass">
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls153">导入表1-5-3外聘和兼职教师基本信息数据</j-upload-button>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei">{{dataList.t153}}</span></a-col>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei">{{dataList.t153}}</span> <span>{{dataList.t153time}}</span></a-col>
</div>
</div>
</a-col>
@ -45,7 +45,7 @@
<div><img src="/src/assets/images/step.png" class="step-img" ><p class="step-text">第5步</p></div>
<div class="buttonClass">
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls16">导入表1-6本科生基本情况数据</j-upload-button>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei">{{dataList.t16}}</span></a-col>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei">{{dataList.t16}}</span> <span>{{dataList.t16time}}</span></a-col>
</div>
</div>
</a-col>
@ -54,7 +54,7 @@
<div><img src="/src/assets/images/step.png" class="step-img" ><p class="step-text">第6步</p></div>
<div class="buttonClass">
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls24">导入表2-4校内外实习实践实训基地数据</j-upload-button>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei"><span class="setp-wei">{{dataList.t24}}</span></span></a-col>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei">{{dataList.t24}}</span> <span>{{dataList.t24time}}</span></a-col>
</div>
</div>
</a-col>
@ -63,7 +63,7 @@
<div><img src="/src/assets/images/step.png" class="step-img" ><p class="step-text">第7步</p></div>
<div class="buttonClass">
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXlssf3">导入表SF-3师范-3师范类专业办学基本条件数据</j-upload-button>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei">{{dataList.tsf3}}</span></a-col>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei">{{dataList.tsf3}}</span> <span>{{dataList.tsf3time}}</span></a-col>
</div>
</div>
</a-col>
@ -72,7 +72,7 @@
<div><img src="/src/assets/images/step.png" class="step-img" ><p class="step-text">第8步</p></div>
<div class="buttonClass">
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXlssf5">导入表SF-5师范-5师范类专业培养情况数据</j-upload-button>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei">{{dataList.tsf5}}</span></a-col>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei">{{dataList.tsf5}}</span> <span>{{dataList.tsf5time}}</span></a-col>
</div>
</div>
</a-col>
@ -81,7 +81,7 @@
<div><img src="/src/assets/images/step.png" class="step-img" ><p class="step-text">第9步</p></div>
<div class="buttonClass">
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXlssf6">表SF-6师范-6教师教育课程情况表数据</j-upload-button>
<a-col style="margin-top: 10px;">成功导入数据: <span class="setp-wei">{{dataList.tsf6}}</span></a-col>
<a-col style="margin-top: 10px;">成功导入数据: <span class="setp-wei">{{dataList.tsf6}}</span> <span>{{dataList.tsf6time}}</span></a-col>
</div>
</div>
</a-col>
@ -90,7 +90,7 @@
<div><img src="/src/assets/images/step.png" class="step-img" ><p class="step-text">第10步</p></div>
<div class="buttonClass">
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXlssf8">表SF-8师范-8教育实践情况数据</j-upload-button>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei"> {{dataList.tsf8}}</span></a-col>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei"> {{dataList.tsf8}}</span> <span>{{dataList.tsf8time}}</span></a-col>
</div>
</div>
</a-col>
@ -99,7 +99,7 @@
<div><img src="/src/assets/images/step.png" class="step-img" ><p class="step-text">第11步</p></div>
<div class="buttonClass">
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXlssf9">表SF-9师范-9师范类专业非本科学生数量基本情况</j-upload-button>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei">{{dataList.tsf9}}</span></a-col>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei">{{dataList.tsf9}}</span> <span>{{dataList.tsf9time}}</span></a-col>
</div>
</div>
</a-col>
@ -108,7 +108,7 @@
<div><img src="/src/assets/images/step.png" class="step-img" ><p class="step-text">第12步</p></div>
<div class="buttonClass">
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXlssf11">导入表SF-11师范-11师范类专业应届毕业生情况</j-upload-button>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei">{{dataList.tsf11}}</span></a-col>
<a-col style="margin-top: 10px;">成功导入数据:<span class="setp-wei">{{dataList.tsf11}}</span> <span>{{dataList.tsf11time}}</span></a-col>
</div>
</div>
</a-col>