From 396ea76562afe6b2ae08141797e7952286abf42d Mon Sep 17 00:00:00 2001
From: litao <a15234804788@163.com>
Date: Thu, 28 Nov 2024 19:29:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E5=8D=95=E5=8F=B7=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MaintenancePlanServiceImpl.java    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java
index 5198ceb..2d728a1 100644
--- a/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java
+++ b/src/main/java/org/springblade/modules/business/service/impl/MaintenancePlanServiceImpl.java
@@ -18,6 +18,7 @@ import org.springblade.modules.business.service.*;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.util.ArrayList;
@@ -179,6 +180,9 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl<MaintenancePlanM
         // 按计划分组
         Map<Long, List<MaintenancePlanDetail>> listMap = planDetails.stream().collect(Collectors.groupingBy(MaintenancePlanDetail::getPlanId));
 
+        SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
+        String todayStr = format.format(new Date());
+        int count = 1;
         for (Map.Entry<Long, List<MaintenancePlanDetail>> longListEntry : listMap.entrySet()) {
             Long planId = longListEntry.getKey();
             List<MaintenancePlanDetail> details = longListEntry.getValue();
@@ -207,10 +211,13 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl<MaintenancePlanM
                 }
                 if (!newDetails.isEmpty()) {
                     try {
+                        // 巡查单号
+                        String code = "XC-" + todayStr + "-" + (count < 9 ? "0" + count : count + "");
                         // 保存巡查任务
-                        saveTask(plans, planId, newDetails);
+                        saveTask(plans, planId, newDetails, code);
                         // 修改计划详情
                         planDetailService.updateBatchById(newDetails);
+                        count++;
                     } catch (Exception e) {
                         log.error(e.toString());
                     }
@@ -220,7 +227,7 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl<MaintenancePlanM
         return true;
     }
 
-    private void saveTask(List<MaintenancePlan> plans, Long planId, List<MaintenancePlanDetail> newDetails) {
+    private void saveTask(List<MaintenancePlan> plans, Long planId, List<MaintenancePlanDetail> newDetails, String code) {
         // 获取计划详情
         List<MaintenancePlan> planList = plans.stream().filter(plan -> plan.getId().equals(planId)).toList();
         MaintenancePlan maintenancePlan = planList.get(0);
@@ -229,7 +236,7 @@ public class MaintenancePlanServiceImpl extends BaseServiceImpl<MaintenancePlanM
             // 巡检任务赋值保存
             MaintenanceTask maintenanceTask = new MaintenanceTask();
             maintenanceTask.setPlanId(maintenancePlan.getId());
-            maintenanceTask.setTaskCode(maintenancePlan.getPlanCode());
+            maintenanceTask.setTaskCode(code);
             maintenanceTask.setDeptId(maintenancePlan.getDeptId());
             maintenanceTask.setTaskName(maintenancePlan.getPlanName());
             maintenanceTask.setAddress(maintenancePlan.getAddress());