From 573b964656bce04cd1a80c4e7eee766d6c55947f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 11 Mar 2022 16:13:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xm/core/ctrl/XmIterationController.java | 12 +++++-------
 .../mapper/xm/core/dao/XmIterationLinkMapper.xml     |  6 ++++--
 .../mybatis/mapper/xm/core/dao/XmIterationMapper.xml |  1 +
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java
index 5cdcbc1d..96e5d916 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java
@@ -159,15 +159,13 @@ public class XmIterationController {
 		try{
 			if(StringUtils.isEmpty(xmIteration.getId())) {
 				xmIteration.setId(xmIterationService.createKey("id"));
-			}else{
-				 XmIteration xmIterationQuery = new  XmIteration(xmIteration.getId());
-				if(xmIterationService.countByWhere(xmIterationQuery)>0){
-					tips.setFailureMsg("编号重复，请修改编号再提交");
-					m.put("tips", tips);
-					return m;
-				}
 			}
+			XmIteration q=new XmIteration();
 			User user= LoginUtils.getCurrentUserInfo();
+
+			q.setBranchId(user.getBranchId());
+			Long count=this.xmIterationService.countByWhere(q);
+			xmIteration.setSeqNo(Long.toString(count+1));
 			xmIteration.setCtime(new Date());
 			xmIteration.setCuserid(user.getUserid());
 			xmIteration.setCusername(user.getUsername());
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationLinkMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationLinkMapper.xml
index 35250d9a..3359f733 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationLinkMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationLinkMapper.xml
@@ -16,20 +16,22 @@
 
 
 	<select id="listWithProjectInfo" parameterType="HashMap" resultType="HashMap">
-		select res.*,p.name as project_name,p.id as project_id,i.iteration_name from xm_iteration_link res inner join xm_project p on res.pro_id=p.id
+		select res.*,p.name as project_name,p.id as project_id,i.iteration_name,i.seq_no from xm_iteration_link res inner join xm_project 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>
+		order by i.seq_no desc
 	</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 inner join xm_product p on res.pro_id=p.id
+		select res.*,p.product_name,p.id as product_id,i.iteration_name,i.seq_no from xm_iteration_link res inner 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>
+		order by i.seq_no desc
 	</select>
 	<!--结束 自定义sql函数区域-->
 	
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml
index b2c0c029..2f524e31 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml
@@ -91,6 +91,7 @@
 			</if>
 			<if test="key != null and key !='' ">   and res.iteration_name like #{key}    </if>
 		</where>
+		order by res.seq_no desc
 	</select>
 	
 	<!-- 通过条件查询获取数据列表 不分页 返回 list<Object> -->