From 20c2211debfb0437fe3990f449aba7a61e10bb25 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 12 Dec 2024 15:04:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E6=9C=AC=E5=88=B6?= =?UTF-8?q?=E5=BA=A6=E5=BB=BA=E8=AE=BE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/blJbzdjs/entity/BlJbzdjs.java | 14 +- .../cas/controller/CasClientController.java | 2 +- .../system/controller/SysUserController.java | 2 +- .../system/service/ISysUserService.java | 7 + .../impl/SysThirdAccountServiceImpl.java | 2 +- .../service/impl/SysUserServiceImpl.java | 80 +++++++- .../controller/XxhbuserController.java | 178 ++++++++++++++++++ .../modules/xxhbuser/entity/Xxhbuser.java | 83 ++++++++ .../xxhbuser/mapper/XxhbuserMapper.java | 17 ++ .../xxhbuser/mapper/xml/XxhbuserMapper.xml | 5 + .../xxhbuser/service/IXxhbuserService.java | 14 ++ .../service/impl/XxhbuserServiceImpl.java | 21 +++ .../src/views/bl/blJbzdjs/BlJbzdjs.data.ts | 26 +-- .../src/views/bl/blJbzdjs/BlJbzdjsList.vue | 78 ++++---- .../src/views/bl/blJbzdjs/BlJbzdjsZjList.vue | 73 ++----- .../bl/blJbzdjs/components/BlJbzdjsForm.vue | 51 ++--- .../bl/blJbzdjs/components/BlJbzdjsModal.vue | 2 +- 17 files changed, 507 insertions(+), 148 deletions(-) create mode 100644 jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/controller/XxhbuserController.java create mode 100644 jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/entity/Xxhbuser.java create mode 100644 jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/mapper/XxhbuserMapper.java create mode 100644 jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/mapper/xml/XxhbuserMapper.xml create mode 100644 jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/service/IXxhbuserService.java create mode 100644 jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/service/impl/XxhbuserServiceImpl.java diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blJbzdjs/entity/BlJbzdjs.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blJbzdjs/entity/BlJbzdjs.java index 82f0604..b779e9c 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blJbzdjs/entity/BlJbzdjs.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blJbzdjs/entity/BlJbzdjs.java @@ -60,16 +60,16 @@ public class BlJbzdjs implements Serializable { @Excel(name = "制度名称", width = 15) @ApiModelProperty(value = "制度名称") private java.lang.String zdmc; - /**执行时间*/ - @Excel(name = "执行时间", width = 15, format = "yyyy-MM-dd") + /**修订时间*/ + @Excel(name = "修订时间", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "执行时间") + @ApiModelProperty(value = "修订时间") private java.util.Date zxsj; - /**与教学管理文件汇编不一致说明*/ - @Excel(name = "与教学管理文件汇编不一致说明", width = 15, dicCode = "yn") - @Dict(dicCode = "yn") - @ApiModelProperty(value = "与教学管理文件汇编不一致说明") + /**对应的学校上位文件*/ + @Excel(name = "对应的学校上位文件", width = 15, dicCode = "yn") + @Dict(dicCode = "zd_swwj") + @ApiModelProperty(value = "对应的学校上位文件") private java.lang.String sfyz; /**状态*/ @Excel(name = "状态", width = 15, dicCode = "zd_status") diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java index 8420957..a8bb91b 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java @@ -74,7 +74,7 @@ public class CasClientController { log.info("-------token----username---"+principal); //1. 校验用户是否有效 SysUser sysUser = sysUserService.getUserByName(principal); - result = sysUserService.checkUserIsEffective(sysUser); + result = sysUserService.checkUserIsEffective(sysUser, res); if(!result.isSuccess()) { return result; } diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 4c03df1..45c245b 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -543,7 +543,7 @@ public class SysUserController { SysUser sysUserExcel = listSysUsers.get(i); if (StringUtils.isBlank(sysUserExcel.getPassword())) { // 密码默认为 “123456” - sysUserExcel.setPassword("123456"); + sysUserExcel.setPassword("Zjpt123456"); } // 密码加密加盐 String salt = oConvertUtils.randomGen(8); diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java index 949e816..c61ff17 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java @@ -257,6 +257,13 @@ public interface ISysUserService extends IService { */ Result checkUserIsEffective(SysUser sysUser); + /** + * 统一身份认证专用 + * @param sysUser + * @param res + * @return + */ + Result checkUserIsEffective(SysUser sysUser, String res); /** * 查询被逻辑删除的用户 * @return List diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java index a33ddcc..8ae171b 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysThirdAccountServiceImpl.java @@ -106,7 +106,7 @@ public class SysThirdAccountServiceImpl extends ServiceImpl impl @Autowired private RedisUtil redisUtil; - + @Autowired + private ISysRoleService sysRoleService; + @Autowired + private IXxhbuserService xxhbuserService; + @Override public Result> queryPageList(HttpServletRequest req, QueryWrapper queryWrapper, Integer pageSize, Integer pageNo) { Result> result = new Result>(); @@ -648,7 +656,77 @@ public class SysUserServiceImpl extends ServiceImpl impl } } } + @Override + public Result checkUserIsEffective(SysUser sysUser, String res){ + final String username = XmlUtils.getTextForElement(res, "user"); + final String realname = XmlUtils.getTextForElement(res, "cn"); + final String containerId = XmlUtils.getTextForElement(res, "containerId"); + System.out.println("------------------1--------------------------"+containerId); + String roles = ""; + int userIdentity = 1; + //判断是否为教师 + if(StringUtils.indexOf(containerId,"ou=jzg") != -1){ + System.out.println("------------------2--------------------------"+containerId); + roles = "jwms";//教师角色 + userIdentity = 2;//允许进入后台 + }else if(StringUtils.indexOf(containerId,"ou=bzks") != -1){ + throw new JeecgBootException("学生不可以登录此平台"); + }else{ + System.out.println("------------------4--------------------------"+containerId); + return checkUserIsEffective(sysUser); + } + + + QueryWrapper sysRoleQw = new QueryWrapper<>(); + System.out.println("------------------7--------------------------"+roles); + sysRoleQw.in("role_code",roles); + sysRoleQw.last("limit 1"); + SysRole sysRole = sysRoleService.getOne(sysRoleQw); + if(sysRole != null){ + System.out.println("------------------8--------------------------"+roles); + roles = sysRole.getId(); + }else{ + System.out.println("------------------9--------------------------"+roles); + log.error("创建用户出现错误，未找到["+roles+"]角色，请添加"); + throw new JeecgBootException("创建用户出现错误，未找到["+roles+"]角色，请添加"); + } + + StringUtils.split(containerId,","); + //情况1：根据用户信息查询，该用户不存在 + if (sysUser == null) { + + QueryWrapper xxhbuserQueryWrapper = new QueryWrapper<>(); + xxhbuserQueryWrapper.eq("gh",username); + xxhbuserQueryWrapper.last("limit 1"); + Xxhbuser xxhbuser = xxhbuserService.getOne(xxhbuserQueryWrapper); + + System.out.println("------------------10--------------------------user null"); + //创建用户 + SysUser user = new SysUser(); + user.setUsername(username); + user.setRealname(realname); + user.setActivitiSync(1); + String salt = oConvertUtils.randomGen(8); + user.setSalt(salt); + String passwordEncode = PasswordUtil.encrypt(user.getUsername(), "Zjpt@123456", salt); + user.setPassword(passwordEncode); + user.setPhone(username); + user.setUserIdentity(userIdentity); + user.setWorkNo(username); + user.setStatus(1); + user.setDelFlag(0); + if(xxhbuser!=null){ + user.setDepartIds(xxhbuser.getDwmc()); + } + saveUser(user,roles,"",""); + Result result = checkUserIsEffective(user); + result.setCode(999); + return result; + } + + return checkUserIsEffective(sysUser); + } /** * 校验用户是否有效 diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/controller/XxhbuserController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/controller/XxhbuserController.java new file mode 100644 index 0000000..8386c33 --- /dev/null +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/controller/XxhbuserController.java @@ -0,0 +1,178 @@ +package org.jeecg.modules.xxhbuser.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.xxhbuser.entity.Xxhbuser; +import org.jeecg.modules.xxhbuser.service.IXxhbuserService; + +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: xxhbuser + * @Author: jeecg-boot + * @Date: 2024-12-12 + * @Version: V1.0 + */ +@Api(tags="xxhbuser") +@RestController +@RequestMapping("/xxhbuser/xxhbuser") +@Slf4j +public class XxhbuserController extends JeecgController { + @Autowired + private IXxhbuserService xxhbuserService; + + /** + * 分页列表查询 + * + * @param xxhbuser + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "xxhbuser-分页列表查询") + @ApiOperation(value="xxhbuser-分页列表查询", notes="xxhbuser-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(Xxhbuser xxhbuser, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(xxhbuser, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = xxhbuserService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param xxhbuser + * @return + */ + @AutoLog(value = "xxhbuser-添加") + @ApiOperation(value="xxhbuser-添加", notes="xxhbuser-添加") + @RequiresPermissions("xxhbuser:xxhbuser:add") + @PostMapping(value = "/add") + public Result add(@RequestBody Xxhbuser xxhbuser) { + xxhbuserService.save(xxhbuser); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param xxhbuser + * @return + */ + @AutoLog(value = "xxhbuser-编辑") + @ApiOperation(value="xxhbuser-编辑", notes="xxhbuser-编辑") + @RequiresPermissions("xxhbuser:xxhbuser:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody Xxhbuser xxhbuser) { + xxhbuserService.updateById(xxhbuser); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "xxhbuser-通过id删除") + @ApiOperation(value="xxhbuser-通过id删除", notes="xxhbuser-通过id删除") + @RequiresPermissions("xxhbuser:xxhbuser:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + xxhbuserService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "xxhbuser-批量删除") + @ApiOperation(value="xxhbuser-批量删除", notes="xxhbuser-批量删除") + @RequiresPermissions("xxhbuser:xxhbuser:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.xxhbuserService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "xxhbuser-通过id查询") + @ApiOperation(value="xxhbuser-通过id查询", notes="xxhbuser-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + Xxhbuser xxhbuser = xxhbuserService.getById(id); + if(xxhbuser==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(xxhbuser); + } + + /** + * 导出excel + * + * @param request + * @param xxhbuser + */ + @RequiresPermissions("xxhbuser:xxhbuser:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, Xxhbuser xxhbuser) { + return super.exportXls(request, xxhbuser, Xxhbuser.class, "xxhbuser"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("xxhbuser:xxhbuser:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, Xxhbuser.class); + } + +} diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/entity/Xxhbuser.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/entity/Xxhbuser.java new file mode 100644 index 0000000..0a9d1c1 --- /dev/null +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/entity/Xxhbuser.java @@ -0,0 +1,83 @@ +package org.jeecg.modules.xxhbuser.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: xxhbuser + * @Author: jeecg-boot + * @Date: 2024-12-12 + * @Version: V1.0 + */ +@Data +@TableName("xxhbuser") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="xxhbuser对象", description="xxhbuser") +public class Xxhbuser implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**工号*/ + @Excel(name = "工号", width = 15) + @ApiModelProperty(value = "工号") + private java.lang.String gh; + /**spxldm*/ + @Excel(name = "spxldm", width = 15) + @ApiModelProperty(value = "spxldm") + private java.lang.String spxldm; + /**xbm*/ + @Excel(name = "xbm", width = 15) + @ApiModelProperty(value = "xbm") + private java.lang.String xbm; + /**姓名*/ + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private java.lang.String xm; + /**单位号*/ + @Excel(name = "单位号", width = 15) + @ApiModelProperty(value = "单位号") + private java.lang.String dwh; + /**单位名称*/ + @Excel(name = "单位名称", width = 15) + @ApiModelProperty(value = "单位名称") + private java.lang.String dwmc; + /**csrq*/ + @Excel(name = "csrq", width = 15) + @ApiModelProperty(value = "csrq") + private java.lang.String csrq; + /**sfzxm*/ + @Excel(name = "sfzxm", width = 15) + @ApiModelProperty(value = "sfzxm") + private java.lang.String sfzxm; + /**zdxms*/ + @Excel(name = "zdxms", width = 15) + @ApiModelProperty(value = "zdxms") + private java.lang.String zdxms; + /**zzzt*/ + @Excel(name = "zzzt", width = 15) + @ApiModelProperty(value = "zzzt") + private java.lang.String zzzt; + /**时间戳*/ + @Excel(name = "时间戳", width = 15) + @ApiModelProperty(value = "时间戳") + private java.lang.String timestamps; +} diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/mapper/XxhbuserMapper.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/mapper/XxhbuserMapper.java new file mode 100644 index 0000000..ea495f8 --- /dev/null +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/mapper/XxhbuserMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.xxhbuser.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.xxhbuser.entity.Xxhbuser; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: xxhbuser + * @Author: jeecg-boot + * @Date: 2024-12-12 + * @Version: V1.0 + */ +public interface XxhbuserMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/mapper/xml/XxhbuserMapper.xml b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/mapper/xml/XxhbuserMapper.xml new file mode 100644 index 0000000..d87d1be --- /dev/null +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/mapper/xml/XxhbuserMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/service/IXxhbuserService.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/service/IXxhbuserService.java new file mode 100644 index 0000000..f278ee2 --- /dev/null +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/service/IXxhbuserService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.xxhbuser.service; + +import org.jeecg.modules.xxhbuser.entity.Xxhbuser; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: xxhbuser + * @Author: jeecg-boot + * @Date: 2024-12-12 + * @Version: V1.0 + */ +public interface IXxhbuserService extends IService { + +} diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/service/impl/XxhbuserServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/service/impl/XxhbuserServiceImpl.java new file mode 100644 index 0000000..b93b2ae --- /dev/null +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxhbuser/service/impl/XxhbuserServiceImpl.java @@ -0,0 +1,21 @@ +package org.jeecg.modules.xxhbuser.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.jeecg.modules.xxhbuser.entity.Xxhbuser; +import org.jeecg.modules.xxhbuser.mapper.XxhbuserMapper; +import org.jeecg.modules.xxhbuser.service.IXxhbuserService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: xxhbuser + * @Author: jeecg-boot + * @Date: 2024-12-12 + * @Version: V1.0 + */ +@Service +@DS("multi-datasource1") +public class XxhbuserServiceImpl extends ServiceImpl implements IXxhbuserService { + +} diff --git a/jeecgboot-vue3/src/views/bl/blJbzdjs/BlJbzdjs.data.ts b/jeecgboot-vue3/src/views/bl/blJbzdjs/BlJbzdjs.data.ts index 9d441b1..1a52235 100644 --- a/jeecgboot-vue3/src/views/bl/blJbzdjs/BlJbzdjs.data.ts +++ b/jeecgboot-vue3/src/views/bl/blJbzdjs/BlJbzdjs.data.ts @@ -16,7 +16,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'zdmc' }, { - title: '执行时间', + title: '修订时间', align: "center", dataIndex: 'zxsj', customRender:({text}) =>{ @@ -25,7 +25,7 @@ export const columns: BasicColumn[] = [ }, }, { - title: '与教学管理文件汇编不一致说明', + title: '对应的学校上位文件', align: "center", dataIndex: 'sfyz_dictText' }, @@ -34,15 +34,15 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'status_dictText' }, - { - title: '当年度修订情况', - align: "center", - dataIndex: 'years', - customRender:({text,record}) =>{ - text = text+"年"+record.yearsType_dictText; - return text; - }, - }, + // { + // title: '当年度修订情况', + // align: "center", + // dataIndex: 'years', + // customRender:({text,record}) =>{ + // text = text+"年"+record.yearsType_dictText; + // return text; + // }, + // }, // { // title: '修订情况', // align: "center", @@ -64,8 +64,8 @@ export const columns: BasicColumn[] = [ export const superQuerySchema = { dwmc: {title: '学院',order: 0,view: 'list', type: 'string',dictCode: '',}, zdmc: {title: '制度名称',order: 1,view: 'text', type: 'string',}, - zxsj: {title: '执行时间',order: 2,view: 'date', type: 'string',}, - sfyz: {title: '与教学管理文件汇编不一致说明',order: 3,view: 'list', type: 'string',dictCode: 'yn',}, + zxsj: {title: '修订时间',order: 2,view: 'date', type: 'string',}, + sfyz: {title: '对应的学校上位文件',order: 3,view: 'list', type: 'string',dictCode: 'yn',}, status: {title: '状态',order: 4,view: 'list', type: 'string',dictCode: 'zd_status',}, years: {title: '年度',order: 5,view: 'text', type: 'string',}, yearsType: {title: '修订情况',order: 6,view: 'list', type: 'string',dictCode: 'zd_xdqk',}, diff --git a/jeecgboot-vue3/src/views/bl/blJbzdjs/BlJbzdjsList.vue b/jeecgboot-vue3/src/views/bl/blJbzdjs/BlJbzdjsList.vue index 58fc20a..b9911f5 100644 --- a/jeecgboot-vue3/src/views/bl/blJbzdjs/BlJbzdjsList.vue +++ b/jeecgboot-vue3/src/views/bl/blJbzdjs/BlJbzdjsList.vue @@ -4,12 +4,12 @@
- + @@ -18,8 +18,8 @@ - - + + @@ -31,15 +31,15 @@ - + - + @@ -65,7 +65,7 @@