修改查询项目

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

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<String> values) {
+            addCriterion("template_code in", values, "templateCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andTemplateCodeNotIn(List<String> 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 {

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<QueryProject> sonProjectList;
+        @JsonIgnore
+        @ApiModelProperty("父级id")
+        private Long parentId;
 
 
         public Byte getStatus() {

signin/src/main/java/com/ccsens/signin/persist/dao/ProjectDao.java

@@ -20,7 +20,7 @@ public interface ProjectDao {
      * @param id 项目id
      * @return 子项目列表
      */
-    List<ProjectVo.QueryProject> querySonProject(@Param("id") Long id);
+    List<ProjectVo.QueryProject> querySonProject(@Param("idList") List<Long> id);
 
     /**
      * 根据项目id 批量查询

signin/src/main/java/com/ccsens/signin/service/ProjectService.java

@@ -50,15 +50,32 @@ public class ProjectService implements IProjectService{
     public List<ProjectVo.QueryProject> queryProjectList(ProjectDto.QueryProjectDto param, Long userId) {
         List<ProjectVo.QueryProject> projectList = projectDao.queryProjectList(param.getStartTime(), param.getEndTime(), userId);
         //查询子项目
-        if (CollectionUtil.isNotEmpty(projectList)){
-            for (ProjectVo.QueryProject project : projectList) {
-                List<ProjectVo.QueryProject> sonProjectList = projectDao.querySonProject(project.getId());
-                if (CollectionUtil.isNotEmpty(sonProjectList)){
-                    project.setSonProjectList(sonProjectList);
+        if (CollectionUtil.isNotEmpty(projectList)) {
+            List<Long> projectIdList = projectList.stream().map(ProjectVo.QueryProject::getId).collect(Collectors.toList());
+            List<ProjectVo.QueryProject> sonProjectList = projectDao.querySonProject(projectIdList);
+            if (CollectionUtil.isNotEmpty(sonProjectList)) {
+                for (ProjectVo.QueryProject queryProject : projectList) {
+                    List<ProjectVo.QueryProject> 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<ProjectVo.QueryProject> sonProjectList = projectDao.querySonProject(project.getId());
+//                if (CollectionUtil.isNotEmpty(sonProjectList)){
+//                    project.setSonProjectList(sonProjectList);
+//                }
+//            }
+//        }
+        return projectList;
     }
 
     @Override

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
+        <foreach collection="idList" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
     </select>
 
     <select id="batchQueryProjectById" resultType="com.ccsens.signin.bean.po.SysProjectList">

signin/src/main/resources/mapper_raw/SysTemplateMapper.xml

@@ -9,6 +9,7 @@
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+    <result column="template_code" jdbcType="VARCHAR" property="templateCode" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -69,7 +70,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, name, url, business_template_id, created_at, updated_at, rec_status
+    id, name, url, business_template_id, created_at, updated_at, rec_status, template_code
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.signin.bean.po.SysTemplateExample" resultMap="BaseResultMap">
     select
@@ -104,10 +105,10 @@
   <insert id="insert" parameterType="com.ccsens.signin.bean.po.SysTemplate">
     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>
   <insert id="insertSelective" parameterType="com.ccsens.signin.bean.po.SysTemplate">
     insert into t_sys_template
@@ -133,6 +134,9 @@
       <if test="recStatus != null">
         rec_status,
       </if>
+      <if test="templateCode != null">
+        template_code,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -156,6 +160,9 @@
       <if test="recStatus != null">
         #{recStatus,jdbcType=TINYINT},
       </if>
+      <if test="templateCode != null">
+        #{templateCode,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.ccsens.signin.bean.po.SysTemplateExample" resultType="java.lang.Long">
@@ -188,6 +195,9 @@
       <if test="record.recStatus != null">
         rec_status = #{record.recStatus,jdbcType=TINYINT},
       </if>
+      <if test="record.templateCode != null">
+        template_code = #{record.templateCode,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -201,7 +211,8 @@
       business_template_id = #{record.businessTemplateId,jdbcType=BIGINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
-      rec_status = #{record.recStatus,jdbcType=TINYINT}
+      rec_status = #{record.recStatus,jdbcType=TINYINT},
+      template_code = #{record.templateCode,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -227,6 +238,9 @@
       <if test="recStatus != null">
         rec_status = #{recStatus,jdbcType=TINYINT},
       </if>
+      <if test="templateCode != null">
+        template_code = #{templateCode,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -237,7 +251,8 @@
       business_template_id = #{businessTemplateId,jdbcType=BIGINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
-      rec_status = #{recStatus,jdbcType=TINYINT}
+      rec_status = #{recStatus,jdbcType=TINYINT},
+      template_code = #{templateCode,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>