添加节点类型、标签等

xm-core/src/main/java/com/xm/core/ctrl/XmIterationLinkController.java

@@ -67,8 +67,38 @@ public class XmIterationLinkController {
 		m.put("tips", tips);
 		return m;
 	}
-	
- 
+	@ApiOperation( value = "查询迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表信息列表",notes=" ")
+	@ApiResponses({
+			@ApiResponse(code = 200,response= XmIterationLink.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
+	})
+	@RequestMapping(value="/listWithProductInfo",method=RequestMethod.GET)
+	public Map<String,Object> listWithProductInfo( @RequestParam Map<String,Object> xmIterationLink){
+		Map<String,Object> m = new HashMap<>();
+		RequestUtils.transformArray(xmIterationLink, "iterationIdsproductIds");
+		PageUtils.startPage(xmIterationLink);
+		List<Map<String,Object>>	xmIterationLinkList = xmIterationLinkService.listWithProductInfo(xmIterationLink);	//列出XmIterationLink列表
+		PageUtils.responePage(m, xmIterationLinkList);
+		m.put("data",xmIterationLinkList);
+		Tips tips=new Tips("查询成功");
+		m.put("tips", tips);
+		return m;
+	}
+	@ApiOperation( value = "查询迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表信息列表",notes=" ")
+	@ApiResponses({
+			@ApiResponse(code = 200,response= XmIterationLink.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
+	})
+	@RequestMapping(value="/listWithProjectInfo",method=RequestMethod.GET)
+	public Map<String,Object> listWithProjectInfo( @RequestParam Map<String,Object> xmIterationLink){
+		Map<String,Object> m = new HashMap<>();
+		RequestUtils.transformArray(xmIterationLink, "iterationIdsproductIds");
+		PageUtils.startPage(xmIterationLink);
+		List<Map<String,Object>>	xmIterationLinkList = xmIterationLinkService.listWithProjectInfo(xmIterationLink);	//列出XmIterationLink列表
+		PageUtils.responePage(m, xmIterationLinkList);
+		m.put("data",xmIterationLinkList);
+		Tips tips=new Tips("查询成功");
+		m.put("tips", tips);
+		return m;
+	}
 	
 
 	@ApiOperation( value = "新增一条迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表信息",notes=" ")

xm-core/src/main/java/com/xm/core/service/XmIterationLinkService.java

@@ -5,6 +5,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import com.mdp.core.service.BaseService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.<br> 
  * 组织 com  顶级模块 xm 大模块 core 小模块 <br>
@@ -13,6 +16,14 @@ import com.mdp.core.service.BaseService;
 @Service("xm.core.xmIterationLinkService")
 public class XmIterationLinkService extends BaseService {
 	static Logger logger =LoggerFactory.getLogger(XmIterationLinkService.class);
+
+	public List<Map<String, Object>> listWithProductInfo(Map<String, Object> xmIterationLink) {
+		return super.selectList("listWithProductInfo",xmIterationLink);
+	}
+
+	public List<Map<String, Object>> listWithProjectInfo(Map<String, Object> xmIterationLink) {
+		return super.selectList("listWithProjectInfo",xmIterationLink);
+	}
 	/** 请在此类添加自定义函数 */
 
 }

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationLinkMapper.xml

@@ -15,6 +15,22 @@
     </sql>
 
 
+	<select id="listWithProjectInfo" parameterType="HashMap" resultType="HashMap">
+		select res.*,p.name as project_name,p.p.id as project_id,i.iteration_name from xm_iteration_link res left join xm_product p on res.pro_id=p.id
+		inner join xm_iteration i on i.id=res.iteration_id
+		<where>
+			<include refid="whereForMap"/>
+			<include refid="where"/>
+		</where>
+	</select>
+	<select id="listWithProductInfo" parameterType="HashMap" resultType="HashMap">
+		select res.*,p.product_name,p.id as product_id,i.iteration_name from xm_iteration_link res left join xm_product p on res.pro_id=p.id
+		inner join xm_iteration i on i.id=res.iteration_id
+		<where>
+			<include refid="whereForMap"/>
+			<include refid="where"/>
+		</where>
+	</select>
 	<!--结束 自定义sql函数区域-->