From f13a9cbf1c0c0e963a7c3b3ebc55268a2f8f662b Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Fri, 29 Oct 2021 11:19:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/signin/bean/po/SysTemplate.java | 11 +++ .../signin/bean/po/SysTemplateExample.java | 70 +++++++++++++++++++ .../com/ccsens/signin/bean/vo/ProjectVo.java | 6 ++ .../ccsens/signin/persist/dao/ProjectDao.java | 2 +- .../ccsens/signin/service/ProjectService.java | 29 ++++++-- .../main/resources/mapper_dao/ProjectDap.xml | 12 +++- .../mapper_raw/SysTemplateMapper.xml | 25 +++++-- 7 files changed, 140 insertions(+), 15 deletions(-) diff --git a/signin/src/main/java/com/ccsens/signin/bean/po/SysTemplate.java b/signin/src/main/java/com/ccsens/signin/bean/po/SysTemplate.java index 6f17212d..3177d388 100644 --- a/signin/src/main/java/com/ccsens/signin/bean/po/SysTemplate.java +++ b/signin/src/main/java/com/ccsens/signin/bean/po/SysTemplate.java @@ -18,6 +18,8 @@ public class SysTemplate implements Serializable { private Byte recStatus; + private String templateCode; + private static final long serialVersionUID = 1L; public Long getId() { @@ -76,6 +78,14 @@ public class SysTemplate implements Serializable { this.recStatus = recStatus; } + public String getTemplateCode() { + return templateCode; + } + + public void setTemplateCode(String templateCode) { + this.templateCode = templateCode == null ? null : templateCode.trim(); + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -89,6 +99,7 @@ public class SysTemplate implements Serializable { sb.append(", createdAt=").append(createdAt); sb.append(", updatedAt=").append(updatedAt); sb.append(", recStatus=").append(recStatus); + sb.append(", templateCode=").append(templateCode); sb.append("]"); return sb.toString(); } diff --git a/signin/src/main/java/com/ccsens/signin/bean/po/SysTemplateExample.java b/signin/src/main/java/com/ccsens/signin/bean/po/SysTemplateExample.java index a9d6f9c5..7cdf83f6 100644 --- a/signin/src/main/java/com/ccsens/signin/bean/po/SysTemplateExample.java +++ b/signin/src/main/java/com/ccsens/signin/bean/po/SysTemplateExample.java @@ -544,6 +544,76 @@ public class SysTemplateExample { addCriterion("rec_status not between", value1, value2, "recStatus"); return (Criteria) this; } + + public Criteria andTemplateCodeIsNull() { + addCriterion("template_code is null"); + return (Criteria) this; + } + + public Criteria andTemplateCodeIsNotNull() { + addCriterion("template_code is not null"); + return (Criteria) this; + } + + public Criteria andTemplateCodeEqualTo(String value) { + addCriterion("template_code =", value, "templateCode"); + return (Criteria) this; + } + + public Criteria andTemplateCodeNotEqualTo(String value) { + addCriterion("template_code <>", value, "templateCode"); + return (Criteria) this; + } + + public Criteria andTemplateCodeGreaterThan(String value) { + addCriterion("template_code >", value, "templateCode"); + return (Criteria) this; + } + + public Criteria andTemplateCodeGreaterThanOrEqualTo(String value) { + addCriterion("template_code >=", value, "templateCode"); + return (Criteria) this; + } + + public Criteria andTemplateCodeLessThan(String value) { + addCriterion("template_code <", value, "templateCode"); + return (Criteria) this; + } + + public Criteria andTemplateCodeLessThanOrEqualTo(String value) { + addCriterion("template_code <=", value, "templateCode"); + return (Criteria) this; + } + + public Criteria andTemplateCodeLike(String value) { + addCriterion("template_code like", value, "templateCode"); + return (Criteria) this; + } + + public Criteria andTemplateCodeNotLike(String value) { + addCriterion("template_code not like", value, "templateCode"); + return (Criteria) this; + } + + public Criteria andTemplateCodeIn(List values) { + addCriterion("template_code in", values, "templateCode"); + return (Criteria) this; + } + + public Criteria andTemplateCodeNotIn(List values) { + addCriterion("template_code not in", values, "templateCode"); + return (Criteria) this; + } + + public Criteria andTemplateCodeBetween(String value1, String value2) { + addCriterion("template_code between", value1, value2, "templateCode"); + return (Criteria) this; + } + + public Criteria andTemplateCodeNotBetween(String value1, String value2) { + addCriterion("template_code not between", value1, value2, "templateCode"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/signin/src/main/java/com/ccsens/signin/bean/vo/ProjectVo.java b/signin/src/main/java/com/ccsens/signin/bean/vo/ProjectVo.java index c0213d54..c9c93445 100644 --- a/signin/src/main/java/com/ccsens/signin/bean/vo/ProjectVo.java +++ b/signin/src/main/java/com/ccsens/signin/bean/vo/ProjectVo.java @@ -2,6 +2,7 @@ package com.ccsens.signin.bean.vo; import cn.hutool.core.util.ObjectUtil; import com.ccsens.util.WebConstant; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -28,8 +29,13 @@ public class ProjectVo { private byte status; @ApiModelProperty("访问路径)") private String url; + @ApiModelProperty("项目模板code)") + private String templateCode; @ApiModelProperty("子项目") private List sonProjectList; + @JsonIgnore + @ApiModelProperty("父级id") + private Long parentId; public Byte getStatus() { diff --git a/signin/src/main/java/com/ccsens/signin/persist/dao/ProjectDao.java b/signin/src/main/java/com/ccsens/signin/persist/dao/ProjectDao.java index 2a422a2e..b26910f4 100644 --- a/signin/src/main/java/com/ccsens/signin/persist/dao/ProjectDao.java +++ b/signin/src/main/java/com/ccsens/signin/persist/dao/ProjectDao.java @@ -20,7 +20,7 @@ public interface ProjectDao { * @param id 项目id * @return 子项目列表 */ - List querySonProject(@Param("id") Long id); + List querySonProject(@Param("idList") List id); /** * 根据项目id 批量查询 diff --git a/signin/src/main/java/com/ccsens/signin/service/ProjectService.java b/signin/src/main/java/com/ccsens/signin/service/ProjectService.java index 15b3306f..7034c329 100644 --- a/signin/src/main/java/com/ccsens/signin/service/ProjectService.java +++ b/signin/src/main/java/com/ccsens/signin/service/ProjectService.java @@ -50,15 +50,32 @@ public class ProjectService implements IProjectService{ public List queryProjectList(ProjectDto.QueryProjectDto param, Long userId) { List projectList = projectDao.queryProjectList(param.getStartTime(), param.getEndTime(), userId); //查询子项目 - if (CollectionUtil.isNotEmpty(projectList)){ - for (ProjectVo.QueryProject project : projectList) { - List sonProjectList = projectDao.querySonProject(project.getId()); - if (CollectionUtil.isNotEmpty(sonProjectList)){ - project.setSonProjectList(sonProjectList); + if (CollectionUtil.isNotEmpty(projectList)) { + List projectIdList = projectList.stream().map(ProjectVo.QueryProject::getId).collect(Collectors.toList()); + List sonProjectList = projectDao.querySonProject(projectIdList); + if (CollectionUtil.isNotEmpty(sonProjectList)) { + for (ProjectVo.QueryProject queryProject : projectList) { + List sonList = new ArrayList<>(); + for (ProjectVo.QueryProject sonProject : sonProjectList) { + if (queryProject.getId().equals(sonProject.getParentId())){ + sonList.add(sonProject); + } + } + queryProject.setSonProjectList(sonList); } } } - return projectDao.queryProjectList(param.getStartTime(),param.getEndTime(),userId); + + +// if (CollectionUtil.isNotEmpty(projectList)){ +// for (ProjectVo.QueryProject project : projectList) { +// List sonProjectList = projectDao.querySonProject(project.getId()); +// if (CollectionUtil.isNotEmpty(sonProjectList)){ +// project.setSonProjectList(sonProjectList); +// } +// } +// } + return projectList; } @Override diff --git a/signin/src/main/resources/mapper_dao/ProjectDap.xml b/signin/src/main/resources/mapper_dao/ProjectDap.xml index ee096a68..00715868 100644 --- a/signin/src/main/resources/mapper_dao/ProjectDap.xml +++ b/signin/src/main/resources/mapper_dao/ProjectDap.xml @@ -18,11 +18,13 @@ p.project_start_time as startTime, p.project_end_time as endTime, p.project_status as `status`, - p.url + p.url, + t.template_code FROM t_sys_project_list p LEFT JOIN t_sys_user_project u ON p.project_id = u.project_id AND u.rec_status = 0 + LEFT JOIN t_sys_template AS t ON p.template_id = t.id AND t.rec_status = 0 WHERE p.rec_status = 0 AND u.user_id = #{userId} @@ -57,12 +59,16 @@ project_start_time as startTime, project_end_time as endTime, project_status as `status`, - url + url, + parent_project_id AS parentId FROM t_sys_project_list WHERE rec_status = 0 - AND parent_project_id = #{id} + AND parent_project_id IN + + #{item} + select @@ -104,10 +105,10 @@ insert into t_sys_template (id, name, url, business_template_id, created_at, updated_at, - rec_status) + rec_status, template_code) values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{businessTemplateId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, - #{recStatus,jdbcType=TINYINT}) + #{recStatus,jdbcType=TINYINT}, #{templateCode,jdbcType=VARCHAR}) insert into t_sys_template @@ -133,6 +134,9 @@ rec_status, + + template_code, + @@ -156,6 +160,9 @@ #{recStatus,jdbcType=TINYINT}, + + #{templateCode,jdbcType=VARCHAR}, +