FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yuezhihang
2021-09-02 16:19:32 +08:00
parent c576a95267 c94e198e51
commit 270123ba22
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java
+1 -1
View File
@@ -84,7 +84,7 @@ public class TaskController {
historicTaskInstance.put("assigneeId", assignee.getData().getUsid()); historicTaskInstance.put("assigneeId", assignee.getData().getUsid());
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id")); queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id"));
queryWrapper2.orderByAsc("CREATE_TIME"); queryWrapper2.orderByDesc("CREATE_TIME");
List<BusProcessEntrust> list1 = iBusProcessEntrustService.list(queryWrapper2); List<BusProcessEntrust> list1 = iBusProcessEntrustService.list(queryWrapper2);
String str = ""; String str = "";
if(list1.size()>0){ if(list1.size()>0){
src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
+2 -1
View File
@@ -149,6 +149,7 @@ public class TodoTaskController extends BaseAction {
BeanUtils.copyProperties(busProcessName,res); BeanUtils.copyProperties(busProcessName,res);
res.setTaskIds(map.get("id").toString()); res.setTaskIds(map.get("id").toString());
res.setTaskInfo(entry.getValue().get(0).get("name").toString()); res.setTaskInfo(entry.getValue().get(0).get("name").toString());
res.setTaskAssignee(entry.getValue().get(0).get("assignee").toString());
res.setMes(null); res.setMes(null);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String data = sdf.format(entry.getValue().get(0).get("createTime")); String data = sdf.format(entry.getValue().get(0).get("createTime"));
@@ -2084,7 +2085,7 @@ public class TodoTaskController extends BaseAction {
for (Task task : list2) { for (Task task : list2) {
if (task.getAssignee() != null && !task.getAssignee().equals("")) { if (task.getAssignee() != null && !task.getAssignee().equals("")) {
ResponseMessage<UserVO> byId = lawsUserInfoService.getById(task.getAssignee()); ResponseMessage<UserVO> byId = lawsUserInfoService.getById(task.getAssignee());
if (byId.getData() != null) { if (byId.getData() != null && byId.getData().getUname() != null) {
if (assignee.indexOf(byId.getData().getUname()) == -1) { if (assignee.indexOf(byId.getData().getUname()) == -1) {
assignee += ((byId.getData().getOrgName() != null && !byId.getData().getOrgName().equals("")) ? byId.getData().getOrgName() + "-" + byId.getData().getUname() : byId.getData().getUname()) + ","; assignee += ((byId.getData().getOrgName() != null && !byId.getData().getOrgName().equals("")) ? byId.getData().getOrgName() + "-" + byId.getData().getUname() : byId.getData().getUname()) + ",";
} }