es error

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/feign/WorkFlowFeignService.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(name = "AMOS-API-WORKFLOW", path = "workflow", configuration = {XidFeignConfiguration.class})
+@FeignClient(name = "${workflow.feign.name}", path = "workflow", configuration = {XidFeignConfiguration.class})
 public interface WorkFlowFeignService {
 
     /***

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

@@ -157,15 +157,26 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
                 financingAuditingDto.setPeasantHouseholdId(Long.valueOf(e));
                 financingAuditingDto.setPromoter(RequestContext.getExeUserId());
                 financingAuditingService.createWithModel(financingAuditingDto);
-            } else if (financingInfos.getStatus().equals(FinancingAuditEnum.审核不通过.getName()) || financingInfos.getStatus().equals(FinancingAuditEnum.整改待推送.getName()) ){
+            }
+            //批量 兼容审核不通过及整改待推送
+            else if (financingInfos.getStatus().equals(FinancingAuditEnum.审核不通过.getName()) || financingInfos.getStatus().equals(FinancingAuditEnum.整改待推送.getName()) ){
                 financingInfos.setStatus(FinancingAuditEnum.待融资审核.getName());
 
                 Map<String, Object> orgInfo1 = this.getBaseMapper().selectRZOrgInfo(model.getFinancingCompaniesSeq());
+                //业务表中无工作流id 需要补充
+                LambdaQueryWrapper<FinancingAuditing> queryWrapper1 = new LambdaQueryWrapper<>();
+                queryWrapper1.eq(FinancingAuditing::getPeasantHouseholdId, Long.valueOf(e));
+                queryWrapper1.orderByDesc(BaseEntity::getRecDate);
+                queryWrapper1.last("limit 1");
+                FinancingAuditing financingInfos1 = financingAuditingService.getBaseMapper().selectOne(queryWrapper1);
+
+
                 financingInfos.setFinancingCompaniesCode(orgInfo1.getOrDefault("ORG_CODE", "").toString());
                 financingInfos.setFinancingCompaniesName(orgInfo1.getOrDefault("COMPANY_NAME", "").toString());
                 this.updateById(financingInfos);
                 Map<String, Object> map = BeanUtil.beanToMap(financingInfos);
                 map.put("isFlag","0");
+                map.put("instanceId",financingInfos1.getInstanceId());
                 this.execueFlow(map);
             }
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties

@@ -234,9 +234,14 @@ seata.service.grouplist.hygf-seata=47.92.234.253:8091
 # Seata 配置
 seata.enabled=true
 seata.enable-auto-data-source-proxy=false
-#seata.client.undo.log-serialization=kryo
 
 seata.datasource.autoproxy.datasource-proxy-mode=original
 seata.datasource.autoproxy.enabled=true
 seata.datasource.autoproxy.data-source-names=mysql
 
+## 47环境 排除es报错引进无用配置 业务未实际使用es
+spring.elasticsearch.rest.uris=http://47.92.234.253:9200
+spring.elasticsearch.rest.connection-timeout=30000
+spring.elasticsearch.rest.username=elastic
+spring.elasticsearch.rest.password=123456
+spring.elasticsearch.rest.read-timeout=30000
\ No newline at end of file