diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blClsfzs/controller/BlClsfzsController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blClsfzs/controller/BlClsfzsController.java new file mode 100644 index 0000000..44e35e4 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blClsfzs/controller/BlClsfzsController.java @@ -0,0 +1,178 @@ +package org.jeecg.modules.demo.blClsfzs.controller; + +import java.util.Arrays; +import java.util.HashMap; +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.system.query.QueryRuleEnum; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.demo.blClsfzs.entity.BlClsfzs; +import org.jeecg.modules.demo.blClsfzs.service.IBlClsfzsService; + +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: bl_clsfzs + * @Author: jeecg-boot + * @Date: 2025-02-19 + * @Version: V1.0 + */ +@Api(tags="bl_clsfzs") +@RestController +@RequestMapping("/blClsfzs/blClsfzs") +@Slf4j +public class BlClsfzsController extends JeecgController { + @Autowired + private IBlClsfzsService blClsfzsService; + + /** + * 分页列表查询 + * + * @param blClsfzs + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "bl_clsfzs-分页列表查询") + @ApiOperation(value="bl_clsfzs-分页列表查询", notes="bl_clsfzs-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(BlClsfzs blClsfzs, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(blClsfzs, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = blClsfzsService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param blClsfzs + * @return + */ + @AutoLog(value = "bl_clsfzs-添加") + @ApiOperation(value="bl_clsfzs-添加", notes="bl_clsfzs-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody BlClsfzs blClsfzs) { + blClsfzsService.save(blClsfzs); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param blClsfzs + * @return + */ + @AutoLog(value = "bl_clsfzs-编辑") + @ApiOperation(value="bl_clsfzs-编辑", notes="bl_clsfzs-编辑") + @RequiresPermissions("blClsfzs:bl_clsfzs:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody BlClsfzs blClsfzs) { + blClsfzsService.updateById(blClsfzs); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "bl_clsfzs-通过id删除") + @ApiOperation(value="bl_clsfzs-通过id删除", notes="bl_clsfzs-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + blClsfzsService.removeById(id); + return Result.OK("操作成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "bl_clsfzs-批量删除") + @ApiOperation(value="bl_clsfzs-批量删除", notes="bl_clsfzs-批量删除") + @RequiresPermissions("blClsfzs:bl_clsfzs:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.blClsfzsService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "bl_clsfzs-通过id查询") + @ApiOperation(value="bl_clsfzs-通过id查询", notes="bl_clsfzs-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + BlClsfzs blClsfzs = blClsfzsService.getById(id); + if(blClsfzs==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(blClsfzs); + } + + /** + * 导出excel + * + * @param request + * @param blClsfzs + */ + @RequiresPermissions("blClsfzs:bl_clsfzs:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, BlClsfzs blClsfzs) { + return super.exportXls(request, blClsfzs, BlClsfzs.class, "bl_clsfzs"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("blClsfzs:bl_clsfzs:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, BlClsfzs.class); + } + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blClsfzs/entity/BlClsfzs.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blClsfzs/entity/BlClsfzs.java new file mode 100644 index 0000000..776a1cc --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blClsfzs/entity/BlClsfzs.java @@ -0,0 +1,57 @@ +package org.jeecg.modules.demo.blClsfzs.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 org.jeecg.common.constant.ProvinceCityArea; +import org.jeecg.common.util.SpringContextUtils; +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: bl_clsfzs + * @Author: jeecg-boot + * @Date: 2025-02-19 + * @Version: V1.0 + */ +@Data +@TableName("bl_clsfzs") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="bl_clsfzs对象", description="bl_clsfzs") +public class BlClsfzs implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.Integer 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; + /**kcrwdm*/ + @Excel(name = "kcrwdm", width = 15) + @ApiModelProperty(value = "kcrwdm") + private java.lang.String kcrwdm; + /**clType*/ + @Excel(name = "clType", width = 15) + @ApiModelProperty(value = "clType") + private java.lang.String clType; +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blClsfzs/mapper/BlClsfzsMapper.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blClsfzs/mapper/BlClsfzsMapper.java new file mode 100644 index 0000000..2fdf7b3 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blClsfzs/mapper/BlClsfzsMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.demo.blClsfzs.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.demo.blClsfzs.entity.BlClsfzs; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: bl_clsfzs + * @Author: jeecg-boot + * @Date: 2025-02-19 + * @Version: V1.0 + */ +public interface BlClsfzsMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blClsfzs/mapper/xml/BlClsfzsMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blClsfzs/mapper/xml/BlClsfzsMapper.xml new file mode 100644 index 0000000..ca5391e --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blClsfzs/mapper/xml/BlClsfzsMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blClsfzs/service/IBlClsfzsService.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blClsfzs/service/IBlClsfzsService.java new file mode 100644 index 0000000..a3d1675 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blClsfzs/service/IBlClsfzsService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.demo.blClsfzs.service; + +import org.jeecg.modules.demo.blClsfzs.entity.BlClsfzs; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: bl_clsfzs + * @Author: jeecg-boot + * @Date: 2025-02-19 + * @Version: V1.0 + */ +public interface IBlClsfzsService extends IService { + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blClsfzs/service/impl/BlClsfzsServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blClsfzs/service/impl/BlClsfzsServiceImpl.java new file mode 100644 index 0000000..c0a4f3b --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blClsfzs/service/impl/BlClsfzsServiceImpl.java @@ -0,0 +1,21 @@ +package org.jeecg.modules.demo.blClsfzs.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.jeecg.modules.demo.blClsfzs.entity.BlClsfzs; +import org.jeecg.modules.demo.blClsfzs.mapper.BlClsfzsMapper; +import org.jeecg.modules.demo.blClsfzs.service.IBlClsfzsService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: bl_clsfzs + * @Author: jeecg-boot + * @Date: 2025-02-19 + * @Version: V1.0 + */ +@Service +@DS("multi-datasource1") +public class BlClsfzsServiceImpl extends ServiceImpl implements IBlClsfzsService { + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/controller/XxhbjwxtjxrwController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/controller/XxhbjwxtjxrwController.java index 7bf8124..4175a8f 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/controller/XxhbjwxtjxrwController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/controller/XxhbjwxtjxrwController.java @@ -143,7 +143,7 @@ public class XxhbjwxtjxrwController extends JeecgController zjXkxxQueryWrapper = new QueryWrapper<>(); zjXkxxQueryWrapper.eq("user_id",sysUser.getUsername()); List list = zjXkxxService.zjList(zjXkxxQueryWrapper); @@ -173,13 +173,121 @@ public class XxhbjwxtjxrwController extends JeecgController> list2(Xxhbjwxtjxrw xxhbjwxtjxrw, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + + + + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(xxhbjwxtjxrw, req.getParameterMap()); + + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + QueryWrapper zjSqxxQueryWrapper = new QueryWrapper<>(); + zjSqxxQueryWrapper.eq("user_id",sysUser.getId()); + zjSqxxQueryWrapper.eq("sqfw","0"); + zjSqxxQueryWrapper.eq("sqzt","0"); + ZjSqxx zjSqxx = zjSqxxService.getOne(zjSqxxQueryWrapper); + String sfjx = "0"; + String xnxq = "0"; + if(zjSqxx!=null){ + Date date = new Date(); + if(zjSqxx.getSqStartTime()!=null&&zjSqxx.getSqStartTime().getTime()>=date.getTime()){ + sfjx = "1"; + } + if(zjSqxx.getSqEndTime()!=null&&zjSqxx.getSqEndTime().getTime()<=date.getTime()){ + sfjx = "1"; + } + if(StringUtils.isNotBlank(zjSqxx.getXnxq())){ + xnxq = "1"; + queryWrapper.in("concat(xn,xqmc)",zjSqxx.getXnxq().split(",")); +// queryWrapper.apply(StringUtils.isNotBlank(xxhbjwxtjxrw.getZjxnxq()),"concat(xn,xqmc) in (",zjSqxx.getxn()); + } + if(StringUtils.isNotBlank(zjSqxx.getKkdw())){ + queryWrapper.in("kkyxmc",zjSqxx.getKkdw().split(",")); + } + if(StringUtils.isNotBlank(zjSqxx.getKcmc())){ + queryWrapper.in("kcmc",zjSqxx.getKcmc().split(",")); + } + 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("您未在授权期限内，不能进行查询！"); + } + + if(StringUtils.isNotBlank(xxhbjwxtjxrw.getZjxnxq())){ + queryWrapper.eq(StringUtils.isNotBlank(xxhbjwxtjxrw.getZjxnxq()),"concat(xn,xqmc)",xxhbjwxtjxrw.getZjxnxq()); + }else if(StringUtils.equals(xnxq,"0")){ + String dqxq = commonApi.translateDict("dqxq","1"); + queryWrapper.eq("concat(xn,xqmc)",dqxq); + } + + + + 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()+"'"); + if(StringUtils.isNotBlank(xxhbjwxtjxrw.getSfzs()) && StringUtils.equals("0",xxhbjwxtjxrw.getSfzs())){ + queryWrapper.apply("IF(b.id is null,'0',b.id) = '0'");//展示 + } + if(StringUtils.isNotBlank(xxhbjwxtjxrw.getSfzs()) && StringUtils.equals("1",xxhbjwxtjxrw.getSfzs())){ + queryWrapper.apply("IF(b.id is null,'0',b.id) != '0'");//不展示 + } + QueryWrapper zjXkxxQueryWrapper = new QueryWrapper<>(); + zjXkxxQueryWrapper.eq("user_id",sysUser.getUsername()); + List list = zjXkxxService.zjList(zjXkxxQueryWrapper); +// if(list!=null&&list.size()>0){ +// StringBuffer sb = new StringBuffer(); +// for(ZjXkxx zjXkxx:list){ +// sb.append(zjXkxx.getKcrwdm()+","); +// } +// queryWrapper.notIn("kcrwdm",sb.toString().split(",")); +// } + + + + Page page = new Page(pageNo, pageSize); + IPage pageList = xxhbjwxtjxrwService.page(page, queryWrapper); + + pageList.getRecords().forEach(item->{ + AtomicReference sfxk = new AtomicReference<>("0"); + list.forEach(zjXkxx -> { + if(StringUtils.equals(zjXkxx.getKcrwdm(),item.getKcrwdm())){ + sfxk.set("1"); + } + }); + item.setSfxk(sfxk.toString()); + }); + + return Result.OK(pageList); + } + @ApiOperation(value="查询专家选课列表", notes="查询专家选课列表") @GetMapping(value = "/zjList") public Result> zjList(Xxhbjwxtjxrw xxhbjwxtjxrw, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(xxhbjwxtjxrw, req.getParameterMap()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper("a",xxhbjwxtjxrw, req.getParameterMap()); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -192,7 +300,7 @@ public class XxhbjwxtjxrwController extends JeecgController pageList = new Page<>(); return Result.OK(pageList); @@ -201,6 +309,7 @@ public class XxhbjwxtjxrwController extends JeecgController page = new Page(pageNo, pageSize); IPage pageList = xxhbjwxtjxrwService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/entity/Xxhbjwxtjxrw.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/entity/Xxhbjwxtjxrw.java index 2810e3a..e4d90ad 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/entity/Xxhbjwxtjxrw.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/entity/Xxhbjwxtjxrw.java @@ -98,6 +98,7 @@ public class Xxhbjwxtjxrw implements Serializable { @TableField(exist = false) private java.lang.String zhicheng; @TableField(exist = false) + @Dict(dicCode = "xqxn",dictTable = "v_xqxn",dicText = "short_xqxn") private java.lang.String zjxnxq;//专家展示学年学期 @TableField(exist = false) private java.lang.String sfxk;//是否选课 0未选 1已选 @@ -108,6 +109,10 @@ public class Xxhbjwxtjxrw implements Serializable { private java.lang.String blType;//补录类型 @TableField(exist = false) private java.lang.String sfxybl;//是否需要补录 + @TableField(exist = false) + private java.lang.String sfzs;//是否展示 0展示，其他不展示 + @TableField(exist = false) + private java.lang.String id;//伪主键 } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/mapper/xml/XxhbjwxtjxrwMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/mapper/xml/XxhbjwxtjxrwMapper.xml index 2c6d55c..76aa694 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/mapper/xml/XxhbjwxtjxrwMapper.xml +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/mapper/xml/XxhbjwxtjxrwMapper.xml @@ -3,7 +3,8 @@ diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/controller/XxhbjwxtxsmdController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/controller/XxhbjwxtxsmdController.java index 865a95b..86c2460 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/controller/XxhbjwxtxsmdController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/controller/XxhbjwxtxsmdController.java @@ -311,6 +311,13 @@ public class XxhbjwxtxsmdController extends JeecgController zhjxList = xxhbjwxtxsmdService.selectZhjxList(xxhbjwxtxsmd); + for(Xxhbjwxtxsmd par:zhjxList){ + list.add(par); + } + return Result.OK(list); } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/entity/Xxhbjwxtxsmd.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/entity/Xxhbjwxtxsmd.java index 63f581b..f802a47 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/entity/Xxhbjwxtxsmd.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/entity/Xxhbjwxtxsmd.java @@ -149,4 +149,8 @@ public class Xxhbjwxtxsmd implements Serializable { private String downPath[]; @TableField(exist = false) private String downName; + @TableField(exist = false) + private String cltype; + @TableField(exist = false) + private String fxcjdm; } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/mapper/XxhbjwxtxsmdMapper.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/mapper/XxhbjwxtxsmdMapper.java index 0a9e579..9a0e7ec 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/mapper/XxhbjwxtxsmdMapper.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/mapper/XxhbjwxtxsmdMapper.java @@ -19,4 +19,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface XxhbjwxtxsmdMapper extends BaseMapper { IPage getXsmdxxByFjtype(Page page, @Param("xxhbjwxtxsmd") Xxhbjwxtxsmd xxhbjwxtxsmd); + + List selectZhjxList(Xxhbjwxtxsmd xxhbjwxtxsmd); } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/mapper/xml/XxhbjwxtxsmdMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/mapper/xml/XxhbjwxtxsmdMapper.xml index 4a24b95..493e9b2 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/mapper/xml/XxhbjwxtxsmdMapper.xml +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/mapper/xml/XxhbjwxtxsmdMapper.xml @@ -23,4 +23,16 @@ and b.student_path is not null order by b.student_path desc + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/service/IXxhbjwxtxsmdService.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/service/IXxhbjwxtxsmdService.java index 136e110..31fd433 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/service/IXxhbjwxtxsmdService.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/service/IXxhbjwxtxsmdService.java @@ -23,4 +23,6 @@ public interface IXxhbjwxtxsmdService extends IService { IPage getXsmdxxByFjtype(Page page, Xxhbjwxtxsmd xxhbjwxtxsmd); Xxhbjwxtxsmd getBatchDown(Xxhbjwxtxsmd xxhbjwxtxsmd, HttpServletResponse response); + + List selectZhjxList(Xxhbjwxtxsmd xxhbjwxtxsmd); } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/service/impl/XxhbjwxtxsmdServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/service/impl/XxhbjwxtxsmdServiceImpl.java index 871327e..f2c7194 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/service/impl/XxhbjwxtxsmdServiceImpl.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtxsmd/service/impl/XxhbjwxtxsmdServiceImpl.java @@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.zip.ZipEntry; @@ -134,6 +135,11 @@ public class XxhbjwxtxsmdServiceImpl extends ServiceImpl selectZhjxList(Xxhbjwxtxsmd xxhbjwxtxsmd) { + return baseMapper.selectZhjxList(xxhbjwxtxsmd); + } + @Transactional(rollbackFor = {Exception.class}) public boolean syncList(Collection entityList, boolean isDelete) { QueryWrapper dqw = new QueryWrapper(); diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/controller/ZjSqxxController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/controller/ZjSqxxController.java index 4f64a60..23dcbed 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/controller/ZjSqxxController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjSqxx/controller/ZjSqxxController.java @@ -202,7 +202,7 @@ public class ZjSqxxController extends JeecgController { if(zjSqxxService.getOne(queryWrapper)!=null){ return Result.error("该用户已存在此授权信息，请查询后修改！"); } else { - zjSqxxService.save(zjSqxx); + zjSqxxService.addNew(zjSqxx); } return Result.OK("添加成功！"); } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjXkxx/entity/ZjXkxx.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjXkxx/entity/ZjXkxx.java index 6736173..b6e0381 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjXkxx/entity/ZjXkxx.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjXkxx/entity/ZjXkxx.java @@ -74,6 +74,7 @@ public class ZjXkxx implements Serializable { @TableField(exist = false) + @Dict(dicCode = "xqxn",dictTable = "v_xqxn",dicText = "short_xqxn") private java.lang.String zjxnxq;//专家展示学年学期 diff --git a/jeecgboot-vue3/.env b/jeecgboot-vue3/.env index 1856990..67c8f25 100644 --- a/jeecgboot-vue3/.env +++ b/jeecgboot-vue3/.env @@ -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 = true +VITE_GLOB_APP_OPEN_SSO = false # 开启微前端模式 VITE_GLOB_APP_OPEN_QIANKUN=true diff --git a/jeecgboot-vue3/src/views/bl/lwKhclXz/Xzlwkhcl copy.vue b/jeecgboot-vue3/src/views/bl/lwKhclXz/Xzlwkhcl copy.vue new file mode 100644 index 0000000..739cce6 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/lwKhclXz/Xzlwkhcl copy.vue @@ -0,0 +1,748 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/bl/lwKhclXz/Xzlwkhcl.vue b/jeecgboot-vue3/src/views/bl/lwKhclXz/Xzlwkhcl.vue index 739cce6..007579b 100644 --- a/jeecgboot-vue3/src/views/bl/lwKhclXz/Xzlwkhcl.vue +++ b/jeecgboot-vue3/src/views/bl/lwKhclXz/Xzlwkhcl.vue @@ -10,18 +10,36 @@
-
+ 查看材料 -
- --> + + + + + + + +
查看论文材料
--> - 查看材料 + 返回
@@ -244,91 +262,6 @@
- -
-
- - - 返回选择论文 - - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 全部 - 优秀 - 良好 - 中等 - 及格 - 不及格 - - - - - 查询 - - - -
- - - - - - -
@@ -393,7 +326,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ params: queryParam, }, }); -const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }] = tableContext; +const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =tableContext; //批量下载 async function batchHandleDown(record) { console.log('🙍‍♂️', record); @@ -600,19 +533,18 @@ async function handleDel(record) { await deleteXkxxOne({ id: record.id }, xtsuccess); } + + /** + * 批量删除事件 + */ + async function batchHandleDelete() { + await batchDelete({ ids: selectedRowKeys.value }, xtsuccess); + } + function xtsuccess() { - //获取是否有选课信息 - defHttp.get({ url: '/lwKhclXz/lwKhclXz/list', params: {pageNo: paginationYxkcProp.value.current,pageSize:paginationYxkcProp.value.pageSize } }).then((res) => { - console.log('🧛', res); - checkData.value = res.records; - if(res.current>res.pages){ - paginationYxkcProp.value.current =res.pages - xtsuccess() - }else{ - paginationYxkcProp.value.current = res.current; - } - paginationYxkcProp.value.total = res.total; - }); + +selectedRowKeys.value=[] + reload(); searchQuery2(); } /** @@ -644,8 +576,8 @@ async function onPageYxkcChange(record) { //返回首页 function handleFanhui() { - sfxk.value = 999; - init(); + sfxk.value = 1; + reload(); } function init() { diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/SysjxrwList.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/SysjxrwList.vue index 4c7dd86..9ae94fb 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/SysjxrwList.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/SysjxrwList.vue @@ -42,7 +42,16 @@ 待审核 审核通过 - + + + + + + + 全部 + 展示 + 不展示 + @@ -62,6 +71,13 @@ + @@ -73,12 +89,13 @@ import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { useListPage } from '/@/hooks/system/useListPage'; import { columns, superQuerySchema } from './Xxhbjwxtjxrw.data'; - import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './Xxhbjwxtjxrw.api'; + import { list2, 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 { defHttp } from '/@/utils/http/axios'; const formRef = ref(); const queryParam = reactive({}); @@ -89,11 +106,11 @@ //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { - api: list, + api: list2, columns, canResize:false, useSearchForm: false, - showActionColumn: false, + // showActionColumn: false, actionColumn: { width: 120, fixed: 'right', @@ -172,17 +189,31 @@ function textDown(type,downame){ * 详情 */ function handleDetail(record: Recordable) { - // registerModal.value.disableSubmit = true; - // registerModal.value.edit(record); + registerModal.value.disableSubmit = true; + registerModal.value.edit(record); - emit('callback',record) + // emit('callback',record) + } + + + function handleAddSfzs(record: Recordable){ + var params = {kcrwdm:record.kcrwdm,cl_type:'0'} + defHttp.post({ url: '/blClsfzs/blClsfzs/add', params }, { isTransformResponse: false }).then((res) => { + console.log(res); + reload(); + }) } + + async function handleDelSfzs(record: Recordable){ + await deleteOne({ id: record.sfzs }, handleSuccess); + } + /** * 删除事件 */ async function handleDelete(record) { - await deleteOne({ id: record.id }, handleSuccess); + await deleteOne({ id: record.id }, reload); } /** @@ -204,6 +235,20 @@ function textDown(type,downame){ */ function getTableAction(record) { return [ + { + label: '不展示', + onClick: handleAddSfzs.bind(null, record), + ifShow: () => { + return record.sfzs==0; // 判断有附件的才显示预览功能 + }, + }, + { + label: '展示', + onClick: handleDelSfzs.bind(null, record), + ifShow: () => { + return record.sfzs!=0; // 判断有附件的才显示预览功能 + }, + }, { label: '详情', onClick: handleDetail.bind(null, record), diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/SysjxrwList2.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/SysjxrwList2.vue new file mode 100644 index 0000000..4c7dd86 --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/SysjxrwList2.vue @@ -0,0 +1,261 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/Xxhbjwxtjxrw.api.ts b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/Xxhbjwxtjxrw.api.ts index dd2ef5e..4e30f62 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/Xxhbjwxtjxrw.api.ts +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/Xxhbjwxtjxrw.api.ts @@ -5,13 +5,15 @@ const { createConfirm } = useMessage(); enum Api { list = '/xxhbjwxtjxrw/xxhbjwxtjxrw/list', + xklist = '/zjXkxx/zjXkxx/list', + list2 = '/xxhbjwxtjxrw/xxhbjwxtjxrw/list2', listbl = '/xxhbjwxtjxrw/xxhbjwxtjxrw/listbl', zjList = '/xxhbjwxtjxrw/xxhbjwxtjxrw/zjList', save='/xxhbjwxtjxrw/xxhbjwxtjxrw/add', edit='/xxhbjwxtjxrw/xxhbjwxtjxrw/edit', - deleteOne = '/xxhbjwxtjxrw/xxhbjwxtjxrw/delete', + deleteOne = '/blClsfzs/blClsfzs/delete', deleteXkxxOne = '/zjXkxx/zjXkxx/delete', - deleteBatch = '/xxhbjwxtjxrw/xxhbjwxtjxrw/deleteBatch', + deleteBatch = '/zjXkxx/zjXkxx/deleteBatch', importExcel = '/xxhbjwxtjxrw/xxhbjwxtjxrw/importExcel', exportXls = '/xxhbjwxtjxrw/xxhbjwxtjxrw/exportXls', exportBlkhclXls = '/xxhbjwxtjxrw/xxhbjwxtjxrw/exportBlkhclXls', @@ -34,6 +36,8 @@ export const getImportUrl = Api.importExcel; * @param params */ export const list = (params) => defHttp.get({ url: Api.list, params }); +export const xklist = (params) => defHttp.get({ url: Api.xklist, params }); +export const list2 = (params) => defHttp.get({ url: Api.list2, params }); export const zjList = (params) => defHttp.get({ url: Api.zjList, params }); export const listbl = (params) => defHttp.get({ url: Api.listbl, params }); diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/Xxhbjwxtjxrw.data.ts b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/Xxhbjwxtjxrw.data.ts index 810c3c0..81fcd8e 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/Xxhbjwxtjxrw.data.ts +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/Xxhbjwxtjxrw.data.ts @@ -27,28 +27,28 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'kcmc' }, - { - title: '课程号', - align: "center", - dataIndex: 'kcrwdm' - }, + // { + // title: '课程号', + // align: "center", + // dataIndex: 'kcrwdm' + // }, { title: '课程类别', align: "center", dataIndex: 'kclb' }, - { - title: '学分', - align: "center", - dataIndex: 'xf', - width: 80 - }, - { - title: '学时', - align: "center", - dataIndex: 'zxs', - width: 80 - }, + // { + // title: '学分', + // align: "center", + // dataIndex: 'xf', + // width: 80 + // }, + // { + // title: '学时', + // align: "center", + // dataIndex: 'zxs', + // width: 80 + // }, { title: '开课单位', align: "center", @@ -84,7 +84,14 @@ export const columns: BasicColumn[] = [ { title: '审核状态', align: "center", - dataIndex: 'fileShztmc' + dataIndex: 'fileShztmc', + width: 80 + }, + { + title: '是否展示', + align: "center", + dataIndex: 'sfzs', + width: 80 }, // { // title: '是否能上传考核分析及试卷样本', @@ -155,7 +162,7 @@ export const columns2: BasicColumn[] = [ { title: '学年学期', align: "center", - dataIndex: 'zjxnxq', + dataIndex: 'zjxnxq_dictText', ellipsis: true, }, { @@ -258,7 +265,7 @@ export const columns3: BasicColumn[] = [ { title: '学年学期', align: "center", - dataIndex: 'zjxnxq' + dataIndex: 'zjxnxq_dictText' }, { title: '课程名称', diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList3.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList3.vue index b942c42..ba83823 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList3.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList3.vue @@ -197,14 +197,18 @@ -
+
+
+
返回
+ +
- +
@@ -239,7 +243,7 @@ - + @@ -452,8 +456,15 @@ function handleXuanke() { } function handleXsysclxq(record) { console.log('👨‍⚕️handleXsysclxq', record); - sfxk2.value = 5; - xsysclXqFormModal.value.init(record); + var cltype = record.cltype; + console.log('cltype--->',cltype); + if(cltype == '1'){ + sfxk2.value = 6; + Xxhbfxcjmxb0015Modal.value.init(record); + }else{ + sfxk2.value = 5; + xsysclXqFormModal.value.init(record); + } } //返回首页 function handleFanhui() { diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList copy 2.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList copy 2.vue new file mode 100644 index 0000000..3fe8d3a --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList copy 2.vue @@ -0,0 +1,752 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList copy.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList copy.vue new file mode 100644 index 0000000..d3c6d0b --- /dev/null +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList copy.vue @@ -0,0 +1,685 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList.vue index 3fe8d3a..09e51e5 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList.vue @@ -10,34 +10,54 @@
-
+ - 查看材料 -
+
--> + + + + + + + + - - - + -->
@@ -45,7 +65,7 @@ - + @@ -198,14 +218,18 @@ -
+
+
+
返回
+ +
- +
- -
- -
- - - 返回选课 - - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 查询 - 重置 - - - - -
- - - - - - - - - -
@@ -328,7 +253,7 @@ import { ref, reactive, onMounted, computed } from 'vue'; import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { useListPage } from '/@/hooks/system/useListPage'; import { columns, columns2, columns3, superQuerySchema } from './Xxhbjwxtjxrw.data'; -import { zjList, list, deleteXkxxOne, batchDelete, getImportUrl, getExportUrl } from './Xxhbjwxtjxrw.api'; +import { zjList, list,xklist, deleteXkxxOne, batchDelete, getImportUrl, getExportUrl } from './Xxhbjwxtjxrw.api'; import { downloadFile } from '/@/utils/common/renderUtils'; import XxhbjwxtjxrwModal from './components/XxhbjwxtjxrwModal.vue'; import { useUserStore } from '/@/store/modules/user'; @@ -372,13 +297,16 @@ const jxrwInfo = reactive({}); const APagination = Pagination; const { createMessage } = useMessage(); const activeKey = ref('1'); + + //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { - api: zjList, + api: xklist, columns: columns3, canResize: false, useSearchForm: false, + // immediate: false, // actionColumn: { // width: 320, // fixed: 'right', @@ -397,8 +325,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ success: handleSuccess, }, }); -const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = - tableContext; +const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =tableContext; const labelCol = reactive({ xs: 24, sm: 8, @@ -423,7 +350,11 @@ const paginationYxkcProp = ref({ pageNo: 1, }); +function handleTable2SelectRowChange(event) { + console.log('--------rowchange----->',event); +} + //成绩单 function handleCjd(record) { sfxk.value = 2; @@ -449,13 +380,24 @@ function handleXuanke() { searchQuery2(); } function handleXsysclxq(record) { + // console.log('👨‍⚕️handleXsysclxq', record); + // sfxk2.value = 5; + // xsysclXqFormModal.value.init(record); + console.log('👨‍⚕️handleXsysclxq', record); - sfxk2.value = 5; - xsysclXqFormModal.value.init(record); + var cltype = record.cltype; + console.log('cltype--->',cltype); + if(cltype == '1'){ + sfxk2.value = 6; + Xxhbfxcjmxb0015Modal.value.init(record); + }else{ + sfxk2.value = 5; + xsysclXqFormModal.value.init(record); + } } //返回首页 function handleFanhui() { - init(); + init2(); } //选课确认 @@ -473,6 +415,14 @@ function handleQueren(record) { async function handleDel(record) { await deleteXkxxOne({ id: record.id }, xtsuccess); } + + /** + * 批量删除事件 + */ + async function batchHandleDelete() { + await batchDelete({ ids: selectedRowKeys.value }, xtsuccess); + } + //智慧教学中兴详情 function handleZhjxzx(record){ console.log("🚀 ~ handleZhjxzx ~ record:", record) @@ -481,20 +431,27 @@ console.log("🚀 ~ handleZhjxzx ~ record:", record) } function xtsuccess() { - //获取是否有选课信息 - defHttp.get({ url: '/zjXkxx/zjXkxx/list', params: { pageNo: paginationYxkcProp.value.current,pageSize:paginationYxkcProp.value.pageSize } }).then((res) => { - console.log('🧛', res); - checkData.value = res.records; - if(res.current>res.pages){ - paginationYxkcProp.value.current =res.pages - xtsuccess() - }else{ - paginationYxkcProp.value.current = res.current; - } - paginationYxkcProp.value.total = res.total; - }); +selectedRowKeys.value=[] + + reload(); searchQuery2(); } + +// function xtsuccess() { +// //获取是否有选课信息 +// defHttp.get({ url: '/zjXkxx/zjXkxx/list', params: { pageNo: paginationYxkcProp.value.current,pageSize:paginationYxkcProp.value.pageSize } }).then((res) => { +// console.log('🧛', res); +// checkData.value = res.records; +// if(res.current>res.pages){ +// paginationYxkcProp.value.current =res.pages +// xtsuccess() +// }else{ +// paginationYxkcProp.value.current = res.current; +// } +// paginationYxkcProp.value.total = res.total; +// }); +// searchQuery2(); +// } //翻页方法 async function onPageChange(record) { console.log('👬', record); diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/XxhbjwxtjxrwForm.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/XxhbjwxtjxrwForm.vue index dcd7599..4ea3f86 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/XxhbjwxtjxrwForm.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/XxhbjwxtjxrwForm.vue @@ -1,83 +1,58 @@ @@ -89,31 +64,45 @@ import { saveOrUpdate } from '../Xxhbjwxtjxrw.api'; import { Form } from 'ant-design-vue'; import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue'; - const props = defineProps({ - formDisabled: { type: Boolean, default: false }, - formData: { type: Object, default: () => ({})}, - formBpm: { type: Boolean, default: true } - }); +import XscjList from '/@/views/bl/xxhbjwxtjxrw/components/XscjList.vue'; +import KhpjclList from '/@/views/bl/xxhbjwxtscwjxx/KhpjclList.vue'; +import XsysclList from '/@/views/bl/xxhbjwxtxsmd/XsysclList.vue'; +import XsysclxqList from '/@/views/bl/xxhbjwxtxsmd/XsysclxqList.vue'; +import Xxhbfxcjb0016List from '/@/views/bl/xxhbfxcj/Xxhbfxcjb0016List.vue'; +import Xxhbfxcjmxb0015List from '/@/views/bl/xxhbfxcj/Xxhbfxcjmxb0015List.vue'; + +const cjdFormModal = ref(); +const khpjclFormModal = ref(); +const xsysclFormModal = ref(); +const xsysclXqFormModal = ref(); +const Xxhbfxcjb0016Modal = ref(); +const Xxhbfxcjmxb0015Modal = ref(); + +const jxrwInfo = reactive({}); + +const sfxk = ref(0); +const sfxk2 = ref(0); +const zhjxxx = ref(1); +const checkData = ref([]); +const dataList = ref([]); + +const activeKey = ref('1'); + const queryParam = reactive({}); + +const paginationYxkcProp = ref({ + total: 1, + current: 1, + pageSize: 10, + pageNo: 1, +}); + + + + + const formRef = ref(); const useForm = Form.useForm; const emit = defineEmits(['register', 'ok']); - const formData = reactive>({ - id: '', - xnxqdm: '', - kcmc: '', - kcrwdm: '', - kclb: '', - xf: '', - zxs: '', - kkyxmc: '', - teaxm: '', - bjxx: '', - xn: '', - xqmc: '', - sjfs: '', - khfsmc: '', - isUploadSj: '', - }); const { createMessage } = useMessage(); const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } }); const wrapperCol = ref({ xs: { span: 24 }, sm: { span: 16 } }); @@ -121,21 +110,55 @@ //表单验证 const validatorRules = reactive({ }); - 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; - } +//学生原始材料 +function handleXsyscl2(record) { + sfxk2.value = 0; +} + + +function handleXsysclxq(record) { + console.log('👨‍⚕️handleXsysclxq', record); + var cltype = record.cltype; + console.log('cltype--->',cltype); + if(cltype == '1'){ + sfxk2.value = 6; + Xxhbfxcjmxb0015Modal.value.init(record); + }else{ + sfxk2.value = 5; + xsysclXqFormModal.value.init(record); + } +} + +function onChangeTab(tab) { + console.log('🎒', tab); + if (tab == 2) { + khpjclFormModal.value.init(jxrwInfo.value); //考核评价材料 + } else if (tab == 3) { + xsysclFormModal.value.init(jxrwInfo.value); //学生原始材料 + }else if(tab == 4){ + zhjxxx.value = 1; + Xxhbfxcjb0016Modal.value.init(jxrwInfo.value); + } +} + +function init() { + //获取是否有选课信息 + defHttp.get({ url: '/zjXkxx/zjXkxx/list', params: { pageNo: paginationYxkcProp.value.current,pageSize:paginationYxkcProp.value.pageSize } }).then((res) => { + console.log('🧛11111', res); + if (res.records.length == 0) { + sfxk.value = 0; + checkData.value = []; + } else { + sfxk.value = 999; + checkData.value = res.records; + paginationYxkcProp.value.total = res.total; + paginationYxkcProp.value.current = res.current; + console.log("🚀 ~ defHttp.get ~ paginationYxkcProp.value:", paginationYxkcProp.value) } - return props.formDisabled; }); +} - /** * 新增 */ @@ -146,66 +169,19 @@ /** * 编辑 */ - function edit(record) { - nextTick(() => { - resetFields(); - const tmpData = {}; - Object.keys(formData).forEach((key) => { - if(record.hasOwnProperty(key)){ - tmpData[key] = record[key] - } - }) - //赋值 - Object.assign(formData, tmpData); - }); + function edit(record) { + console.log('edit--->',record); + jxrwInfo.value = record; + cjdFormModal.value.init(jxrwInfo.value); //成绩单 + sfxk.value = 6; + sfxk2.value = 0; + activeKey.value = '1'; } /** * 提交数据 */ - 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(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(','); - } - } - } - 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; - }); + async function submitForm() { } diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/XxhbjwxtjxrwModal.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/XxhbjwxtjxrwModal.vue index c6c110b..738d5c3 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/XxhbjwxtjxrwModal.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/XxhbjwxtjxrwModal.vue @@ -10,7 +10,7 @@ import JModal from '/@/components/Modal/src/JModal/JModal.vue'; const title = ref(''); - const width = ref(800); + const width = ref('90%'); const visible = ref(false); const disableSubmit = ref(false); const registerForm = ref(); diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/KhpjclList.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/KhpjclList.vue index 52e09a3..dbf03ef 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/KhpjclList.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/KhpjclList.vue @@ -153,7 +153,7 @@ function handleSuccess() { * 预览 */ async function handleYulan(record) { - var file1 = getFileAccessHttpUrl(record.path.replaceAll(" ","")); + var file1 = getFileAccessHttpUrl(record.path); if(record.path){ await defHttp.post({ url: '/sys/common/ycxz',params:{filename:record.path+","} }).then((res) => { @@ -167,7 +167,7 @@ async function handleYulan(record) { * 下载 */ function handleDown(record) { - downloadFile(record.path.replaceAll(" ","")); + downloadFile(record.path); } /** * 操作栏 diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XsysclList.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XsysclList.vue index db5a6d0..239023f 100644 --- a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XsysclList.vue +++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XsysclList.vue @@ -129,6 +129,8 @@ function handleDetail(record) { jxrwInfo.value.khfs = record.khfs; jxrwInfo.value.zb = record.zb; jxrwInfo.value.sort = record.sort; + jxrwInfo.value.cltype = record.cltype; + jxrwInfo.value.fxcjdm = record.fxcjdm; console.log('🖕222222222222', jxrwInfo.value); emit('handleXq', jxrwInfo.value); } diff --git a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue index 8072b53..ce834f1 100644 --- a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue +++ b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue @@ -43,7 +43,7 @@ - + diff --git a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue index 61a3185..72d77b2 100644 --- a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue +++ b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxForm.vue @@ -47,7 +47,7 @@ - +