项目 我参与的
This commit is contained in:
+3
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.project;
|
|||||||
|
|
||||||
import com.alibaba.fastjson.JSONArray;
|
import com.alibaba.fastjson.JSONArray;
|
||||||
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
|
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@@ -54,10 +55,12 @@ public class ProjectDO extends BaseDO {
|
|||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||||
private Date planStartTime;
|
private Date planStartTime;
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||||
private Date planEndTime;
|
private Date planEndTime;
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
|||||||
+1
-1
@@ -155,7 +155,7 @@ public class ProjectServiceImpl implements ProjectService {
|
|||||||
|
|
||||||
if (ObjectUtil.isNotEmpty(pageDTO.getMyProject()) && pageDTO.getMyProject()){
|
if (ObjectUtil.isNotEmpty(pageDTO.getMyProject()) && pageDTO.getMyProject()){
|
||||||
//查看我参与的项目
|
//查看我参与的项目
|
||||||
queryWrapperX.last(" and JSON_CONTAINS(members, '"+ getLoginUserId()+"')");
|
queryWrapperX.last(" and JSON_CONTAINS(members, '"+ getLoginUserId()+"') OR creator = "+ getLoginUserId());
|
||||||
}
|
}
|
||||||
|
|
||||||
List<ProjectDO> list = projectMapper.selectList(queryWrapperX);
|
List<ProjectDO> list = projectMapper.selectList(queryWrapperX);
|
||||||
|
|||||||
Reference in New Issue
Block a user