陈裕财 2 years ago
parent
commit
a148e2a0cc
  1. 2
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java
  2. 2
      xm-core/src/main/java/com/xm/core/mapper/XmBranchStateMapper.xml
  3. 2
      xm-core/src/main/java/com/xm/core/mapper/XmGroupStateMapper.xml
  4. 2
      xm-core/src/main/java/com/xm/core/mapper/XmIterationMapper.xml
  5. 2
      xm-core/src/main/java/com/xm/core/mapper/XmIterationStateMapper.xml
  6. 2
      xm-core/src/main/java/com/xm/core/mapper/XmMenuStateMapper.xml
  7. 2
      xm-core/src/main/java/com/xm/core/mapper/XmProductStateMapper.xml
  8. 4
      xm-core/src/main/java/com/xm/core/mapper/XmProjectStateMapper.xml

2
xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java

@ -370,7 +370,7 @@ public class XmProjectController {
User user= LoginUtils.getCurrentUserInfo(); User user= LoginUtils.getCurrentUserInfo();
String code=this.xmProjectService.createProjectCode(user.getBranchId()); String code=this.xmProjectService.createProjectCode(user.getBranchId());
return Result.ok();
return Result.ok().setData(code);
} }
@ApiOperation( value = "根据主键修改一条xm_project信息",notes="editXmProject") @ApiOperation( value = "根据主键修改一条xm_project信息",notes="editXmProject")

2
xm-core/src/main/java/com/xm/core/mapper/XmBranchStateMapper.xml

@ -84,7 +84,7 @@
</select> </select>
<!-- 根据条件修改若干条记录 --> <!-- 根据条件修改若干条记录 -->
<update id="loadProjectStateToXmBranchState" parameterType="String" statementType="CALLABLE"> <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> </update>
<select id="tasksSumDw" parameterType="String" resultType="HashMap"> <select id="tasksSumDw" parameterType="String" resultType="HashMap">

2
xm-core/src/main/java/com/xm/core/mapper/XmGroupStateMapper.xml

@ -16,6 +16,6 @@
</select> </select>
<update id="loadTasksToXmProjectGroupState" parameterType="String" statementType="CALLABLE"> <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> </update>
</mapper> </mapper>

2
xm-core/src/main/java/com/xm/core/mapper/XmIterationMapper.xml

@ -41,7 +41,7 @@
</sql> </sql>
<update id="load_tasks_to_xm_iteration_state" parameterType="String" statementType="CALLABLE"> <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> </update>
<select id="selectListMapByWhereWithState" parameterType="HashMap" resultType="HashMap"> <select id="selectListMapByWhereWithState" parameterType="HashMap" resultType="HashMap">

2
xm-core/src/main/java/com/xm/core/mapper/XmIterationStateMapper.xml

@ -16,6 +16,6 @@
</select> </select>
<update id="loadTasksToXmIterationState" parameterType="String" statementType="CALLABLE"> <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> </update>
</mapper> </mapper>

2
xm-core/src/main/java/com/xm/core/mapper/XmMenuStateMapper.xml

@ -14,7 +14,7 @@
</select> </select>
<update id="loadTasksToXmMenuState" parameterType="String" statementType="CALLABLE"> <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> </update>

2
xm-core/src/main/java/com/xm/core/mapper/XmProductStateMapper.xml

@ -15,6 +15,6 @@
${@com.mdp.Util@trimGroupBy(ew.customSqlSegment,'')} ${@com.mdp.Util@trimGroupBy(ew.customSqlSegment,'')}
</select> </select>
<update id="loadTasksToXmProductState" parameterType="String" statementType="CALLABLE"> <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> </update>
</mapper> </mapper>

4
xm-core/src/main/java/com/xm/core/mapper/XmProjectStateMapper.xml

@ -15,10 +15,10 @@
${@com.mdp.Util@trimGroupBy(ew.customSqlSegment,'')} ${@com.mdp.Util@trimGroupBy(ew.customSqlSegment,'')}
</select> </select>
<update id="loadTasksToXmProjectState" parameterType="String" statementType="CALLABLE"> <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>
<update id="loadTasksSettleToXmProjectState" parameterType="String" statementType="CALLABLE"> <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> </update>

Loading…
Cancel
Save