src/main/java/com/whyc/pojo/WorkflowMain.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/BattDischargePlanTempService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/service/WorkflowMainService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/pojo/WorkflowMain.java
@@ -80,7 +80,7 @@ private Integer type; @TableField(exist = false) private BattDischargePlanTemp temp; private List<BattDischargePlanTemp> tempList; public WorkflowMain(Integer id, Integer status,String endReason,Date endTime) { this.id = id; @@ -261,11 +261,11 @@ this.type = type; } public BattDischargePlanTemp getTemp() { return temp; public List<BattDischargePlanTemp> getTempList() { return tempList; } public void setTemp(BattDischargePlanTemp temp) { this.temp = temp; public void setTempList(List<BattDischargePlanTemp> tempList) { this.tempList = tempList; } } src/main/java/com/whyc/service/BattDischargePlanTempService.java
@@ -1,5 +1,6 @@ package com.whyc.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.whyc.constant.WorkflowDischargePlanEnum; @@ -924,4 +925,10 @@ mapper.delete(update); return new Response().set(1,"删除完成"); } public List<BattDischargePlanTemp> getListByMainId(Integer mainId) { QueryWrapper<BattDischargePlanTemp> query = Wrappers.query(); query.eq("main_id",mainId); return mapper.selectList(query); } } src/main/java/com/whyc/service/WorkflowMainService.java
@@ -6,6 +6,7 @@ import com.github.pagehelper.PageInfo; import com.whyc.dto.Response; import com.whyc.mapper.WorkflowMainMapper; import com.whyc.pojo.BattDischargePlanTemp; import com.whyc.pojo.UserInf; import com.whyc.pojo.WorkflowLink; import com.whyc.pojo.WorkflowMain; @@ -27,6 +28,9 @@ @Autowired private WorkflowLinkService linkService; @Autowired private BattDischargePlanTempService tempService; /** * 分派单号: @@ -77,7 +81,19 @@ public WorkflowMain getBaseInfo(Integer mainId) { return mapper.getBaseInfo(mainId); //根据mainId查询是哪种类型 QueryWrapper<WorkflowMain> query = Wrappers.query(); query.eq("id",mainId).last(" limit 1"); WorkflowMain workflowMain = mapper.selectOne(query); Integer type = workflowMain.getType(); if(type ==1){ List<BattDischargePlanTemp> tempList = tempService.getListByMainId(mainId); workflowMain.setTempList(tempList); } List<WorkflowLink> linkList = linkService.getWorkflowInfo(mainId); workflowMain.setLinkList(linkList); return workflowMain; } public List<WorkflowLink> getAssignReply(Integer mainId) {