Bladeren bron

wbs私有库初始化

liuyc 3 jaren geleden
bovenliggende
commit
f60715ad0e

+ 7 - 0
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsInfoDTO.java

@@ -17,6 +17,7 @@
 package org.springblade.manager.dto;
 
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.manager.entity.WbsInfo;
@@ -44,6 +45,12 @@ public class WbsInfoDTO extends WbsInfo {
 	@ApiModelProperty(value = "wbs类型")
 	private Integer wbsType;
 
+	/**
+	 * 状态
+	 */
+	private Integer status;
+
+
 
 
 }

+ 1 - 0
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsInfo.java

@@ -44,4 +44,5 @@ public class WbsInfo extends BaseEntity {
 		private Integer wbsType;
 
 
+
 }

+ 5 - 0
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsInfoVO.java

@@ -46,5 +46,10 @@ public class WbsInfoVO implements Serializable {
 	 */
 	private String wbsType;
 
+	/**
+	 * 状态
+	 */
+	private String status;
+
 
 }

+ 0 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ProjectInfoController.java

@@ -80,7 +80,6 @@ public class ProjectInfoController extends BladeController {
     @ApiOperation(value = "分页", notes = "传入projectInfo")
     public R<IPage<ProjectInfoVO>> list(ProjectInfo projectInfo, Query query) {
         IPage<ProjectInfo> pages = projectInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(projectInfo));
-        pages.getRecords().forEach(System.out::print);
 
         return R.data(ProjectInfoWrapper.build().pageVO(pages));
     }

+ 12 - 10
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsInfoMapper.xml

@@ -19,6 +19,7 @@
         <result column="id" property="id"/>
         <result column="wbs_name" property="wbsName"/>
         <result column="wbs_type" property="wbsType"/>
+        <result column="status" property="status"/>
     </resultMap>
 
     <select id="selectWbsInfoPage" resultMap="wbsInfoResultMap">
@@ -26,19 +27,20 @@
     </select>
     <select id="selectAll" resultMap="resultMap2">
         SELECT
-            id,
-            wbs_name,
-            wbs_type
+        id,
+        wbs_name,
+        wbs_type,
+        status,
         FROM
-            m_wbs_info
+        m_wbs_info
         WHERE
-            is_deleted = 0
-            AND STATUS = 1
-            <if test="type != null and type != ''">
-                AND wbs_type = #{type}
-            </if>
+        is_deleted = 0
+        AND STATUS = 1
+        <if test="type != null and type != ''">
+            AND wbs_type = #{type}
+        </if>
         GROUP BY
-            wbs_name
+        wbs_name
     </select>
 
 </mapper>