From 44e8c7cbc4554f6910de977be0ba5fd7493ec1eb Mon Sep 17 00:00:00 2001 From: wangyi Date: Sun, 15 Jun 2025 16:34:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=9B=BE=E5=BA=93=E5=85=B1=E4=BA=AB?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E3=80=81=E4=BB=BB=E5=8A=A1=E9=80=BE=E6=9C=9F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=AD=89.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CtGalleryCataShareController.java | 19 +++++++++++++++++-- .../ct/controller/CtTaskInfoController.java | 5 +++++ .../com/bs/ct/domain/CtGalleryShareUser.java | 7 +++++++ .../java/com/bs/ct/domain/CtTaskInfo.java | 4 +++- 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/bs-admin/src/main/java/com/bs/ct/controller/CtGalleryCataShareController.java b/bs-admin/src/main/java/com/bs/ct/controller/CtGalleryCataShareController.java index b669305..dee2e58 100644 --- a/bs-admin/src/main/java/com/bs/ct/controller/CtGalleryCataShareController.java +++ b/bs-admin/src/main/java/com/bs/ct/controller/CtGalleryCataShareController.java @@ -10,6 +10,8 @@ import com.bs.common.utils.SecurityUtils; import com.bs.common.utils.StringUtils; import com.bs.ct.domain.CtGalleryShareUser; import com.bs.ct.service.ICtGalleryShareUserService; +import com.bs.system.service.ISysDeptService; +import com.bs.system.service.ISysUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -49,6 +51,12 @@ public class CtGalleryCataShareController extends BaseController { @Resource private ICtGalleryShareUserService ctGalleryShareUserService; + + @Resource + private ISysUserService sysUserService; + + @Resource + private ISysDeptService sysDeptService; /** * 分页查询图库目录共享列表 */ @@ -94,6 +102,13 @@ public class CtGalleryCataShareController extends BaseController { if (null == lsShareUser) { lsShareUser = new ArrayList<>(); } + if (null != user.getUserId()) { + if ("user".equals(user.getUserType())) { + user.setUser(sysUserService.selectUserById(user.getUserId())); + } else if ("dept".equals(user.getUserType())) { + user.setDept(sysDeptService.selectDeptById(user.getUserId())); + } + } lsShareUser.add(user); dataMap.put(user.getShareId(), lsShareUser); } @@ -219,10 +234,10 @@ public class CtGalleryCataShareController extends BaseController { * 条件设置 */ private void condition (LambdaQueryWrapper queryWrapper,CtGalleryCataShare ctGalleryCataShare){ - + queryWrapper.orderByAsc(CtGalleryCataShare::getType); if ("mine".equals(ctGalleryCataShare.getQueryType())) { queryWrapper.eq(CtGalleryCataShare::getCreateBy, SecurityUtils.getUserId()); - } else if ("mine".equals(ctGalleryCataShare.getQueryType())) { + } else if ("other".equals(ctGalleryCataShare.getQueryType())) { queryWrapper.inSql(CtGalleryCataShare::getId, "select share_id from ct_gallery_share_user where del_flag = 0 and ( (user_type = 'user' and user_id = " + SecurityUtils.getUserId() +") or (user_type = 'dept' and user_id = " + SecurityUtils.getDeptId() + "))"); } diff --git a/bs-admin/src/main/java/com/bs/ct/controller/CtTaskInfoController.java b/bs-admin/src/main/java/com/bs/ct/controller/CtTaskInfoController.java index 5f3d279..d641740 100644 --- a/bs-admin/src/main/java/com/bs/ct/controller/CtTaskInfoController.java +++ b/bs-admin/src/main/java/com/bs/ct/controller/CtTaskInfoController.java @@ -444,6 +444,11 @@ public class CtTaskInfoController extends BaseController { queryWrapper.le(CtTaskInfo::getEndDate,ctTaskInfo.getEndDate()); } + // 查询逾期任务. + if (Validator.isNotEmpty(ctTaskInfo.getQueryDate())) { + queryWrapper.le(CtTaskInfo::getEndDate,ctTaskInfo.getQueryDate()).eq(CtTaskInfo::getStatus, "1"); + } + //任务要求 if(Validator.isNotEmpty(ctTaskInfo.getTaskContent())){ queryWrapper.like(CtTaskInfo::getTaskContent,ctTaskInfo.getTaskContent()); diff --git a/bs-admin/src/main/java/com/bs/ct/domain/CtGalleryShareUser.java b/bs-admin/src/main/java/com/bs/ct/domain/CtGalleryShareUser.java index 6d3623a..c0f56e6 100644 --- a/bs-admin/src/main/java/com/bs/ct/domain/CtGalleryShareUser.java +++ b/bs-admin/src/main/java/com/bs/ct/domain/CtGalleryShareUser.java @@ -2,6 +2,8 @@ package com.bs.ct.domain; import com.bs.common.annotation.Excel; import com.bs.common.core.domain.BaseEntity; +import com.bs.common.core.domain.entity.SysDept; +import com.bs.common.core.domain.entity.SysUser; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; @@ -63,4 +65,9 @@ public class CtGalleryShareUser extends BaseEntity{ @ApiModelProperty(value = "结束时间") private Date endDate; + @TableField(exist = false) + private SysDept dept; + + @TableField(exist = false) + private SysUser user; } diff --git a/bs-admin/src/main/java/com/bs/ct/domain/CtTaskInfo.java b/bs-admin/src/main/java/com/bs/ct/domain/CtTaskInfo.java index db639f5..7f358da 100644 --- a/bs-admin/src/main/java/com/bs/ct/domain/CtTaskInfo.java +++ b/bs-admin/src/main/java/com/bs/ct/domain/CtTaskInfo.java @@ -179,5 +179,7 @@ public class CtTaskInfo extends BaseEntity{ @TableField(exist = false) private List tags; - + @TableField(exist = false) + @JsonFormat(pattern = "yyyy-MM-dd") + private Date queryDate; }