From a148e2a0ccdbe38c97bbc6f8063c1ecca2760aa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 12 Nov 2023 17:16:26 +0800
Subject: [PATCH] 2.0

---
 .../src/main/java/com/xm/core/ctrl/XmProjectController.java   | 2 +-
 .../src/main/java/com/xm/core/mapper/XmBranchStateMapper.xml  | 2 +-
 .../src/main/java/com/xm/core/mapper/XmGroupStateMapper.xml   | 2 +-
 .../src/main/java/com/xm/core/mapper/XmIterationMapper.xml    | 2 +-
 .../main/java/com/xm/core/mapper/XmIterationStateMapper.xml   | 2 +-
 .../src/main/java/com/xm/core/mapper/XmMenuStateMapper.xml    | 2 +-
 .../src/main/java/com/xm/core/mapper/XmProductStateMapper.xml | 2 +-
 .../src/main/java/com/xm/core/mapper/XmProjectStateMapper.xml | 4 ++--
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java
index 8002c78f..891d706a 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java
@@ -370,7 +370,7 @@ public class XmProjectController {
 			User user= LoginUtils.getCurrentUserInfo();
 			String code=this.xmProjectService.createProjectCode(user.getBranchId());
 			
-		return Result.ok();
+		return Result.ok().setData(code);
 		
 	}
 	@ApiOperation( value = "根据主键修改一条xm_project信息",notes="editXmProject")
diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmBranchStateMapper.xml b/xm-core/src/main/java/com/xm/core/mapper/XmBranchStateMapper.xml
index ceb2e07f..a67cdbb9 100644
--- a/xm-core/src/main/java/com/xm/core/mapper/XmBranchStateMapper.xml
+++ b/xm-core/src/main/java/com/xm/core/mapper/XmBranchStateMapper.xml
@@ -84,7 +84,7 @@
     </select>
     <!-- 根据条件修改若干条记录 -->
     <update id="loadProjectStateToXmBranchState" parameterType="String" statementType="CALLABLE">
-        {call load_project_state_to_xm_branch_state(#{branchId,mode=IN})}
+        call load_project_state_to_xm_branch_state(#{branchId,mode=IN})
     </update>
 
     <select id="tasksSumDw" parameterType="String" resultType="HashMap">
diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmGroupStateMapper.xml b/xm-core/src/main/java/com/xm/core/mapper/XmGroupStateMapper.xml
index 9dbde9cd..5732d4c7 100644
--- a/xm-core/src/main/java/com/xm/core/mapper/XmGroupStateMapper.xml
+++ b/xm-core/src/main/java/com/xm/core/mapper/XmGroupStateMapper.xml
@@ -16,6 +16,6 @@
     </select>
 
     <update id="loadTasksToXmProjectGroupState" parameterType="String" statementType="CALLABLE">
-        {call load_tasks_to_xm_project_group_state(#{projectId,mode=IN})}
+        call load_tasks_to_xm_project_group_state(#{projectId,mode=IN})
     </update>
 </mapper>
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmIterationMapper.xml b/xm-core/src/main/java/com/xm/core/mapper/XmIterationMapper.xml
index 518873f6..ef2a7270 100644
--- a/xm-core/src/main/java/com/xm/core/mapper/XmIterationMapper.xml
+++ b/xm-core/src/main/java/com/xm/core/mapper/XmIterationMapper.xml
@@ -41,7 +41,7 @@
     </sql>
 
     <update id="load_tasks_to_xm_iteration_state" parameterType="String" statementType="CALLABLE">
-        {call load_tasks_to_xm_iteration_state(#{inIterationId,mode=IN})}
+        call load_tasks_to_xm_iteration_state(#{inIterationId,mode=IN})
     </update>
 
     <select id="selectListMapByWhereWithState" parameterType="HashMap" resultType="HashMap">
diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmIterationStateMapper.xml b/xm-core/src/main/java/com/xm/core/mapper/XmIterationStateMapper.xml
index f4920114..06f295f3 100644
--- a/xm-core/src/main/java/com/xm/core/mapper/XmIterationStateMapper.xml
+++ b/xm-core/src/main/java/com/xm/core/mapper/XmIterationStateMapper.xml
@@ -16,6 +16,6 @@
     </select>
 
     <update id="loadTasksToXmIterationState" parameterType="String" statementType="CALLABLE">
-        {call load_tasks_to_xm_iteration_state(#{productId,mode=IN})}
+        call load_tasks_to_xm_iteration_state(#{productId,mode=IN})
     </update>
 </mapper>
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmMenuStateMapper.xml b/xm-core/src/main/java/com/xm/core/mapper/XmMenuStateMapper.xml
index 0705bca1..4dc9a26e 100644
--- a/xm-core/src/main/java/com/xm/core/mapper/XmMenuStateMapper.xml
+++ b/xm-core/src/main/java/com/xm/core/mapper/XmMenuStateMapper.xml
@@ -14,7 +14,7 @@
     </select>
 
     <update id="loadTasksToXmMenuState" parameterType="String" statementType="CALLABLE">
-        {call load_tasks_to_xm_menu_state(#{productId,mode=IN})}
+        call load_tasks_to_xm_menu_state(#{productId,mode=IN})
     </update>
 
 
diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmProductStateMapper.xml b/xm-core/src/main/java/com/xm/core/mapper/XmProductStateMapper.xml
index ab3716fa..b01481b3 100644
--- a/xm-core/src/main/java/com/xm/core/mapper/XmProductStateMapper.xml
+++ b/xm-core/src/main/java/com/xm/core/mapper/XmProductStateMapper.xml
@@ -15,6 +15,6 @@
         ${@com.mdp.Util@trimGroupBy(ew.customSqlSegment,'')}
     </select>
     <update id="loadTasksToXmProductState" parameterType="String" statementType="CALLABLE">
-        {call load_tasks_to_xm_product_state(#{productId,mode=IN})}
+        call load_tasks_to_xm_product_state(#{productId,mode=IN})
     </update>
 </mapper>
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/mapper/XmProjectStateMapper.xml b/xm-core/src/main/java/com/xm/core/mapper/XmProjectStateMapper.xml
index 5f0c12d2..295b3dc3 100644
--- a/xm-core/src/main/java/com/xm/core/mapper/XmProjectStateMapper.xml
+++ b/xm-core/src/main/java/com/xm/core/mapper/XmProjectStateMapper.xml
@@ -15,10 +15,10 @@
         ${@com.mdp.Util@trimGroupBy(ew.customSqlSegment,'')}
     </select>
     <update id="loadTasksToXmProjectState" parameterType="String" statementType="CALLABLE">
-        {call load_tasks_to_xm_project_state(#{projectId,mode=IN})}
+        call load_tasks_to_xm_project_state(#{projectId,mode=IN})
     </update>
     <update id="loadTasksSettleToXmProjectState" parameterType="String" statementType="CALLABLE">
-        {call load_tasks_settle_to_xm_project_state(#{projectId,mode=IN})}
+        call load_tasks_settle_to_xm_project_state(#{projectId,mode=IN})
     </update>