验收完成生成待办及修改农户状态

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

@@ -461,7 +461,15 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
             default:
                 da.setOperationContent("验收审核-资产审核-" + (approvalStatus.equals("0")?"通过":"驳回"));
                 up.set(AcceptanceCheck::getPowerStationAssetsStatus,approvalStatus.equals("0")?"通过":"驳回");
+                // 线上验收
+
                 if (approvalStatus.equals("0")){
+                    LambdaUpdateWrapper<PeasantHousehold> up1 = new LambdaUpdateWrapper<>();
+                    up1.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.验收完成.getCode());
+                    long idsk = basicGridRecord.getPeasantHouseholdId();
+                    up1.eq(PeasantHousehold::getSequenceNbr, idsk);
+                    peasantHouseholdMapper.update(null, up1);
+
                     up.set(AcceptanceCheck::getBasicGridNode,"all");
                     up.set(AcceptanceCheck::getAcceptanceTime,new Date());
                     up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.YWC.getCode());
@@ -481,26 +489,20 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
                         financingInfoService.execueFlow(MapBuilder.<String,Object>create().put("instanceId",financingAuditing.getInstanceId()).put("approvalStatus","0").put("isZG","1").build());
 
                     }
+                    //生成新增投融资待办
+                    PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridRecord.getPeasantHouseholdId());
+                    RouthPathVO routhPathVO = new RouthPathVO();
+                    routhPathVO.setRouthPathId(String.valueOf(basicGridRecord.getPeasantHouseholdId()));
+                    String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.投融资.getCode(), HygfRouthTypeEnum.HYGF_XZTSRZ.getCode(), routhPathVO);
+                    String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.投融资.getCode(), HygfRouthTypeEnum.HYGF_XZTSRZ.getCode(), routhPathVO);
+                    ToDoTasks toDoTasks1=  new ToDoTasks (TaskTypeStationEnum.投融资.getCode(),  basicGridRecord.getPeasantHouseholdId(),   peasantHousehold.getOwnersName()+"待新增推送融资",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
+                    String roleId = toDoTasksService.getRoleIdByName("户用光伏-投融");
+                    List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId);
+                    toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
                 }
                 this.wofkflowExcute(instanceId, approvalStatus , comment  ,BusinessWorkflowKey.资产审核.getCode() );
 
 
-                // 线上验收
-                LambdaUpdateWrapper<PeasantHousehold> up1 = new LambdaUpdateWrapper<>();
-                up1.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.验收完成.getCode());
-                long idsk = basicGridRecord.getPeasantHouseholdId();
-                up1.eq(PeasantHousehold::getSequenceNbr, idsk);
-                peasantHouseholdMapper.update(null, up1);
-                //生成新增投融资待办
-                PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridRecord.getPeasantHouseholdId());
-                RouthPathVO routhPathVO = new RouthPathVO();
-                routhPathVO.setRouthPathId(String.valueOf(basicGridRecord.getPeasantHouseholdId()));
-                String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.投融资.getCode(), HygfRouthTypeEnum.HYGF_XZTSRZ.getCode(), routhPathVO);
-                String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.投融资.getCode(), HygfRouthTypeEnum.HYGF_XZTSRZ.getCode(), routhPathVO);
-                ToDoTasks toDoTasks1=  new ToDoTasks (TaskTypeStationEnum.投融资.getCode(),  basicGridRecord.getPeasantHouseholdId(),   peasantHousehold.getOwnersName()+"待新增推送融资",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
-                String roleId = toDoTasksService.getRoleIdByName("户用光伏-投融");
-                List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId);
-                toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
         }
         if (approvalStatus.equals("1") ){
             up.eq(BaseEntity::getSequenceNbr,sequenceNbr);