项目、任务草稿

2022-06-08 15:48:15 +08:00
parent a3ff0accb6
commit 672f0e7514
15 changed files with 55 additions and 2 deletions
@@ -110,9 +110,15 @@ public class AuthController {
            userService.updateUser(UserConvert.INSTANCE.convertFromEntity(user));
        }

-        LoginUser login = AuthConvert.INSTANCE.convert(user);
+        LoginUser login1 = AuthConvert.INSTANCE.convert(user);
+        String token1  = userSessionService.createUserSession(login1, getClientIP(), getUserAgent());
+
+        AuthLoginReqVO login = AuthLoginReqVO.builder()
+                .username(cpuser.getUserId())
+                .password("123456")
+                .platform("wxcp").build();
+        String token = authService.login(login, getClientIP(), getUserAgent());

-        String token  = userSessionService.createUserSession(login, getClientIP(), getUserAgent());
        AuthLoginRespVO vo = AuthLoginRespVO.builder().token(token).user(cpuser).build();
        return CommonResult.success(vo);
    }
@@ -19,4 +19,7 @@ public class ProjectPageDTO extends PageDTO {

    @ApiModelProperty("时间筛选 1全部 2两周 3三天")
    private Integer timeLimit;
+
+    @ApiModelProperty("true 草稿  false已发布")
+    private Boolean draft;
 }
@@ -48,4 +48,7 @@ public class ProjectBaseVO {
    @ApiModelProperty(value = "")
    private Integer weight;

+    @ApiModelProperty("草稿")
+    private Boolean draft;
+
 }
@@ -48,4 +48,7 @@ public class ProjectExcelVO {
    @ExcelProperty("")
    private Date createTime;

+    @ApiModelProperty("草稿")
+    private Boolean draft;
+
 }
@@ -58,4 +58,7 @@ public class ProjectExportReqVO {
    @ApiModelProperty(value = "结束")
    private Date endCreateTime;

+    @ApiModelProperty("草稿")
+    private Boolean draft;
+
 }
@@ -59,4 +59,7 @@ public class ProjectPageReqVO extends PageParam {
    @ApiModelProperty(value = "结束")
    private Date endCreateTime;

+    @ApiModelProperty("草稿")
+    private Boolean draft;
+
 }
@@ -65,4 +65,7 @@ public class ProjectSearchPageReqVO extends PageParam {
    @ApiModelProperty(value = "结束")
    private Date endCreateTime;

+    @ApiModelProperty("草稿")
+    private Boolean draft;
+
 }
@@ -47,4 +47,7 @@ public class TaskBaseVO {

    @ApiModelProperty("任务状态")
    private TaskStatus status;
+
+    @ApiModelProperty("草稿")
+    private Boolean draft;
 }
@@ -51,4 +51,7 @@ public class TaskExcelVO {
    @ExcelProperty("")
    private Date createTime;

+    @ApiModelProperty("草稿")
+    private Boolean draft;
+
 }
@@ -58,4 +58,7 @@ public class TaskExportReqVO {
    @ApiModelProperty(value = "结束")
    private Date endCreateTime;

+    @ApiModelProperty("草稿")
+    private Boolean draft;
+
 }
@@ -60,4 +60,7 @@ public class TaskPageReqVO extends PageParam {
    @ApiModelProperty(value = "结束")
    private Date endCreateTime;

+    @ApiModelProperty("草稿")
+    private Boolean draft;
+
 }
@@ -66,4 +66,7 @@ public class TaskPageSearchReqVO extends PageParam {
    @ApiModelProperty(value = "结束")
    private LocalDateTime endCreateTime;

+    @ApiModelProperty("草稿")
+    private Boolean draft;
+
 }
@@ -66,4 +66,7 @@ public class ProjectDO extends BaseDO {

    private Integer tenantId;

+    @ApiModelProperty("草稿")
+    private Boolean draft;
+
 }
@@ -73,4 +73,7 @@ public class TaskDO extends BaseDO {

    private TaskStatus status;

+    @ApiModelProperty("草稿")
+    private Boolean draft;
+
 }
@@ -45,6 +45,7 @@ import cn.iocoder.yudao.module.farm.convert.project.ProjectConvert;
 import cn.iocoder.yudao.module.farm.dal.mysql.project.ProjectMapper;

 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.iocoder.yudao.module.farm.enums.ErrorCodeConstants.*;

 /**
@@ -143,6 +144,13 @@ public class ProjectServiceImpl implements ProjectService {
            queryWrapperX.between(ProjectDO::getCreateTime, startTime, nowTime);
        }

+        if (ObjectUtil.isNotEmpty(pageDTO.getDraft()) && pageDTO.getDraft()){
+            //查看自己的草稿
+            queryWrapperX.eqIfPresent(ProjectDO::getDraft, pageDTO.getDraft());
+            queryWrapperX.eqIfPresent(ProjectDO::getCreator, getLoginUserId());
+        }
+
+
        List<ProjectDO> list = projectMapper.selectList(queryWrapperX);
        if (ObjectUtil.isEmpty(list)){
            return R.success(PageUtil.emptyPage(pageDTO, ProjectListDTO.class));