修改审核流编码问题

jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.java

@@ -284,7 +284,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
 
     @Override
     public Boolean suspendOrActivateProcessDefinitionById(SuspendOrActivateDefinitionReq req) {
-        ProcessTemplates processTemplates = processTemplateService.getById(req.getTemplateId());
+        ProcessTemplates processTemplates = processTemplateService.getById(req.getFormId());
         if (req.getIsStop() == true){
             repositoryService.suspendProcessDefinitionById(req.getProcessDefinitionId(), true, null);
             processTemplates.setIsStop(true);
@@ -848,7 +848,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
             BpmnModel bpmnModel = repositoryService.getBpmnModel(historicProcessInstance.getProcessDefinitionId());
 
             String Name= bpmnModel.getMainProcess().getName();
-            historyProcessInstanceVO.setOrderID(MapUtil.getStr(processVariables, ORDER_ID));
+            historyProcessInstanceVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID));
             historyProcessInstanceVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
             historyProcessInstanceVO.setProcessDefinitionName(historicProcessInstance.getProcessDefinitionName());
             historyProcessInstanceVO.setStartUser(JSONObject.parseObject(MapUtil.getStr(processVariables, START_USER_INFO), new TypeReference<UserInfo>() {

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java

@@ -43,6 +43,7 @@ import org.flowable.task.api.history.HistoricTaskInstance;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -362,7 +363,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             BpmnModel bpmnModel = repositoryService.getBpmnModel(historicProcessInstance.getProcessDefinitionId());
 
             String Name= bpmnModel.getMainProcess().getName();
-            historyProcessInstanceVO.setOrderID(MapUtil.getStr(processVariables, ORDER_ID));
+            historyProcessInstanceVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID));
             historyProcessInstanceVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
             historyProcessInstanceVO.setProcessDefinitionName(historicProcessInstance.getProcessDefinitionName());
             historyProcessInstanceVO.setStartUser(JSONObject.parseObject(MapUtil.getStr(processVariables, START_USER_INFO), new TypeReference<UserInfo>() {
@@ -398,7 +399,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     public ApiRes<List<TaskDetailVO>> record(String processInstanceId) {
         List<Comment> processInstanceComments = taskService.getProcessInstanceComments(processInstanceId);
         Map<String, List<Comment>> commentsMap = processInstanceComments.stream()
-                .collect(Collectors.groupingBy(Comment::getTaskId));
+                .collect(Collectors.groupingBy(Comment::getTaskId, Collectors.toList()));
         List<Attachment> processInstanceAttachments = taskService.getProcessInstanceAttachments(processInstanceId);
         Map<String, List<Attachment>> attachmentMap = processInstanceAttachments.stream()
                 .collect(Collectors.groupingBy(Attachment::getTaskId));
@@ -478,7 +479,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                                     taskDetailVO.setSignImage(comment1.getFullMessage());
                                 }
                             }
-                            taskDetailVO.setComment(comments.get(0).getFullMessage());
+                            taskDetailVO.setComment(new String(comments.get(0).getFullMessage().getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8));
                             taskDetailVO.setAttachmentVOList(attachmentVOList);
                             taskDetailVOS.add(taskDetailVO);
                         }

jyzb-process/src/main/java/com/junmp/junmpProcess/vo/HistoryProcessInstanceVO.java

@@ -21,7 +21,7 @@ public class HistoryProcessInstanceVO {
     @ApiModelProperty("发起人")
     private UserInfo startUser;
     @ApiModelProperty("单据ID")
-    private String orderID;
+    private String orderId;
     @ApiModelProperty("单据类型")
     private String orderType;
     @ApiModelProperty("提交时间")