修复编辑施工未产生待办问题

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

@@ -135,6 +135,37 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T
      * @param businessIds
      */
     @Transactional
+    public void deleteTodoByBusinessIds(List<String> businessIds) {
+        try {
+            if (CollectionUtil.isNotEmpty(businessIds)) {
+                if (businessIds.size() < 1000) {
+                    LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.eq(ToDoTasks::getState,"待办")
+                           .in(ToDoTasks::getBusinessId, businessIds);
+                    remove(wrapper);
+                } else {
+                    List<List<String>> lists = ListUtils.splitList(businessIds, 1000);
+                    for (List<String> list : lists) {
+                        LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
+                        wrapper.eq(ToDoTasks::getState,"待办")
+                                .in(ToDoTasks::getBusinessId, list);
+                        remove(wrapper);
+                    }
+                }
+            } else {
+                log.error("业务Id为空，不进行删除");
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+    }
+
+    /**
+     *
+     * 删除和业务关联的所有数据
+     * @param businessIds
+     */
+    @Transactional
     public void deleteByBusinessIds(List<String> businessIds) {
         try {
             if (CollectionUtil.isNotEmpty(businessIds)) {

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

@@ -259,6 +259,16 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		workOrderMapper.updateById(model);
 		LambdaQueryWrapper<WorkOrderPowerStation> up = new LambdaQueryWrapper();
 		up.eq(WorkOrderPowerStation::getWorkOrderId, model.getSequenceNbr());
+		List<WorkOrderPowerStation> workOrderPowerStations = workOrderPowerStationMapper.selectList(up);
+		//如果有值删除工作台信息
+		if (CollectionUtil.isNotEmpty(workOrderPowerStations)){
+			List<String> businessIds=new ArrayList<>();
+			for (WorkOrderPowerStation workOrderPowerStation : workOrderPowerStations) {
+				businessIds.add(String.valueOf(workOrderPowerStation.getSequenceNbr()));
+			}
+			//删除待办
+			toDoTasksService.deleteTodoByBusinessIds(businessIds);
+		}
 		workOrderPowerStationMapper.delete(up);
 		// 保存派工单 电站信息
 		List<PeasantHousehold> peasantHouseholdId = model.getPeasantHouseholdId();
@@ -271,7 +281,21 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			li.add(workOrderPowerStation);
 		}
 		workOrderPowerStationServiceImpl.saveBatch(li);
-
+		List<WorkOrderPowerStation> workOrderPowerStationsNew = workOrderPowerStationMapper.selectList(up);
+		//重新添加待办
+		if(CollectionUtil.isNotEmpty(workOrderPowerStationsNew)){
+			for (WorkOrderPowerStation workOrderPowerStation : workOrderPowerStationsNew) {
+				PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(workOrderPowerStation.getPeasantHouseholdId());
+				RouthPathVO routhPathVO = new RouthPathVO();
+				routhPathVO.setRouthPathId(String.valueOf(workOrderPowerStation.getSequenceNbr()));
+				String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.施工.getCode(), HygfRouthTypeEnum.HYGF_DSG.getCode(), routhPathVO);
+				String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.施工.getCode(), HygfRouthTypeEnum.HYGF_DSG.getCode(), routhPathVO);
+				ToDoTasks toDoTasks=  new ToDoTasks (TaskTypeStationEnum.施工.getCode(),  workOrderPowerStation.getSequenceNbr(),   peasantHousehold.getOwnersName() +"待施工",model.getRegionCode(),routhPath,wxRouthPath);
+				String roleId = toDoTasksService.getRoleIdByName("户用光伏-经销商-施工");
+				List<String> todoUserIds = toDoTasksService.getTodoUserIds(model.getRegionCode(), roleId, String.valueOf(model.getAmosDealerOrgCode()));
+				toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks);
+			}
+		}
 		List<ConstructionRecords> constructionRecordlist = new ArrayList<>();
 		for (WorkOrderPowerStation workOrderPowerStation : li) {
 			// 增加操作日志