Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
commit
42a5c0d990
  1. 6
      xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java
  2. 6
      xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java
  3. 15
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
  4. 4
      xm-core/src/main/java/com/xm/core/service/XmMenuService.java
  5. 5
      xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java
  6. 5
      xm-core/src/main/java/com/xm/core/service/XmTaskService.java
  7. 8
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml
  8. 8
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml
  9. 9
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml

6
xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java

@ -168,6 +168,9 @@ public class XmMenuController {
xmMenu.setMmUsername(user.getUsername()); xmMenu.setMmUsername(user.getUsername());
} }
xmMenuService.insert(xmMenu); xmMenuService.insert(xmMenu);
if(StringUtils.hasText(xmMenu.getPmenuId())){
this.xmMenuService.updateMenuChildrenCntByMenuId(xmMenu.getPmenuId());
}
m.put("data",xmMenu); m.put("data",xmMenu);
}catch (BizException e) { }catch (BizException e) {
tips=e.getTips(); tips=e.getTips();
@ -205,6 +208,9 @@ public class XmMenuController {
tips.setFailureMsg("存在"+childCount+"个子故事关联该故事,不允许删除"); tips.setFailureMsg("存在"+childCount+"个子故事关联该故事,不允许删除");
}else { }else {
xmMenuService.deleteByPk(xmMenu); xmMenuService.deleteByPk(xmMenu);
if(StringUtils.hasText(xmMenu.getPmenuId())){
this.xmMenuService.updateMenuChildrenCntByMenuId(xmMenu.getPmenuId());
}
} }
} }
}catch (BizException e) { }catch (BizException e) {

6
xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java

@ -230,6 +230,9 @@ public class XmProjectPhaseController {
Tips judgetTips=xmProjectPhaseService.judgetBudget(projectId, phaseBudgetCost,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,phaseBudgetNouserAt,excludePhaseIds); Tips judgetTips=xmProjectPhaseService.judgetBudget(projectId, phaseBudgetCost,phaseBudgetInnerUserAt,phaseBudgetOutUserAt,phaseBudgetNouserAt,excludePhaseIds);
if(judgetTips.isOk()) { if(judgetTips.isOk()) {
xmProjectPhaseService.insert(xmProjectPhase); xmProjectPhaseService.insert(xmProjectPhase);
if(StringUtils.hasText(xmProjectPhase.getParentPhaseId())){
this.xmProjectPhaseService.updatePhaseChildrenCntByPhaseId(xmProjectPhase.getParentPhaseId());
}
xmRecordService.addXmPhaseRecord(projectId, xmProjectPhase.getId(), "项目-阶段计划-新增计划", "新增阶段计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null); xmRecordService.addXmPhaseRecord(projectId, xmProjectPhase.getId(), "项目-阶段计划-新增计划", "新增阶段计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null);
m.put("data",xmProjectPhase); m.put("data",xmProjectPhase);
}else { }else {
@ -282,6 +285,9 @@ public class XmProjectPhaseController {
}else { }else {
xmProjectPhaseService.deleteByPk(xmProjectPhase); xmProjectPhaseService.deleteByPk(xmProjectPhase);
if(StringUtils.hasText(xmProjectPhase.getParentPhaseId())){
this.xmProjectPhaseService.updatePhaseChildrenCntByPhaseId(xmProjectPhase.getParentPhaseId());
}
xmRecordService.addXmPhaseRecord(xmProjectPhase.getProjectId(), xmProjectPhase.getId(), "项目-阶段计划-删除计划", "删除阶段计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null); xmRecordService.addXmPhaseRecord(xmProjectPhase.getProjectId(), xmProjectPhase.getId(), "项目-阶段计划-删除计划", "删除阶段计划"+xmProjectPhase.getPhaseName(),JSON.toJSONString(xmProjectPhase),null);
} }
} }

15
xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@ -261,6 +261,12 @@ public class XmTaskController {
Tips tips=new Tips("成功新增一条数据"); Tips tips=new Tips("成功新增一条数据");
try{ try{
if(!StringUtils.hasText(xmTaskVo.getNtype())){
tips.setFailureMsg("节点类型ntype不能为空");
m.put("tips", tips);
return m;
}
User user=LoginUtils.getCurrentUserInfo(); User user=LoginUtils.getCurrentUserInfo();
xmTaskVo.setCreateUserid(user.getUserid()); xmTaskVo.setCreateUserid(user.getUserid());
xmTaskVo.setCreateUsername(user.getUsername()); xmTaskVo.setCreateUsername(user.getUsername());
@ -300,6 +306,9 @@ public class XmTaskController {
Tips judgetTips=xmTaskService.judgetBudget(projectPhaseId, taskBudgetCost,taskBudgetInnerUserAt,taskBudgetOutUserAt,taskBudgetNouserAt,null); Tips judgetTips=xmTaskService.judgetBudget(projectPhaseId, taskBudgetCost,taskBudgetInnerUserAt,taskBudgetOutUserAt,taskBudgetNouserAt,null);
if(judgetTips.isOk()) { if(judgetTips.isOk()) {
xmTaskVo = xmTaskService.addTask(xmTaskVo); xmTaskVo = xmTaskService.addTask(xmTaskVo);
if(StringUtils.hasText(xmTaskVo.getParentTaskid())){
xmTaskService.updateTaskChildrenCntByTaskId(xmTaskVo.getParentTaskid());
}
}else { }else {
tips=judgetTips; tips=judgetTips;
} }
@ -424,7 +433,13 @@ public class XmTaskController {
m.put("tips", tips); m.put("tips", tips);
return m; return m;
} }
if(StringUtils.hasText(xmTaskDb.getParentTaskid())){
xmTaskService.updateTaskChildrenCntByTaskId(xmTaskDb.getParentTaskid());
}
xmTaskService.deleteTask(xmTask); xmTaskService.deleteTask(xmTask);
if(StringUtils.hasText(xmTaskDb.getParentTaskid())){
xmTaskService.updateTaskChildrenCntByTaskId(xmTaskDb.getParentTaskid());
}
}catch (BizException e) { }catch (BizException e) {
tips=e.getTips(); tips=e.getTips();
logger.error("",e); logger.error("",e);

4
xm-core/src/main/java/com/xm/core/service/XmMenuService.java

@ -37,6 +37,10 @@ public class XmMenuService extends BaseService {
} }
public void updateMenuChildrenCntByMenuId(String menuId){
super.update("updateMenuChildrenCntByMenuId",menuId);
}
@Transactional @Transactional
public void batchInsertOrUpdate(List<XmMenuVo> xmMenus) { public void batchInsertOrUpdate(List<XmMenuVo> xmMenus) {
List<XmMenuVo> addList=new ArrayList<>(); List<XmMenuVo> addList=new ArrayList<>();

5
xm-core/src/main/java/com/xm/core/service/XmProjectPhaseService.java

@ -146,6 +146,11 @@ public class XmProjectPhaseService extends BaseService {
return i; return i;
} }
public void updatePhaseChildrenCntByPhaseId(String phaseId){
super.update("updatePhaseChildrenCntByPhaseId",phaseId);
}
public Long checkExistsChildren(String phaseId) { public Long checkExistsChildren(String phaseId) {
Long i= this.selectOne("checkExistsChildren", phaseId); Long i= this.selectOne("checkExistsChildren", phaseId);
return i; return i;

5
xm-core/src/main/java/com/xm/core/service/XmTaskService.java

@ -120,6 +120,11 @@ public class XmTaskService extends BaseService {
} }
public void updateTaskChildrenCntByTaskId(String taskId){
super.update("updateTaskChildrenCntByTaskId",taskId);
}
public List<Map<String,Object>> getTask(Map<String,Object> xmTask){ public List<Map<String,Object>> getTask(Map<String,Object> xmTask){
List<Map<String,Object>> mapList = this.selectListMapByWhere(xmTask);//所有数据 List<Map<String,Object>> mapList = this.selectListMapByWhere(xmTask);//所有数据
return mapList; return mapList;

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

@ -58,7 +58,13 @@
order by res.seq_no asc order by res.seq_no asc
</select> </select>
<update id="updateMenuChildrenCntByMenuId" parameterType="String">
UPDATE xm_menu t
LEFT JOIN ( SELECT count( 1 ) AS children_cnt, tt.pmenu_id AS menu_id FROM xm_menu tt WHERE tt.pmenu_id = #{menuId} ) t2 ON t2.menu_id = t.menu_id
SET t.children_cnt = ifnull( t2.children_cnt, 0 )
WHERE
t.menu_id = #{menuId}
</update>
<!--结束 自定义sql函数区域--> <!--结束 自定义sql函数区域-->

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

@ -65,7 +65,13 @@
select count(1) from xm_project_phase res where res.parent_phase_id = #{id} select count(1) from xm_project_phase res where res.parent_phase_id = #{id}
</select> </select>
<update id="updatePhaseChildrenCntByPhaseId" parameterType="String">
UPDATE xm_project_phase t
LEFT JOIN ( SELECT count( 1 ) AS children_cnt, tt.parent_phase_id AS id FROM xm_project_phase tt WHERE tt.parent_phase_id = #{id} ) t2 ON t2.id = t.id
SET t.children_cnt = ifnull( t2.children_cnt, 0 )
WHERE
t.id = #{id}
</update>
<!--结束 自定义sql函数区域--> <!--结束 自定义sql函数区域-->

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

@ -78,6 +78,15 @@
update xm_task set menu_id = #{menuId}, menu_name = #{menuName},product_id=#{productId},product_name=#{productName} where id = #{id} update xm_task set menu_id = #{menuId}, menu_name = #{menuName},product_id=#{productId},product_name=#{productName} where id = #{id}
</update> </update>
<update id="updateTaskChildrenCntByTaskId" parameterType="String">
UPDATE xm_task t
LEFT JOIN ( SELECT count( 1 ) AS children_cnt, tt.parent_taskid AS id FROM xm_task tt WHERE tt.parent_taskid = #{id} ) t2 ON t2.id = t.id
SET t.children_cnt = ifnull( t2.children_cnt, 0 )
WHERE
t.id = #{id}
</update>
<!-- 插入流程审批表数据 --> <!-- 插入流程审批表数据 -->
<insert id="insertProcessApprova" <insert id="insertProcessApprova"
parameterType="HashMap" parameterType="HashMap"

Loading…
Cancel
Save