Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/entity/dto/DeclaredProjectDto.java

@@ -1,6 +1,7 @@
 package com.ningdatech.pmapi.projectdeclared.entity.dto;
 
 import com.ningdatech.pmapi.projectlib.model.entity.Project;
+import com.wflow.workflow.bean.dto.ProcessInstanceUserDto;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -30,4 +31,7 @@ public class DeclaredProjectDto implements Serializable {
 
     @NotBlank
     private String regionCode;
+
+    @NotNull
+    private ProcessInstanceUserDto user;
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java

@@ -140,12 +140,12 @@ public class DeclaredProjectManage {
         }
 
         ProcessStartParamsVo params = new ProcessStartParamsVo();
-        ProcessInstanceUserDto user = new ProcessInstanceUserDto();
-        user.setOrgCode("6179678");
-        user.setOrgName("数转办");
-        user.setUserId("381496");
-        user.setUserName("旅人");
-        params.setUser(user);
+//        ProcessInstanceUserDto user = new ProcessInstanceUserDto();
+//        user.setOrgCode("6179678");
+//        user.setOrgName("数转办");
+//        user.setUserId("381496");
+//        user.setUserName("旅人");
+        params.setUser(dto.getUser());
         params.setProcessUsers(Collections.emptyMap());
         dto.getFormData().putAll(
                 JSON.parseObject(JSON.toJSONString(dto.getProjectInfo()), new TypeReference<Map<String, Object>>() {

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

@@ -49,6 +49,7 @@ import com.wflow.exception.BusinessException;
 import com.wflow.mapper.WflowCcTasksMapper;
 import com.wflow.mapper.WflowModelHistorysMapper;
 import com.wflow.service.OrgRepositoryService;
+import com.wflow.utils.CodeUtil;
 import com.wflow.workflow.bean.dto.ProcessInstanceUserDto;
 import com.wflow.workflow.bean.process.OrgUser;
 import com.wflow.workflow.bean.process.ProcessNode;
@@ -743,7 +744,8 @@ public class TodoCenterManage {
                 .result(ProcessHandlerEnum.PASS)
                 .build());
         // 提取全量表单数据
-        Map<String, Object> formData = formDatas.stream().collect(Collectors.toMap(HistoricVariableInstance::getVariableName, HistoricVariableInstance::getValue));
+        Map<String, Object> formData = formDatas.stream().filter(CodeUtil.distinctByKey(HistoricVariableInstance::getVariableName)).collect(Collectors.toMap(HistoricVariableInstance::getVariableName,
+                HistoricVariableInstance::getValue));
         HistoricVariableInstance variableInstance = historyService.createHistoricVariableInstanceQuery()
                 .processInstanceId(instanceId).variableName("owner").singleResult();
         ProcessInstanceUserDto owner = (ProcessInstanceUserDto) variableInstance.getValue();

pmapi/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 28888
+  port: 38888
   servlet:
     context-path: /pm