fix:图库共享排序、任务逾期查询等.

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<CtGalleryCataShare> 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() + "))");
         }
 

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());

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;
 }

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<CtTaskTag> tags;
 
-
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date queryDate;
 }