diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index 141c044c..6205d445 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -38,8 +38,10 @@ import org.activiti.engine.history.*; import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.runtime.ProcessInstanceQuery; +import org.activiti.engine.task.Comment; import org.activiti.engine.task.NativeTaskQuery; import org.activiti.engine.task.Task; +import org.activiti.engine.task.TaskQuery; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -1246,7 +1248,7 @@ public class TodoTaskController extends BaseAction { public Wrapper saveInboundLiaisonDetailForLawsAss(@RequestBody BusMes busMes) { JSONObject object = JsonUtil.jsonStrToJsonObject(busMes.getJson()); JSONArray itemsList = object.getJSONArray("itemsList"); - if (itemsList.size() > 0) { + if (itemsList != null) { //有条款 JSONArray array = new JSONArray(); for (Object item : itemsList) { @@ -2143,9 +2145,14 @@ public class TodoTaskController extends BaseAction { // busProcessNew.setPrcName(""); // } // } - } } + HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery() + .processInstanceId(busProcessName.getPrcId()).orderByHistoricTaskInstanceEndTime().asc(); + List historicTaskInstanceQueryList = historicTaskInstanceQuery.list(); + if(!historicTaskInstanceQueryList.isEmpty()){ + busProcessName.setTaskInfo(historicTaskInstanceQueryList.get(0).getName()); + } if (assignee != null && !assignee.equals("")) { busProcessName.setTaskAssignee(assignee.substring(0, assignee.length() - 1)); } @@ -2268,8 +2275,15 @@ public class TodoTaskController extends BaseAction { // busProcessNew.setPrcName(""); // } // } + } } + HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery() + .processInstanceId(busProcessName.getPrcId()).orderByHistoricTaskInstanceEndTime().asc(); + List historicTaskInstanceQueryList = historicTaskInstanceQuery.list(); + if(!historicTaskInstanceQueryList.isEmpty()){ + busProcessName.setTaskInfo(historicTaskInstanceQueryList.get(0).getName()); + } if (assignee != null && !assignee.equals("")) { busProcessName.setTaskAssignee(assignee.substring(0, assignee.length() - 1)); } @@ -2304,6 +2318,7 @@ public class TodoTaskController extends BaseAction { String enddata = sdf.format(map.get(busProcessName.getPrcId()+"end")); busProcessName.setEndTaskTime(enddata); busProcessName.setStartTaskTime(startdata); + } page.setList(list1); page.setCount(Long.valueOf(list.size())); @@ -2375,6 +2390,12 @@ public class TodoTaskController extends BaseAction { } } } + HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery() + .processInstanceId(busProcessName.getPrcId()).orderByHistoricTaskInstanceEndTime().asc(); + List historicTaskInstanceQueryList = historicTaskInstanceQuery.list(); + if(!historicTaskInstanceQueryList.isEmpty()){ + busProcessName.setTaskInfo(historicTaskInstanceQueryList.get(0).getName()); + } if (assignee != null && !assignee.equals("")) { busProcessName.setTaskAssignee(assignee.substring(0, assignee.length() - 1)); } @@ -2763,12 +2784,19 @@ public class TodoTaskController extends BaseAction { return busProcessNames; } - @ApiOperation(value = "删除OA消息通知 起草专用") + @ApiOperation(value = "删除OA消息通知 制修订起草专用") @GetMapping("/deleteOATask") public String deleteOATask(@RequestParam("pId") String pId) { - //查询出当前数据 webServiceOAServiceImol.deleteOAByPidInfo(pId); return "1"; } + @ApiOperation(value = "删除OA消息通知 通用") + @GetMapping("/deleteOATaskInfo") + public String deleteOATaskInfo(@RequestParam("pId") String pId) { + //查询出当前数据 + webServiceOAServiceImol.deleteOAByPid(pId); + return "1"; + } + } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java index b6595722..514810b4 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java @@ -2,6 +2,7 @@ package com.ydw.bat.wkflow.business_main.datas.controller; import com.tmsps.fk.common.base.action.BaseAction; +import com.ydw.bat.wkflow.business_main.datas.entity.BusMes; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.util.http.ResponseMessage; @@ -87,5 +88,11 @@ public class BusProcessNewController extends BaseAction { public ResponseMessage questionsAndAnswers(@RequestParam("askId") String askId, @RequestParam("answerer") String answerer) { return iBusProcessNewService.questionsAndAnswers(askId,answerer); } + + @ApiOperation(value = "起草 保存（通过id和json进行修改数据）") + @GetMapping("/updateBusProcessNew") + public ResponseMessage updateBusProcessNew(@RequestParam("id") String id, @RequestParam("mags") String mags) { + return iBusProcessNewService.updateBusProcessNew(id,mags); + } } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java index 96d425a9..c3e56ad4 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java @@ -33,4 +33,6 @@ public interface BusProcessNewMapper extends BaseMapper { List everyDayTenOlock(); List everyDayTenOlockSAM(); + + void updateByIdinfo(String id, String mesg); } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java index b6be23c1..6dfc484c 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.business_main.datas.service; +import com.ydw.bat.wkflow.business_main.datas.entity.BusMes; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.baomidou.mybatisplus.extension.service.IService; import com.ydw.bat.wkflow.util.http.ResponseMessage; @@ -47,4 +48,6 @@ public interface IBusProcessNewService extends IService { Map selectWenDan(String taskId); ResponseMessage questionsAndAnswers(String askId, String answerer); + + ResponseMessage updateBusProcessNew(String id, String mags); } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java index affec4e9..bdb5c8f4 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java @@ -3,8 +3,11 @@ package com.ydw.bat.wkflow.business_main.datas.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.service.additional.update.impl.UpdateChainWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusMes; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessNewMapper; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; @@ -182,4 +185,10 @@ public class BusProcessNewServiceImpl extends ServiceImpl updateBusProcessNew(String id, String mags) { + baseMapper.updateByIdinfo(id,mags); + return Result.success(); + } } diff --git a/src/main/resources/mapper/datas/BusProcessNewMapper.xml b/src/main/resources/mapper/datas/BusProcessNewMapper.xml index bd2df8df..587134a5 100644 --- a/src/main/resources/mapper/datas/BusProcessNewMapper.xml +++ b/src/main/resources/mapper/datas/BusProcessNewMapper.xml @@ -61,4 +61,10 @@ CONCAT( date_sub( DATE_FORMAT( NOW(), '%Y-%m-%d' ), INTERVAL 1 DAY), '%')) and TASK_INFO = '标准化活动参会流程-流程结束' + + + update bus_process_new + set `MESG`= #{mesg} + where `ID` = #{id} +