增加审核意见

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

@@ -70,6 +70,10 @@ public class BasicGridAcceptanceDto extends BaseDto {
     //并网日期
     private Date gridConnectionTime;
 
+    private String regionalCompaniesName;
+
+    private String serviceAgent;
+
 
     //并网登记id
 

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

@@ -11,6 +11,10 @@ import lombok.Data;
 @Data
 public class PowerStationEngineeringInfoAllDto {
 
+
+    //并网验收审核记录
+    LoggerDto loggerDto;
+
     //自审信息
 
     ConstructionRecords constructionRecords;

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridAcceptanceMapper.xml

@@ -23,6 +23,8 @@
         hbga.instance_id instanceId,
         hbga.next_executor_ids nextExecutorIds,
         hbga.next_node_key nextNodeKey,
+        hph.developer_name as serviceAgent,
+        hph.regional_companies_name AS regionalCompaniesName,
         hph.owners_name AS ownersName,
             hph.peasant_household_no peasantHouseholdNo,
             hph.project_address_name projectAddressName,

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

@@ -15,6 +15,7 @@ import com.yeejoin.amos.boot.module.hygf.api.service.IPowerStationConstructionDa
 import com.yeejoin.amos.boot.module.hygf.api.service.IWorkOrderService;
 import com.yeejoin.amos.boot.module.hygf.api.util.BeanDtoUtils;
 import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
+import com.yeejoin.amos.boot.module.hygf.biz.feign.WorkflowFeignClient;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -88,6 +89,10 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
     @Autowired
     BasicGridAcceptanceMapper  basicGridAcceptanceMapper;
 
+    @Autowired
+    WorkflowFeignClient workflowFeignClient;
+
+
 
     /**
      * 分页查询
@@ -680,6 +685,48 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
         ConstructionRecords data=new ConstructionRecords();
         data.setConstructionRecordsList(li);
         surveyInfoAllDto.setConstructionRecords(data);
+
+
+
+        LambdaQueryWrapper<BasicGridAcceptance> quv=new LambdaQueryWrapper();
+        quv.eq(BasicGridAcceptance::getPeasantHouseholdId,peasantHouseholdId);
+        BasicGridAcceptance basicGridAcceptance=  basicGridAcceptanceMapper.selectOne(quv);
+
+        //审核意见
+        if(!StringUtils.isEmpty(basicGridAcceptance.getInstanceId())){
+            try {
+                Map<String, Object> flowLoggerMap = workflowFeignClient.getFlowLogger(basicGridAcceptance.getInstanceId()).getResult();
+                List<LinkedHashMap> flowLogger = (List<LinkedHashMap>) flowLoggerMap.get("flowLogger");
+                if (flowLogger.size() > 0 ){
+                    Collections.reverse(flowLogger);
+                }
+                List<LinkedHashMap> flowLoggernew =new ArrayList<>();
+                for (LinkedHashMap linkedHashMap : flowLogger) {
+                    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());
+                        flowLoggernew.add(linke);
+                    }
+                }
+                LoggerDto loggerDto =new  LoggerDto();
+                loggerDto.setLogger(flowLoggernew);
+                surveyInfoAllDto.setLoggerDto(loggerDto);
+            } catch (Exception e){
+                e.printStackTrace();
+            }
+        }
+
+
+
+
         return surveyInfoAllDto;
 //        LambdaQueryWrapper<PeasantHousehold> peasantHouseholdWrapper = new LambdaQueryWrapper<>();
 //        peasantHouseholdWrapper.eq(PeasantHousehold::getSequenceNbr, peasantHouseholdId);