DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[修改] 修改 转办 与审批历史

Browse Source
This commit is contained in:
bupengxiang
2023-05-16 11:46:20 +08:00
parent 24da664d0a
commit fcdcea3afc
18 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java
+6 -3
View File
@@ -87,7 +87,7 @@ public class TaskController {
BusProcessNew processNew = iBusProcessNewService.getOne(processNewQueryWrapper);
if(processNew!=null){
UserEO assignee = userEoService.getUserByIdNodel(processNew.getUserId());
UserVO assignee = userEoService.getUserByIdNodel(processNew.getUserId());
if(assignee != null){
historicTaskInstance.put("assignee", assignee.getUsname());
historicTaskInstance.put("assigneeId", assignee.getUsid());
@@ -101,7 +101,7 @@ public class TaskController {
historicTaskInstance.put("assignee", assignee.getUsname());
historicTaskInstance.put("assigneeId", assignee.getUsid());
if(assignee.getOrgEOList().size()>0){
historicTaskInstance.put("orgName",assignee.getOrgEOList().get(0));
historicTaskInstance.put("orgName",assignee.getOrgEOList().get(0).getOrgName());
}
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id"));
@@ -115,8 +115,11 @@ public class TaskController {
HashMap<String, Object> map = new HashMap<>();
UserEO assigneenActual = userEoService.getUserById(busProcessEntrust.getUserId());
String consigner = assigneenActual.getUsname();
UserEO userById = userEoService.getUserById(busProcessEntrust.getEnUserId());
UserVO userById = userEoService.getUserByIdNodel(busProcessEntrust.getEnUserId());
String enUserName = userById.getUsname();
if(userById.getOrgEOList().size()>0){
map.put("orgName",userById.getOrgEOList().get(0).getOrgName());
}
map.put("assignee", enUserName+"(" + consigner + " 委托)");
map.put("assigneeId", busProcessEntrust.getEnUserId());
map.put("prcType",one.getPrcType());
report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java
+8 -4
View File
@@ -283,10 +283,14 @@ public class TodoTaskController {
@ApiImplicitParams({@ApiImplicitParam(name = "taskId", value = "任务id"),
@ApiImplicitParam(name = "assignee", value = "被改派人员"), @ApiImplicitParam(name = "userId", value = "改派人员"),
@ApiImplicitParam(name = "pId", value = "流程实例ID")})
@GetMapping("/changeAssigneeNew")
public Wrapper<String> changeAssigneeNew(String taskId, String assignee, String userId, String pId,
@RequestParam(required = false,value = "replaceMap")String replaceMap,
String approvalOpinion) {
@PostMapping("/changeAssigneeNew")
public Wrapper<String> changeAssigneeNew(@RequestBody BusProcessEntrust busProcessEntrustEO) {
String assignee = busProcessEntrustEO.getAssignee();
String taskId = busProcessEntrustEO.getTaskId();
String pId = busProcessEntrustEO.getPrcId();
String userId = busProcessEntrustEO.getUserId();
String approvalOpinion = busProcessEntrustEO.getApprovalOpinion();
String replaceMap = busProcessEntrustEO.getReplaceMap();
List<String> list = Arrays.asList(taskId.split(","));
for (String str : list) {
report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessEntrust.java
+6
View File
@@ -67,4 +67,10 @@ public class BusProcessEntrust implements Serializable {
@TableField("APPROVAL_OPINION")
private String approvalOpinion;
@TableField(exist = false)
private String replaceMap;
@TableField(exist = false)
private String assignee;
}