Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

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

@@ -21,12 +21,13 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 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;
@@ -285,6 +286,17 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			repairlog(faultId, processAuditor, processTime, processDepartment, processResult);
 
 
+/*			FailureAuditDto failureAuditDto = new FailureAuditDto();
+			failureAuditDto.setAuditor(model.getRecUserName());
+			failureAuditDto.setFaultId(model.getSequenceNbr());
+			failureAuditDto.setAuditOpinion("已发起");
+			failureAuditDto.setAuditTime(new Date());
+			failureAuditDto.setIsDelete(true);
+			failureAuditDto.setAuditResult(5);
+
+			if (ObjectUtils.isNotEmpty(failureAuditDto)) {
+				failureAuditServiceImpl.savemodel(failureAuditDto, userInfo);
+			}*/
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.info("添加故障维修信息到数据库失败");
@@ -468,7 +480,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) {
@@ -518,8 +530,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"))) {