待我处理 列表详情 优化完成

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/dto/DefaultDeclaredDTO.java

@@ -28,7 +28,7 @@ public class DefaultDeclaredDTO implements Serializable {
     @ApiModelProperty("项目信息")
     private ProjectDTO projectInfo;
 
-    @ApiModelProperty("表单信息 保留")
+    @ApiModelProperty("表单信息 新增模块")
     private Map<String,Object> formData;
 
     public Map<String,Object> getFormData(){

pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysFormController.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/FormController.java

@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/api/v1/sys/form")
 @Api(value = "SysForm", tags = "系统管理-表单配置")
 @RequiredArgsConstructor
-public class SysFormController {
+public class FormController {
 
     private final WflowFormsService formService;
 

pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/SysProcdefController.java → pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/ProcdefController.java

@@ -2,10 +2,8 @@ package com.ningdatech.pmapi.sys.controller;
 
 import com.ningdatech.basic.model.PageVo;
 import com.wflow.bean.dto.WflowModelHistorysDto;
-import com.wflow.bean.entity.WflowModelHistorys;
 import com.wflow.bean.vo.WflowModelVo;
 import com.wflow.service.ModelGroupService;
-import com.wflow.utils.R;
 import com.wflow.workflow.service.ProcessModelService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/api/v1/sys/procdef")
 @Api(value = "SysProcdef", tags = "系统管理-流程配置")
 @RequiredArgsConstructor
-public class SysProcdefController {
+public class ProcdefController {
 
     private final ModelGroupService modelGroupService;
 

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java

@@ -60,6 +60,7 @@ import org.flowable.engine.history.HistoricActivityInstance;
 import org.flowable.engine.history.HistoricProcessInstance;
 import org.flowable.engine.runtime.ActivityInstance;
 import org.flowable.engine.runtime.Execution;
+import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.engine.task.Comment;
 import org.flowable.task.api.Task;
 import org.flowable.task.api.history.HistoricTaskInstance;
@@ -806,17 +807,16 @@ public class TodoCenterManage {
         List<ProgressNode> progressInfo = progressInstanceDetail.getProgressInfo();
 
         Set<String> userSet = progressInfo.stream().map(ProgressNode::getUserId).collect(Collectors.toSet());
-        Map<String, ProcessInstanceUserDto> userMapByIds = userInfoService.getUserMapByIds(userSet);
+        Map<String, ProcessInstanceUserDto> userMap = userInfoService.getUserMapByIds(userSet);
 
         // 装配节点审核人员信息
         for (ProgressNode progressNode : progressInfo) {
-            progressNode.setUser(userMapByIds.get(progressNode.getUserId()));
+            progressNode.setUser(userMap.get(progressNode.getUserId()));
         }
-        progressInstanceDetail.setProgressInfo(progressInfo);
+
         ProcessProgressDetailVo res = new ProcessProgressDetailVo();
         res.setProcessProgressVo(progressInstanceDetail);
-        Project project = projectService.getById(projectId);
-        res.setStatus(ProcessStatusEnum.getDescByCode(project.getProcessStatus()));
+        res.setStatus(progressInstanceDetail.getStatus());
         return res;
     }
 

pmapi/src/main/java/com/ningdatech/pmapi/user/service/impl/UserInfoServiceImpl.java

@@ -47,11 +47,11 @@ public class UserInfoServiceImpl extends ServiceImpl<NdUserInfoMapper, UserInfo>
             if (Objects.isNull(accountId)){
                 throw new BizException("该用户没有录入浙政钉用户信息!");
             }
-            // 根据浙政钉用户ID获取部门code
+            // 根据浙政钉用户ID获取单位code
             DingEmployeeInfo employeeInfo = dingEmployeeInfoService.getOne(Wrappers.lambdaQuery(DingEmployeeInfo.class)
-                    .eq(DingEmployeeInfo::getId, accountId));
+                    .eq(DingEmployeeInfo::getAccountId, accountId));
             String organizationCode = employeeInfo.getOrganizationCode();
-            // 根据部门code获取部门名称
+            // 根据 单位code获取单位名称
             DingOrganization dingOrganization = dingOrganizationService.getOne(Wrappers.lambdaQuery(DingOrganization.class)
                     .eq(DingOrganization::getOrganizationCode, organizationCode));
             String organizationName = dingOrganization.getOrganizationName();