Merge branch 'developer_bw' of…

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/RectificationRoleEnum.java

@@ -8,7 +8,7 @@ import lombok.Getter;
 public enum RectificationRoleEnum {
 
 	片区运营角色("area,bw-area,ys-area"), 设计角色("design,bw-design"), 工程角色("engineering,bw-engineering"), 投融角色("ys-tourong"),
-	法务角色("ys-fawu");
+	法务角色("ys-fawu"),资产角色("ys-zichan");
 
 	/**
 	 * 名称，描述

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerStationEngineeringInfoAllDto.java

@@ -14,6 +14,8 @@ public class PowerStationEngineeringInfoAllDto {
 
     //并网验收审核记录
     LoggerDto loggerDto;
+    //验收审核记录
+    LoggerDto loggerYsDto;
 
     //自审信息
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java

@@ -105,6 +105,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 	ConstructionRecordsMapper constructionRecordsMapper;
 	@Autowired
 	BasicGridRecordMapper basicGridRecordMapper;
+	@Autowired
+	AcceptanceCheckMapper acceptanceCheckMapper;
     @Autowired
 	BasicGridRecordServiceImpl basicGridRecordService;
 	@Autowired
@@ -913,6 +915,44 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			}
 		}
 
+		LambdaQueryWrapper<AcceptanceCheck> quv1 = new LambdaQueryWrapper();
+		quv1.eq(AcceptanceCheck::getPeasantHouseholdId, peasantHouseholdId);
+		AcceptanceCheck acceptanceCheck = acceptanceCheckMapper.selectOne(quv1);
+
+		// 审核意见
+		if (Objects.nonNull(acceptanceCheck) && !StringUtils.isEmpty(acceptanceCheck.getInstanceId())) {
+			try {
+				Map<String, Object> flowLogMap = workflowFeignClient
+						.getFlowLogger(acceptanceCheck.getInstanceId()).getResult();
+				List<LinkedHashMap> flowLogger1 = (List<LinkedHashMap>) flowLogMap.get("flowLogger");
+				if (flowLogger1.size() > 0) {
+					Collections.reverse(flowLogger1);
+				}
+				List<LinkedHashMap> flowLoggernew1 = new ArrayList<>();
+				for (LinkedHashMap linkedHashMap : flowLogger1) {
+					if (linkedHashMap.get("operateDate") != null
+							&& !linkedHashMap.get("operateDate").toString().isEmpty()) {
+						LinkedHashMap linke = new LinkedHashMap();
+						linke.put("approvalStatue", linkedHashMap.get("approvalStatue").toString());
+						// 审核意见
+						List<LinkedHashMap> approvalSuggestion = (List<LinkedHashMap>) linkedHashMap
+								.get("approvalSuggestion");
+						if (approvalSuggestion != null && !approvalSuggestion.isEmpty()) {
+							linke.put("approvalSuggestion", approvalSuggestion.get(0).get("message"));
+						}
+						linke.put("taskName", linkedHashMap.get("taskName").toString());
+						linke.put("operator", linkedHashMap.get("operator").toString());
+						linke.put("operateDate", linkedHashMap.get("operateDate").toString());
+						flowLoggernew1.add(linke);
+					}
+				}
+				LoggerDto loggerDto1 = new LoggerDto();
+				loggerDto1.setLogger(flowLoggernew1);
+				surveyInfoAllDto.setLoggerYsDto(loggerDto1);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
 		return surveyInfoAllDto;
 //        LambdaQueryWrapper<PeasantHousehold> peasantHouseholdWrapper = new LambdaQueryWrapper<>();
 //        peasantHouseholdWrapper.eq(PeasantHousehold::getSequenceNbr, peasantHouseholdId);