Compare commits

..

No commits in common. "56bfc0737f33e89ed2d7ad11db681a533d24b805" and "ee9e3611302fdd3e77dceee3c541e3a4a7292c7a" have entirely different histories.

7 changed files with 13 additions and 97 deletions

View File

@ -42,11 +42,9 @@ public class ProjectController {
* @return
*/
@GetMapping("/project/get/custom")
public BaseResponse projectGetCustom(@RequestParam(required = false) Integer id,
@RequestParam(required = false) List<String> tags,
@RequestParam(required = false) Integer isFinish){
public BaseResponse projectGetCustom(@RequestParam(required = false) Integer id){
log.info("请求接口[GET]: /project/all/get");
return projectService.tget(id,tags,isFinish);
return projectService.tget(id);
}

View File

@ -97,10 +97,4 @@ public interface ProjectMapper {
//@Select("select * from organize_oa.oa_project where is_delete=false and status=1")
List<ProjectDO> tget(Integer id);
@Select("select * from organize_oa.oa_project where is_finish=#{isFinish} and is_delete=false")
List<ProjectDO> tgetByIsfinish(Integer isFinish);
List<ProjectDO> tgetByTags(List<String> tags);
}

View File

@ -1,27 +0,0 @@
package com.jsl.oa.model.doData;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
import lombok.experimental.Accessors;
import java.sql.Timestamp;
@Data
@Accessors(chain = true)
@JsonInclude(JsonInclude.Include.NON_NULL)
public class ProjectWorkDO {
private Long id;
private Long pid;
private Long projectId;
private Long principalId;
private Integer cycle;
private Integer workLoad;
private Integer type;
private String name;
private String description;
private Integer isDelete;
private Integer isFinish;
private boolean status;
private Timestamp beginTime;
private Timestamp completeTime;
}

View File

@ -1,30 +0,0 @@
package com.jsl.oa.model.voData;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.sql.Timestamp;
@Data
public class ProjectWorkVO {
private Long pid;
@NotNull(message = "项目id不能为空")
private Long projectId;
@NotNull(message = "负责人id不能为空")
private Long principalId;
@NotNull(message = "周期不能为空")
private Integer cycle;
private Integer workLoad;
@NotNull(message = "类型不能为空")
private Integer type;
@NotNull(message = "名字不能为空")
private String name;
private String description;
private Integer isDelete;
private Integer isFinish;
private Integer status;
private Timestamp beginTime;
private Timestamp completeTime;
}

View File

@ -40,5 +40,5 @@ public interface ProjectService {
BaseResponse projecWorktAdd(HttpServletRequest request, ProjectWorkVO projectWorkVO);
BaseResponse tget(Integer id, List<String> tags, Integer isFinish);
BaseResponse tget(Integer id);
}

View File

@ -61,21 +61,9 @@ public class ProjectServiceImpl implements ProjectService {
}
@Override
public BaseResponse tget(Integer id, List<String> tags, Integer isFinish) {
public BaseResponse tget(Integer id) {
log.info("\t> 执行 Service 层 ProjectService.tget 方法");
//根据状态查询
if(isFinish != null){
List<ProjectDO> projectDOList = projectDAO.tget(id,tags,isFinish);
return ResultUtil.success(projectDOList);
}
//根据标签查询
if(tags != null && !tags.isEmpty()){
List<ProjectDO> projectDOList = projectDAO.tget(id,tags,isFinish);
return ResultUtil.success(projectDOList);
}
List<ProjectDO> projectDOList = projectDAO.tget(id,tags,isFinish);
List<ProjectDO> projectDOList = projectDAO.tget(id);
return ResultUtil.success(projectDOList);
}

View File

@ -48,21 +48,22 @@
</update>
<select id="getByTags" resultType="com.jsl.oa.model.doData.ProjectDO">
select * from organize_oa.oa_project where is_delete=false and principal_id=#{userId} and json_extract(tags,'$.tags') like concat
<foreach collection="tags" item="tag" separator=",'%') or json_extract(tags,'$.tags') like concat('%',"
open="('%," close=",'%')">
select * from organize_oa.oa_project where
<foreach collection="tags" item="tag" separator=",'%') and json_extract(tags,'$.tags')like concat('%',"
open="json_extract(tags,'$.tags')like concat('%',"
close=",'%') and is_delete=false and principal_id=#{userId}">
#{tag}
</foreach>
</select>
<select id="workgetByTags" resultType="com.jsl.oa.model.doData.ProjectWorkDO">
select * from organize_oa.oa_project_work where is_delete=false and principal_id=#{userId} and json_extract(tags,'$.tags') like concat
<foreach collection="tags" item="tag" separator=",'%') or json_extract(tags,'$.tags') like concat('%',"
open="('%'," close=",'%')">
select * from organize_oa.oa_project_work where
<foreach collection="tags" item="tag" separator=",'%') and json_extract(tags,'$.tags')like concat('%',"
open="json_extract(tags,'$.tags')like concat('%',"
close=",'%') and is_delete=false and principal_id=#{userId}">
#{tag}
</foreach>
</select>
<select id="tget" resultType="com.jsl.oa.model.doData.ProjectDO">
select * from organize_oa.oa_project where is_delete=false
<if test="id != null">
@ -70,12 +71,4 @@
</if>
</select>
<select id="tgetByTags" resultType="com.jsl.oa.model.doData.ProjectDO">
select * from organize_oa.oa_project where is_delete=false and json_extract(tags,'$.tags') like concat
<foreach collection="tags" item="tag" separator=",'%') or json_extract(tags,'$.tags') like concat('%',"
open="('%'," close=",'%')">
#{tag}
</foreach>
</select>
</mapper>