批量推送支持 整改待推送及审核不通过 排除审核记录多次生成问题

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -121,7 +122,6 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         } else {
             ids = Arrays.asList(new String[]{model.getPeasantHouseholdIds()});
         }
-
         Map<String, Object> orgInfo = this.getBaseMapper().selectRZOrgInfo(model.getFinancingCompaniesSeq());
         model.setFinancingCompaniesCode(orgInfo.getOrDefault("ORG_CODE", "").toString());
         model.setFinancingCompaniesName(orgInfo.getOrDefault("COMPANY_NAME", "").toString());
@@ -136,11 +136,6 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
                 BeanUtils.copyProperties(model, financingInfoDto);
                 financingInfoDto.setSequenceNbr(null);
                 this.createWithModel(financingInfoDto);
-            } else {
-                financingInfos.setStatus(FinancingAuditEnum.待融资审核.getName());
-                this.updateById(financingInfos);
-            }
-
                 //开启工作流 并执行一步
                 ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
                 List<ActWorkflowStartDTO> list = new ArrayList<>();
@@ -163,6 +158,14 @@ 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()) ){
+                financingInfos.setStatus(FinancingAuditEnum.待融资审核.getName());
+                this.updateById(financingInfos);
+                Map<String, Object> map = BeanUtil.beanToMap(model);
+                map.put("isFlag","0");
+                this.execueFlow(map);
+            }
+
             //发起待办
 //            commonService.buildTaskModel(buildDZTRZTaskModel(model, workflowResultDto, date));
         });