修改查詢歷史的方法

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/workflow/feign/WorkflowFeignService.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import com.alibaba.fastjson.JSONObject;
 
-@FeignClient(name = "AMOS-API-WORKFLOW", path = "workflow", configuration = { CommonMultipartSupportConfig.class })
+@FeignClient(name = "AMOS-API-WORKFLOW-CJHENHAO", path = "workflow", configuration = { CommonMultipartSupportConfig.class })
 public interface WorkflowFeignService {
 	/**
 	 * 发起流程
@@ -74,7 +74,7 @@ public interface WorkflowFeignService {
 	 * @param processInstanceId
 	 * @return
 	 */
-	@RequestMapping(value = "/activitiHistory/tasks/{processInstanceId}", method = RequestMethod.GET)
-	JSONObject queryTasksByProcessInstanceId(@PathVariable("processInstanceId") String processInstanceId);
+	@RequestMapping(value = "/activitiHistory/historyTask/{processInstanceId}", method = RequestMethod.GET)
+	JSONObject queryHistoryTasksByProcessInstanceId(@PathVariable("processInstanceId") String processInstanceId);
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java

@@ -8,7 +8,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
-import com.yeejoin.amos.boot.module.common.api.dto.FailureStatusCountDto;
 import org.apache.commons.lang3.ObjectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,6 +28,7 @@ import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureAuditDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureRepairlogDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureStatusCountDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
 import com.yeejoin.amos.boot.module.common.api.entity.FailureRepairlog;
 import com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum;
@@ -420,7 +420,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		JSONObject object=	workflowFeignService.queryHistoryTaskListByProcessId(processId);
 		JSONArray  datArray=null;
 		if(ObjectUtils.isNotEmpty(object)) {
-			 datArray=object.getJSONArray("data");
+			 datArray=object.getJSONArray("rows");
 		}
 		List<Object> list = new ArrayList<Object>();
 		if(datArray!=null) {
@@ -470,8 +470,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			}
 		 }
 		 FailureDetails details = this.baseMapper.selectById(sequenceNbr);
-		JSONObject object= workflowFeignService.queryTasksByProcessInstanceId(details.getProcessId());
-		JSONArray array=	object.getJSONArray("data");
+		JSONObject object= workflowFeignService.queryHistoryTasksByProcessInstanceId(details.getProcessId());
+		JSONArray array=	object.getJSONArray("rows");
 		for (Object historyDetail : array) {
 			JSONObject historyDetailJson=	JSONObject.parseObject(JSONObject.toJSONString(historyDetail));
 			if("rejected".equals(historyDetailJson.getString("activityId"))) {