From f76bf27bf93e523ae4572d9e10e9ca541c324185 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期二, 03 十一月 2026 17:18:55 +0800
Subject: [PATCH] 部分改动

---
 src/main/java/com/ruoyi/common/handler/LongListJacksonTypeHandler.java               |   34 +
 src/main/java/com/ruoyi/projectManagement/service/ProjectWorkflowService.java        |  833 +++++++++++++++++++++++++++++++++++++
 src/main/java/com/ruoyi/projectManagement/controller/ProjectWorkflowController.java  |  144 ++++++
 src/main/java/com/ruoyi/projectManagement/service/impl/handle/InfoHandleService.java |   13 
 src/main/java/com/ruoyi/projectManagement/dto/SaveInfoDto.java                       |   13 
 src/main/java/com/ruoyi/sales/service/BusinessApprovalService.java                   |   33 -
 src/main/resources/mapper/projectManagement/InfoMapper.xml                           |   34 +
 src/main/java/com/ruoyi/projectManagement/service/impl/InfoServiceImpl.java          |    1 
 src/main/java/com/ruoyi/projectManagement/pojo/Info.java                             |   38 +
 src/main/java/com/ruoyi/ai/config/EmbeddingStoreConfig.java                          |   11 
 src/main/resources/application-zxsq.yml                                              |    2 
 src/main/java/com/ruoyi/projectManagement/dto/ProjectWorkflowDtos.java               |  109 ++++
 12 files changed, 1,227 insertions(+), 38 deletions(-)

diff --git a/src/main/java/com/ruoyi/ai/config/EmbeddingStoreConfig.java b/src/main/java/com/ruoyi/ai/config/EmbeddingStoreConfig.java
index eaa487c..18c0b53 100644
--- a/src/main/java/com/ruoyi/ai/config/EmbeddingStoreConfig.java
+++ b/src/main/java/com/ruoyi/ai/config/EmbeddingStoreConfig.java
@@ -3,6 +3,7 @@
 import dev.langchain4j.data.segment.TextSegment;
 import dev.langchain4j.model.embedding.EmbeddingModel;
 import dev.langchain4j.store.embedding.EmbeddingStore;
+import dev.langchain4j.store.embedding.inmemory.InMemoryEmbeddingStore;
 import dev.langchain4j.store.embedding.pinecone.PineconeEmbeddingStore;
 import dev.langchain4j.store.embedding.pinecone.PineconeServerlessIndexConfig;
 import io.pinecone.clients.Index;
@@ -26,6 +27,9 @@
     @Value("${pinecone.namespace:knowledge-base}")
     private String namespace;
 
+    @Value("${pinecone.enabled:false}")
+    private boolean pineconeEnabled;
+
     @Bean
     public Pinecone pinecone() {
         return new Pinecone.Builder(pineconeApiKey).build();
@@ -38,6 +42,11 @@
 
     @Bean
     public EmbeddingStore<TextSegment> embeddingStore(EmbeddingModel embeddingModel) {
+        // 椤圭洰绠$悊绛夋牳蹇冧笟鍔′笉搴斿洜澶栭儴鍚戦噺搴撲笉鍙敤鑰屾棤娉曞惎鍔ㄣ��
+        // 鐢熶骇鐜鏄庣‘閰嶇疆 pinecone.enabled=true 鏃朵粛浣跨敤鍘� Pinecone 瀛樺偍銆�
+        if (!pineconeEnabled) {
+            return new InMemoryEmbeddingStore<>();
+        }
         return PineconeEmbeddingStore.builder()
                 .apiKey(pineconeApiKey)
                 .index(indexName)
@@ -49,4 +58,4 @@
                         .build())
                 .build();
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/common/handler/LongListJacksonTypeHandler.java b/src/main/java/com/ruoyi/common/handler/LongListJacksonTypeHandler.java
new file mode 100644
index 0000000..e555535
--- /dev/null
+++ b/src/main/java/com/ruoyi/common/handler/LongListJacksonTypeHandler.java
@@ -0,0 +1,34 @@
+package com.ruoyi.common.handler;
+
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+
+import java.lang.reflect.Field;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Ensures numeric JSON arrays are materialized as Long values.
+ * Jackson otherwise reads small JSON numbers as Integer when MyBatis only
+ * supplies the raw List class, which later breaks typed response serialization.
+ */
+public class LongListJacksonTypeHandler extends JacksonTypeHandler {
+
+    public LongListJacksonTypeHandler(Class<?> type) {
+        super(type);
+    }
+
+    public LongListJacksonTypeHandler(Class<?> type, Field field) {
+        super(type, field);
+    }
+
+    @Override
+    public Object parse(String json) {
+        Object value = super.parse(json);
+        if (!(value instanceof List<?> values)) {
+            return Collections.emptyList();
+        }
+        return values.stream()
+                .map(item -> item == null ? null : ((Number) item).longValue())
+                .toList();
+    }
+}
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/ProjectWorkflowController.java b/src/main/java/com/ruoyi/projectManagement/controller/ProjectWorkflowController.java
new file mode 100644
index 0000000..3e1d9a9
--- /dev/null
+++ b/src/main/java/com/ruoyi/projectManagement/controller/ProjectWorkflowController.java
@@ -0,0 +1,144 @@
+package com.ruoyi.projectManagement.controller;
+
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.projectManagement.dto.ProjectWorkflowDtos;
+import com.ruoyi.projectManagement.service.ProjectWorkflowService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/projectManagement/workflow")
+@Tag(name = "椤圭洰鎵ц宸ヤ綔鍙�")
+@RequiredArgsConstructor
+public class ProjectWorkflowController {
+    private final ProjectWorkflowService service;
+
+    @GetMapping("/{projectId}")
+    @Operation(summary = "椤圭洰妯″潡銆佽窡杩涖�佹眹鎶ャ�佺粺璁″拰璧勬枡")
+    public AjaxResult workbench(@PathVariable Long projectId) {
+        return AjaxResult.success(service.getWorkbench(projectId));
+    }
+
+    @PreAuthorize("@ss.hasPermi('project:module:edit')")
+    @PostMapping("/start/{projectId}")
+    public AjaxResult startProject(@PathVariable Long projectId) {
+        service.startProject(projectId);
+        return AjaxResult.success();
+    }
+
+    @PostMapping("/project-executors")
+    public AjaxResult updateProjectExecutors(@RequestBody ProjectWorkflowDtos.ProjectExecutorsRequest request) {
+        service.updateProjectExecutors(request);
+        return AjaxResult.success();
+    }
+
+    @PostMapping("/transition")
+    public AjaxResult transition(@RequestBody ProjectWorkflowDtos.StageTransitionRequest request) {
+        service.transitionStage(request);
+        return AjaxResult.success();
+    }
+
+    @PreAuthorize("@ss.hasPermi('project:module:edit')")
+    @PostMapping("/module")
+    public AjaxResult saveModule(@RequestBody ProjectWorkflowDtos.ModuleSaveRequest request) {
+        return AjaxResult.success(service.saveModule(request));
+    }
+
+    @PreAuthorize("@ss.hasPermi('project:module:remove')")
+    @DeleteMapping("/module/{id}")
+    public AjaxResult deleteModule(@PathVariable Long id) {
+        service.deleteModule(id);
+        return AjaxResult.success();
+    }
+
+    @PreAuthorize("@ss.hasPermi('project:follow:add')")
+    @PostMapping("/follow-up")
+    public AjaxResult saveFollowUp(@RequestBody ProjectWorkflowDtos.FollowUpRequest request) {
+        return AjaxResult.success(service.saveFollowUp(request));
+    }
+
+    @PreAuthorize("@ss.hasPermi('project:follow:remove')")
+    @DeleteMapping("/follow-up/{id}")
+    public AjaxResult deleteFollowUp(@PathVariable Long id) {
+        service.softDelete("project_management_follow_up", id);
+        return AjaxResult.success();
+    }
+
+    @PreAuthorize("@ss.hasPermi('project:report:add')")
+    @PostMapping("/report")
+    public AjaxResult saveReport(@RequestBody ProjectWorkflowDtos.ProgressReportRequest request) {
+        return AjaxResult.success(service.saveReport(request));
+    }
+
+    @PreAuthorize("@ss.hasPermi('project:report:remove')")
+    @DeleteMapping("/report/{id}")
+    public AjaxResult deleteReport(@PathVariable Long id) {
+        service.softDelete("project_management_progress_report", id);
+        return AjaxResult.success();
+    }
+
+    @PreAuthorize("@ss.hasPermi('project:material:add')")
+    @PostMapping("/material")
+    public AjaxResult saveMaterial(@RequestBody ProjectWorkflowDtos.MaterialRequest request) {
+        return AjaxResult.success(service.saveMaterial(request));
+    }
+
+    @PreAuthorize("@ss.hasPermi('project:phase:edit')")
+    @PostMapping("/phase")
+    public AjaxResult savePhase(@RequestBody ProjectWorkflowDtos.PhaseRequest request) {
+        return AjaxResult.success(service.savePhase(request));
+    }
+
+    @PreAuthorize("@ss.hasPermi('project:material:remove')")
+    @DeleteMapping("/material/{id}")
+    public AjaxResult deleteMaterial(@PathVariable Long id) {
+        service.softDelete("project_management_material", id);
+        return AjaxResult.success();
+    }
+
+    @GetMapping("/category/list")
+    public AjaxResult categoryList() {
+        return AjaxResult.success(service.listCategories());
+    }
+
+    @PreAuthorize("@ss.hasPermi('project:category:edit')")
+    @PostMapping("/category")
+    public AjaxResult saveCategory(@RequestBody ProjectWorkflowDtos.CategoryRequest request) {
+        return AjaxResult.success(service.saveCategory(request));
+    }
+
+    @PreAuthorize("@ss.hasPermi('project:category:remove')")
+    @DeleteMapping("/category/{id}")
+    public AjaxResult deleteCategory(@PathVariable Long id) {
+        service.deleteCategory(id);
+        return AjaxResult.success();
+    }
+
+    @GetMapping("/policy/list")
+    public AjaxResult policyList(@RequestParam(required = false) String keyword) {
+        return AjaxResult.success(service.listPolicies(keyword));
+    }
+
+    @PreAuthorize("@ss.hasPermi('policy:file:edit')")
+    @PostMapping("/policy")
+    public AjaxResult savePolicy(@RequestBody ProjectWorkflowDtos.PolicyRequest request) {
+        return AjaxResult.success(service.savePolicy(request));
+    }
+
+    @PreAuthorize("@ss.hasPermi('policy:file:remove')")
+    @DeleteMapping("/policy/{id}")
+    public AjaxResult deletePolicy(@PathVariable Long id) {
+        service.softDelete("government_policy_file", id);
+        return AjaxResult.success();
+    }
+}
diff --git a/src/main/java/com/ruoyi/projectManagement/dto/ProjectWorkflowDtos.java b/src/main/java/com/ruoyi/projectManagement/dto/ProjectWorkflowDtos.java
new file mode 100644
index 0000000..1d30519
--- /dev/null
+++ b/src/main/java/com/ruoyi/projectManagement/dto/ProjectWorkflowDtos.java
@@ -0,0 +1,109 @@
+package com.ruoyi.projectManagement.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/** 椤圭洰鎵ц宸ヤ綔鍙颁娇鐢ㄧ殑杞婚噺璇锋眰瀵硅薄銆� */
+public final class ProjectWorkflowDtos {
+    private ProjectWorkflowDtos() {
+    }
+
+    @Data
+    public static class ModuleSaveRequest {
+        private Long id;
+        private Long projectId;
+        private String moduleName;
+        private LocalDate plannedStartDate;
+        private String summary;
+        private BigDecimal projectWeight;
+        private List<MemberRequest> members = new ArrayList<>();
+    }
+
+    @Data
+    public static class MemberRequest {
+        private Long userId;
+        private String userName;
+        private BigDecimal moduleShare;
+    }
+
+    @Data
+    public static class FollowUpRequest {
+        private Long id;
+        private Long projectId;
+        private LocalDate followDate;
+        private String detail;
+        private List<Map<String, Object>> attachments = new ArrayList<>();
+    }
+
+    @Data
+    public static class ProgressReportRequest {
+        private Long id;
+        private Long projectId;
+        private Long moduleId;
+        private List<Long> reporterIds = new ArrayList<>();
+        private List<String> reporterNames = new ArrayList<>();
+        /** 鏈姹囨姤涓瘡浣嶆墽琛屼汉鐨勫伐浣滈噺鍒嗛厤锛屽崰姣斿悎璁″繀椤讳负100%銆� */
+        private List<MemberRequest> reporterShares = new ArrayList<>();
+        private BigDecimal progress;
+        private LocalDate reportDate;
+        private String remark;
+        private List<Map<String, Object>> attachments = new ArrayList<>();
+    }
+
+    @Data
+    public static class MaterialRequest {
+        private Long id;
+        private Long projectId;
+        private String materialName;
+        private String materialType;
+        private String remark;
+        private List<Map<String, Object>> attachments = new ArrayList<>();
+    }
+
+    @Data
+    public static class ProjectExecutorsRequest {
+        private Long projectId;
+        private List<MemberRequest> executors = new ArrayList<>();
+    }
+
+    @Data
+    public static class StageTransitionRequest {
+        private Long projectId;
+        private String targetStage;
+    }
+
+    @Data
+    public static class PhaseRequest {
+        private Long projectId;
+        private String phaseCode;
+        private String status;
+        private Map<String, Object> formData;
+        private String remark;
+        private List<Map<String, Object>> attachments = new ArrayList<>();
+    }
+
+    @Data
+    public static class CategoryRequest {
+        private Long id;
+        private Long parentId;
+        private String categoryName;
+        private Integer sort;
+        private String remark;
+    }
+
+    @Data
+    public static class PolicyRequest {
+        private Long id;
+        private String policyName;
+        private LocalDate publishDate;
+        private String policyUrl;
+        private String maintainerName;
+        private String remark;
+        private List<Map<String, Object>> attachments = new ArrayList<>();
+    }
+}
diff --git a/src/main/java/com/ruoyi/projectManagement/dto/SaveInfoDto.java b/src/main/java/com/ruoyi/projectManagement/dto/SaveInfoDto.java
index c423055..96fdb4d 100644
--- a/src/main/java/com/ruoyi/projectManagement/dto/SaveInfoDto.java
+++ b/src/main/java/com/ruoyi/projectManagement/dto/SaveInfoDto.java
@@ -9,7 +9,6 @@
 import org.springframework.format.annotation.DateTimeFormat;
 
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -37,7 +36,6 @@
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate establishTime;
     // 椤圭洰绫诲瀷 id
-    @NotNull(message = "projectManagementPlanId涓虹┖")
     private Long projectManagementPlanId;
 
     private String source;
@@ -45,6 +43,17 @@
     // 椤圭洰鍒嗙被
     private String projectClassification;
 
+    private Long projectLeaderId;
+    private String projectLeaderName;
+    private List<Long> projectManagerIds;
+    private List<String> projectManagerNames;
+    private List<Long> projectExecutorIds;
+    private List<String> projectExecutorNames;
+    private String followCycle;
+    private String followDetail;
+    private String currentPhase;
+    private Long sourceBusinessId;
+
     private Long managerId;
     private String managerName;
     private Long salesmanId;
diff --git a/src/main/java/com/ruoyi/projectManagement/pojo/Info.java b/src/main/java/com/ruoyi/projectManagement/pojo/Info.java
index 2e7f95f..8f7f7d6 100644
--- a/src/main/java/com/ruoyi/projectManagement/pojo/Info.java
+++ b/src/main/java/com/ruoyi/projectManagement/pojo/Info.java
@@ -8,6 +8,7 @@
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.ruoyi.common.handler.LongListJacksonTypeHandler;
 import com.ruoyi.projectManagement.dto.PlanStageDto;
 import com.ruoyi.projectManagement.dto.TeamDto;
 import lombok.Data;
@@ -78,6 +79,41 @@
      */
     @TableField(value = "project_classification")
     private String projectClassification;
+
+    /** 椤圭洰璐熻矗浜恒�� */
+    @TableField(value = "project_leader_id")
+    private Long projectLeaderId;
+
+    @TableField(value = "project_leader_name")
+    private String projectLeaderName;
+
+    /** 澶氬悕椤圭洰缁忕悊锛屼娇鐢� JSON 鏁扮粍淇濆瓨璐﹀彿涓庢樉绀哄悕銆� */
+    @TableField(value = "project_manager_ids", typeHandler = LongListJacksonTypeHandler.class)
+    private List<Long> projectManagerIds;
+
+    @TableField(value = "project_manager_names", typeHandler = JacksonTypeHandler.class)
+    private List<String> projectManagerNames;
+
+    /** 椤圭洰鎵ц浜猴紝鍙湪椤圭洰寮�濮嬪悗鎸夎鍒欒皟鏁淬�� */
+    @TableField(value = "project_executor_ids", typeHandler = LongListJacksonTypeHandler.class)
+    private List<Long> projectExecutorIds;
+
+    @TableField(value = "project_executor_names", typeHandler = JacksonTypeHandler.class)
+    private List<String> projectExecutorNames;
+
+    /** MONTH / QUARTER / YEAR銆� */
+    @TableField(value = "follow_cycle")
+    private String followCycle;
+
+    @TableField(value = "follow_detail")
+    private String followDetail;
+
+    /** 绔嬮」銆佸紑鍙戙�佺敵鎶ャ�佺敵鎶ョ粨鏋溿�侀獙鏀躲�� */
+    @TableField(value = "current_phase")
+    private String currentPhase;
+
+    @TableField(value = "source_business_id")
+    private Long sourceBusinessId;
 
     /**
      * 椤圭洰缁忕悊id
@@ -222,4 +258,4 @@
 
     @TableField(fill = FieldFill.INSERT)
     private Long deptId;
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/projectManagement/service/ProjectWorkflowService.java b/src/main/java/com/ruoyi/projectManagement/service/ProjectWorkflowService.java
new file mode 100644
index 0000000..3241827
--- /dev/null
+++ b/src/main/java/com/ruoyi/projectManagement/service/ProjectWorkflowService.java
@@ -0,0 +1,833 @@
+package com.ruoyi.projectManagement.service;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.projectManagement.dto.ProjectWorkflowDtos;
+import lombok.RequiredArgsConstructor;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+@Service
+@RequiredArgsConstructor
+public class ProjectWorkflowService {
+    private static final TypeReference<List<Map<String, Object>>> FILE_LIST_TYPE = new TypeReference<>() { };
+    private static final List<String> PHASE_CODES = List.of("INITIATION", "DEVELOPMENT", "APPLICATION", "RESULT", "ACCEPTANCE");
+    private static final List<String> PHASE_NAMES = List.of("绔嬮」", "寮�鍙�", "鐢虫姤", "鐢虫姤缁撴灉", "楠屾敹");
+
+    private final NamedParameterJdbcTemplate jdbc;
+    private final ObjectMapper objectMapper;
+
+    public Map<String, Object> getWorkbench(Long projectId) {
+        requireProject(projectId);
+        List<Map<String, Object>> modules = query("""
+                select m.id, m.project_id as projectId, m.module_name as moduleName,
+                       m.planned_start_date as plannedStartDate, m.summary,
+                       m.project_weight as projectWeight, m.current_progress as currentProgress,
+                       (select count(*) from project_management_progress_report r where r.module_id=m.id and r.is_deleted=0) as reportCount,
+                       m.create_time as createTime, m.update_time as updateTime
+                from project_management_module m
+                where m.project_id=:projectId and m.is_deleted=0 order by m.id
+                """, Map.of("projectId", projectId));
+        for (Map<String, Object> module : modules) {
+            Long moduleId = asLong(module.get("id"));
+            module.put("members", query("""
+                    select id, module_id as moduleId, user_id as userId, user_name as userName,
+                           module_share as moduleShare
+                    from project_management_module_member
+                    where module_id=:moduleId and is_deleted=0 order by id
+                    """, Map.of("moduleId", moduleId)));
+        }
+
+        List<Map<String, Object>> followUps = query("""
+                select id, project_id as projectId, follow_date as followDate, detail,
+                       attachments, create_user_id as createUserId, create_user_name as createUserName,
+                       create_time as createTime
+                from project_management_follow_up
+                where project_id=:projectId and is_deleted=0 order by follow_date desc,id desc
+                """, Map.of("projectId", projectId));
+        parseAttachments(followUps);
+
+        List<Map<String, Object>> reports = query("""
+                select r.id, r.project_id as projectId, r.module_id as moduleId,
+                       m.module_name as moduleName, r.reporter_ids as reporterIds,
+                       r.reporter_names as reporterNames, r.progress, r.report_date as reportDate,
+                       r.reporter_shares as reporterShares, r.remark, r.attachments, r.create_time as createTime
+                from project_management_progress_report r
+                left join project_management_module m on m.id=r.module_id
+                where r.project_id=:projectId and r.is_deleted=0 order by r.report_date desc,r.id desc
+                """, Map.of("projectId", projectId));
+        parseAttachments(reports);
+        for (Map<String, Object> row : reports) {
+            row.put("reporterIdList", parseLongList(row.get("reporterIds")));
+            row.put("reporterNameList", parseStringList(row.get("reporterNames")));
+            row.put("reporterShareList", parseFileList(row.get("reporterShares")));
+        }
+
+        List<Map<String, Object>> materials = query("""
+                select id, project_id as projectId, material_name as materialName,
+                       material_type as materialType, remark, attachments,
+                       create_user_name as createUserName, create_time as createTime
+                from project_management_material
+                where project_id=:projectId and is_deleted=0 order by id desc
+                """, Map.of("projectId", projectId));
+        parseAttachments(materials);
+
+        Map<String, Object> result = new LinkedHashMap<>();
+        result.put("modules", modules);
+        result.put("followUps", followUps);
+        result.put("reports", reports);
+        result.put("materials", materials);
+        result.put("sourceBusiness", getSourceBusiness(projectId));
+        result.put("memberStatistics", memberStatistics(projectId));
+        result.put("followWindow", getFollowWindow(projectId));
+        return result;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void startProject(Long projectId) {
+        requireProject(projectId);
+        Integer basicReady = jdbc.queryForObject("""
+                select count(*) from project_management_info
+                where id=:projectId and is_delete=0 and project_classification is not null
+                and project_classification<>'' and plan_start_time is not null and plan_end_time is not null
+                and project_leader_id is not null and project_manager_ids is not null
+                and json_length(project_manager_ids)>0 and follow_cycle is not null and follow_cycle<>''
+                and project_executor_ids is not null and json_length(project_executor_ids)>0
+                """, Map.of("projectId", projectId), Integer.class);
+        if (basicReady == null || basicReady == 0) throw new ServiceException("璇峰厛瀹屾暣濉啓椤圭洰鍩烘湰鎯呭喌");
+        List<Map<String, Object>> modules = query("""
+                select id,module_name as moduleName,planned_start_date as plannedStartDate,
+                       summary,project_weight as projectWeight
+                from project_management_module where project_id=:projectId and is_deleted=0
+                """, Map.of("projectId", projectId));
+        if (modules.isEmpty()) throw new ServiceException("椤圭洰寮�濮嬪墠璇疯嚦灏戞坊鍔犱竴涓」鐩ā鍧�");
+        BigDecimal total = BigDecimal.ZERO;
+        for (Map<String, Object> module : modules) {
+            if (isBlank(Objects.toString(module.get("moduleName"), "")) || module.get("plannedStartDate") == null
+                    || isBlank(Objects.toString(module.get("summary"), ""))) {
+                throw new ServiceException("璇峰畬鏁村~鍐欐瘡涓ā鍧楃殑鍚嶇О銆侀璁″紑濮嬫椂闂村拰妯″潡姒傝");
+            }
+            total = total.add(nvl((BigDecimal) module.get("projectWeight")));
+            Long moduleId = asLong(module.get("id"));
+            Integer memberCount = jdbc.queryForObject("""
+                    select count(*) from project_management_module_member
+                    where module_id=:moduleId and is_deleted=0
+                    """, Map.of("moduleId", moduleId), Integer.class);
+            if (memberCount == null || memberCount == 0) throw new ServiceException("姣忎釜妯″潡鑷冲皯閫夋嫨涓�鍚嶆墽琛屼汉");
+        }
+        if (total.setScale(2, RoundingMode.HALF_UP).compareTo(BigDecimal.valueOf(100).setScale(2)) != 0) {
+            throw new ServiceException("椤圭洰寮�濮嬪墠锛屾墍鏈夋ā鍧楃殑椤圭洰宸ヤ綔閲忓崰姣斿悎璁″繀椤讳负100%");
+        }
+        jdbc.update("update project_management_info set current_phase='寮�鍙�',update_time=now() where id=:projectId", Map.of("projectId", projectId));
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void transitionStage(ProjectWorkflowDtos.StageTransitionRequest request) {
+        requireProject(request.getProjectId());
+        String current = jdbc.queryForObject("select current_phase from project_management_info where id=:id and is_delete=0",
+                Map.of("id", request.getProjectId()), String.class);
+        if ("绔嬮」".equals(current)) current = "寮�鍙�";
+        Map<String, String> nextStages = Map.of(
+                "寮�鍙�", "鐢虫姤",
+                "鐢虫姤", "鐢虫姤缁撴灉",
+                "鐢虫姤缁撴灉", "楠屾敹",
+                "楠屾敹", "宸插畬鎴�"
+        );
+        String expected = nextStages.get(current);
+        if (expected == null || !expected.equals(request.getTargetStage())) {
+            throw new ServiceException("椤圭洰闃舵鍙兘鎸夊紑鍙戙�佺敵鎶ャ�佺敵鎶ョ粨鏋溿�侀獙鏀躲�佸凡瀹屾垚鐨勯『搴忔帹杩�");
+        }
+        if ("寮�鍙�".equals(current)) {
+            Integer unfinished = jdbc.queryForObject("""
+                    select count(*) from project_management_module
+                    where project_id=:projectId and is_deleted=0 and current_progress<100
+                    """, Map.of("projectId", request.getProjectId()), Integer.class);
+            if (unfinished != null && unfinished > 0) {
+                throw new ServiceException("鎵�鏈夐」鐩ā鍧楄繘搴﹁揪鍒�100%鍚庢墠鑳借繘鍏ョ敵鎶ラ樁娈�");
+            }
+        }
+        jdbc.update("update project_management_info set current_phase=:stage,update_time=now() where id=:projectId",
+                new MapSqlParameterSource().addValue("stage", expected).addValue("projectId", request.getProjectId()));
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void updateProjectExecutors(ProjectWorkflowDtos.ProjectExecutorsRequest request) {
+        requireProject(request.getProjectId());
+        validateMembers(request.getExecutors());
+        List<Map<String, Object>> rows = query("""
+                select project_executor_ids as executorIds from project_management_info
+                where id=:projectId and is_delete=0
+                """, Map.of("projectId", request.getProjectId()));
+        List<Long> oldIds = rows.isEmpty() ? List.of() : parseLongList(rows.getFirst().get("executorIds"));
+        List<Long> newIds = request.getExecutors().stream().map(ProjectWorkflowDtos.MemberRequest::getUserId).toList();
+        for (Long removedId : oldIds.stream().filter(id -> !newIds.contains(id)).toList()) {
+            if (hasPositiveProjectShare(request.getProjectId(), removedId)) {
+                throw new ServiceException("璇ラ」鐩墽琛屼汉宸叉湁椤圭洰姹囨姤宸ヤ綔鍗犳瘮锛屼笉鑳藉垹闄�");
+            }
+        }
+        jdbc.update("""
+                update project_management_info set project_executor_ids=:ids,project_executor_names=:names,update_time=now()
+                where id=:projectId and is_delete=0
+                """, new MapSqlParameterSource().addValue("projectId", request.getProjectId())
+                .addValue("ids", json(newIds))
+                .addValue("names", json(request.getExecutors().stream().map(ProjectWorkflowDtos.MemberRequest::getUserName).toList())));
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public Long savePhase(ProjectWorkflowDtos.PhaseRequest request) {
+        requireProject(request.getProjectId());
+        ensurePhases(request.getProjectId());
+        int index = PHASE_CODES.indexOf(Objects.toString(request.getPhaseCode(), ""));
+        if (index < 0) throw new ServiceException("椤圭洰闃舵涓嶆纭�");
+        String status = Objects.toString(request.getStatus(), "IN_PROGRESS").toUpperCase();
+        if (!List.of("NOT_STARTED", "IN_PROGRESS", "COMPLETED").contains(status)) {
+            throw new ServiceException("闃舵鐘舵�佷笉姝g‘");
+        }
+        if (index > 0 && !"NOT_STARTED".equals(status)) {
+            Integer previousDone = jdbc.queryForObject("""
+                    select count(*) from project_management_phase
+                    where project_id=:projectId and phase_code=:phaseCode and status='COMPLETED' and is_deleted=0
+                    """, new MapSqlParameterSource().addValue("projectId", request.getProjectId())
+                    .addValue("phaseCode", PHASE_CODES.get(index - 1)), Integer.class);
+            if (previousDone == null || previousDone == 0) {
+                throw new ServiceException("璇峰厛瀹屾垚涓婁竴闃舵鈥�" + PHASE_NAMES.get(index - 1) + "鈥�");
+            }
+        }
+        MapSqlParameterSource p = new MapSqlParameterSource()
+                .addValue("projectId", request.getProjectId()).addValue("phaseCode", request.getPhaseCode())
+                .addValue("status", status).addValue("formData", jsonObject(request.getFormData()))
+                .addValue("remark", request.getRemark()).addValue("attachments", json(request.getAttachments()))
+                .addValue("userName", currentUserName());
+        jdbc.update("""
+                update project_management_phase set status=:status,form_data=:formData,remark=:remark,
+                attachments=:attachments,completed_time=case when :status='COMPLETED' then now() else null end,
+                update_user_name=:userName,update_time=now()
+                where project_id=:projectId and phase_code=:phaseCode and is_deleted=0
+                """, p);
+        String currentPhase = "COMPLETED".equals(status) && index == PHASE_CODES.size() - 1
+                ? "宸插畬鎴�" : PHASE_NAMES.get(index);
+        jdbc.update("update project_management_info set current_phase=:phase,update_time=now() where id=:projectId",
+                new MapSqlParameterSource().addValue("phase", currentPhase).addValue("projectId", request.getProjectId()));
+        return jdbc.queryForObject("select id from project_management_phase where project_id=:projectId and phase_code=:phaseCode and is_deleted=0",
+                p, Long.class);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public Long saveModule(ProjectWorkflowDtos.ModuleSaveRequest request) {
+        requireProject(request.getProjectId());
+        if (isBlank(request.getModuleName())) {
+            throw new ServiceException("璇疯緭鍏ユā鍧楀悕绉�");
+        }
+        if (request.getPlannedStartDate() == null) throw new ServiceException("璇烽�夋嫨妯″潡棰勮寮�濮嬫椂闂�");
+        if (isBlank(request.getSummary())) throw new ServiceException("璇疯緭鍏ユā鍧楁瑕�");
+        BigDecimal weight = percent(request.getProjectWeight(), "妯″潡鍦ㄩ」鐩腑鐨勫伐浣滈噺鍗犳瘮");
+        BigDecimal otherWeight = jdbc.queryForObject("""
+                select coalesce(sum(project_weight),0) from project_management_module
+                where project_id=:projectId and is_deleted=0 and (:id is null or id<>:id)
+                """, new MapSqlParameterSource().addValue("projectId", request.getProjectId()).addValue("id", request.getId()), BigDecimal.class);
+        BigDecimal available = BigDecimal.valueOf(100).subtract(nvl(otherWeight));
+        if (weight.compareTo(available) > 0) {
+            throw new ServiceException("鍏朵粬妯″潡宸插崰" + nvl(otherWeight).stripTrailingZeros().toPlainString()
+                    + "%锛屽綋鍓嶆ā鍧楁渶澶氬彲璁剧疆" + available.stripTrailingZeros().toPlainString() + "%");
+        }
+        validateMembers(request.getMembers());
+        List<Long> projectExecutorIds = projectExecutorIds(request.getProjectId());
+        if (request.getMembers().stream().anyMatch(member -> !projectExecutorIds.contains(member.getUserId()))) {
+            throw new ServiceException("妯″潡鎵ц浜哄繀椤诲厛鍔犲叆椤圭洰鎵ц浜�");
+        }
+
+        if (request.getId() != null) {
+            Integer reportCount = jdbc.queryForObject("select count(*) from project_management_progress_report where module_id=:id and is_deleted=0",
+                    Map.of("id", request.getId()), Integer.class);
+            if (reportCount != null && reportCount > 0) {
+                Map<String, Object> old = query("""
+                        select module_name as moduleName,planned_start_date as plannedStartDate,
+                               summary,project_weight as projectWeight from project_management_module
+                        where id=:id and project_id=:projectId and is_deleted=0
+                        """, new MapSqlParameterSource().addValue("id", request.getId()).addValue("projectId", request.getProjectId())).stream()
+                        .findFirst().orElseThrow(() -> new ServiceException("椤圭洰妯″潡涓嶅瓨鍦�"));
+                boolean changed = !Objects.equals(Objects.toString(old.get("moduleName"), ""), request.getModuleName().trim())
+                        || !Objects.equals(Objects.toString(old.get("plannedStartDate"), ""), Objects.toString(request.getPlannedStartDate(), ""))
+                        || !Objects.equals(Objects.toString(old.get("summary"), ""), Objects.toString(request.getSummary(), ""))
+                        || nvl((BigDecimal) old.get("projectWeight")).compareTo(weight) != 0;
+                if (changed) throw new ServiceException("璇ユā鍧楀凡鏈夎繘搴︽眹鎶ワ紝妯″潡鍩虹淇℃伅鍜屽崰姣斾笉鑳戒慨鏀癸紝浠呭彲璋冩暣鎵ц浜�");
+            }
+            List<Long> oldMemberIds = query("""
+                    select user_id as userId from project_management_module_member
+                    where module_id=:moduleId and is_deleted=0
+                    """, Map.of("moduleId", request.getId())).stream().map(row -> asLong(row.get("userId"))).toList();
+            List<Long> newMemberIds = request.getMembers().stream().map(ProjectWorkflowDtos.MemberRequest::getUserId).toList();
+            for (Long removedId : oldMemberIds.stream().filter(id -> !newMemberIds.contains(id)).toList()) {
+                if (hasPositiveModuleShare(request.getId(), removedId)) {
+                    throw new ServiceException("璇ユā鍧楁墽琛屼汉宸叉湁鏈ā鍧楀伐浣滃崰姣旓紝涓嶈兘鍒犻櫎");
+                }
+            }
+        }
+
+        Long moduleId = request.getId();
+        MapSqlParameterSource params = new MapSqlParameterSource()
+                .addValue("projectId", request.getProjectId())
+                .addValue("moduleName", request.getModuleName().trim())
+                .addValue("plannedStartDate", request.getPlannedStartDate())
+                .addValue("summary", request.getSummary())
+                .addValue("projectWeight", weight);
+        if (moduleId == null) {
+            GeneratedKeyHolder keyHolder = new GeneratedKeyHolder();
+            jdbc.update("""
+                    insert into project_management_module
+                    (project_id,module_name,planned_start_date,summary,project_weight,current_progress,is_deleted,create_time,update_time)
+                    values (:projectId,:moduleName,:plannedStartDate,:summary,:projectWeight,0,0,now(),now())
+                    """, params, keyHolder, new String[]{"id"});
+            moduleId = Objects.requireNonNull(keyHolder.getKey()).longValue();
+        } else {
+            params.addValue("id", moduleId);
+            int rows = jdbc.update("""
+                    update project_management_module set module_name=:moduleName,
+                    planned_start_date=:plannedStartDate,summary=:summary,project_weight=:projectWeight,update_time=now()
+                    where id=:id and project_id=:projectId and is_deleted=0
+                    """, params);
+            if (rows == 0) throw new ServiceException("椤圭洰妯″潡涓嶅瓨鍦�");
+            jdbc.update("update project_management_module_member set is_deleted=1 where module_id=:id", Map.of("id", moduleId));
+        }
+        for (ProjectWorkflowDtos.MemberRequest member : request.getMembers()) {
+            jdbc.update("""
+                    insert into project_management_module_member
+                    (module_id,user_id,user_name,module_share,is_deleted,create_time,update_time)
+                    values (:moduleId,:userId,:userName,:moduleShare,0,now(),now())
+                    """, new MapSqlParameterSource()
+                    .addValue("moduleId", moduleId)
+                    .addValue("userId", member.getUserId())
+                    .addValue("userName", member.getUserName())
+                    .addValue("moduleShare", BigDecimal.ZERO));
+        }
+        return moduleId;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteModule(Long id) {
+        int count = jdbc.queryForObject("select count(*) from project_management_progress_report where module_id=:id and is_deleted=0", Map.of("id", id), Integer.class);
+        if (count > 0) throw new ServiceException("璇ユā鍧楀凡鏈夎繘搴︽眹鎶ワ紝涓嶈兘鍒犻櫎");
+        jdbc.update("update project_management_module set is_deleted=1,update_time=now() where id=:id", Map.of("id", id));
+        jdbc.update("update project_management_module_member set is_deleted=1,update_time=now() where module_id=:id", Map.of("id", id));
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public Long saveFollowUp(ProjectWorkflowDtos.FollowUpRequest request) {
+        requireProject(request.getProjectId());
+        Long leaderId = jdbc.queryForObject("select project_leader_id from project_management_info where id=:id",
+                Map.of("id", request.getProjectId()), Long.class);
+        if (leaderId == null || !leaderId.equals(SecurityUtils.getUserId())) {
+            throw new ServiceException("鍙湁椤圭洰璐熻矗浜哄彲浠ュ~鍐欓」鐩窡杩�");
+        }
+        if (request.getFollowDate() == null || isBlank(request.getDetail())) {
+            throw new ServiceException("璇峰~鍐欒窡杩涙棩鏈熷拰璺熻繘璇︽儏");
+        }
+        validateFollowWindow(request.getProjectId(), request.getFollowDate(), request.getId());
+        MapSqlParameterSource p = new MapSqlParameterSource()
+                .addValue("id", request.getId()).addValue("projectId", request.getProjectId())
+                .addValue("followDate", request.getFollowDate()).addValue("detail", request.getDetail())
+                .addValue("attachments", json(request.getAttachments()))
+                .addValue("userId", SecurityUtils.getUserId()).addValue("userName", currentUserName());
+        if (request.getId() == null) {
+            GeneratedKeyHolder keys = new GeneratedKeyHolder();
+            jdbc.update("""
+                    insert into project_management_follow_up
+                    (project_id,follow_date,detail,attachments,create_user_id,create_user_name,is_deleted,create_time,update_time)
+                    values (:projectId,:followDate,:detail,:attachments,:userId,:userName,0,now(),now())
+                    """, p, keys, new String[]{"id"});
+            return Objects.requireNonNull(keys.getKey()).longValue();
+        }
+        jdbc.update("""
+                update project_management_follow_up set follow_date=:followDate,detail=:detail,
+                attachments=:attachments,update_time=now() where id=:id and project_id=:projectId and is_deleted=0
+                """, p);
+        return request.getId();
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public Long saveReport(ProjectWorkflowDtos.ProgressReportRequest request) {
+        requireProject(request.getProjectId());
+        if (request.getModuleId() == null || request.getReportDate() == null) {
+            throw new ServiceException("璇烽�夋嫨椤圭洰妯″潡鍜屾眹鎶ユ椂闂�");
+        }
+        BigDecimal progress = percent(request.getProgress(), "妯″潡杩涘害");
+        BigDecimal current = jdbc.queryForObject("""
+                select current_progress from project_management_module
+                where id=:moduleId and project_id=:projectId and is_deleted=0
+                """, new MapSqlParameterSource().addValue("moduleId", request.getModuleId()).addValue("projectId", request.getProjectId()), BigDecimal.class);
+        if (current == null) throw new ServiceException("椤圭洰妯″潡涓嶅瓨鍦�");
+        if (progress.compareTo(current) < 0) throw new ServiceException("鏈杩涘害涓嶈兘浣庝簬妯″潡褰撳墠杩涘害");
+        List<ProjectWorkflowDtos.MemberRequest> reporterShares = normalizeReporterShares(request);
+        validateReporterShares(reporterShares);
+        List<Long> moduleMemberIds = query("""
+                select user_id as userId from project_management_module_member
+                where module_id=:moduleId and is_deleted=0
+                """, Map.of("moduleId", request.getModuleId())).stream().map(row -> asLong(row.get("userId"))).toList();
+        if (!moduleMemberIds.contains(SecurityUtils.getUserId())) throw new ServiceException("鍙湁璇ユā鍧楁墽琛屼汉鍙互鎻愪氦杩涘害姹囨姤");
+        if (reporterShares.stream().anyMatch(member -> !moduleMemberIds.contains(member.getUserId()))) {
+            throw new ServiceException("姹囨姤浜哄憳鍙兘閫夋嫨璇ユā鍧楁墽琛屼汉");
+        }
+        request.setReporterIds(reporterShares.stream().map(ProjectWorkflowDtos.MemberRequest::getUserId).toList());
+        request.setReporterNames(reporterShares.stream().map(ProjectWorkflowDtos.MemberRequest::getUserName).toList());
+        MapSqlParameterSource p = new MapSqlParameterSource()
+                .addValue("id", request.getId()).addValue("projectId", request.getProjectId())
+                .addValue("moduleId", request.getModuleId())
+                .addValue("reporterIds", json(request.getReporterIds()))
+                .addValue("reporterNames", json(request.getReporterNames()))
+                .addValue("reporterShares", json(reporterShares))
+                .addValue("progress", progress).addValue("reportDate", request.getReportDate())
+                .addValue("remark", request.getRemark()).addValue("attachments", json(request.getAttachments()));
+        Long reportId = request.getId();
+        if (reportId == null) {
+            GeneratedKeyHolder keys = new GeneratedKeyHolder();
+            jdbc.update("""
+                    insert into project_management_progress_report
+                    (project_id,module_id,reporter_ids,reporter_names,reporter_shares,progress,report_date,remark,attachments,is_deleted,create_time,update_time)
+                    values (:projectId,:moduleId,:reporterIds,:reporterNames,:reporterShares,:progress,:reportDate,:remark,:attachments,0,now(),now())
+                    """, p, keys, new String[]{"id"});
+            reportId = Objects.requireNonNull(keys.getKey()).longValue();
+        } else {
+            jdbc.update("""
+                    update project_management_progress_report set module_id=:moduleId,reporter_ids=:reporterIds,
+                    reporter_names=:reporterNames,reporter_shares=:reporterShares,progress=:progress,report_date=:reportDate,remark=:remark,
+                    attachments=:attachments,update_time=now()
+                    where id=:id and project_id=:projectId and is_deleted=0
+                    """, p);
+        }
+        jdbc.update("update project_management_module set current_progress=:progress,update_time=now() where id=:moduleId",
+                new MapSqlParameterSource().addValue("progress", progress).addValue("moduleId", request.getModuleId()));
+        return reportId;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public Long saveMaterial(ProjectWorkflowDtos.MaterialRequest request) {
+        requireProject(request.getProjectId());
+        if (isBlank(request.getMaterialName())) throw new ServiceException("璇疯緭鍏ヨ祫鏂欏悕绉�");
+        MapSqlParameterSource p = new MapSqlParameterSource()
+                .addValue("id", request.getId()).addValue("projectId", request.getProjectId())
+                .addValue("materialName", request.getMaterialName()).addValue("materialType", request.getMaterialType())
+                .addValue("remark", request.getRemark()).addValue("attachments", json(request.getAttachments()))
+                .addValue("userId", SecurityUtils.getUserId()).addValue("userName", currentUserName());
+        if (request.getId() == null) {
+            GeneratedKeyHolder keys = new GeneratedKeyHolder();
+            jdbc.update("""
+                    insert into project_management_material
+                    (project_id,material_name,material_type,remark,attachments,create_user_id,create_user_name,is_deleted,create_time,update_time)
+                    values (:projectId,:materialName,:materialType,:remark,:attachments,:userId,:userName,0,now(),now())
+                    """, p, keys, new String[]{"id"});
+            return Objects.requireNonNull(keys.getKey()).longValue();
+        }
+        jdbc.update("""
+                update project_management_material set material_name=:materialName,material_type=:materialType,
+                remark=:remark,attachments=:attachments,update_time=now()
+                where id=:id and project_id=:projectId and is_deleted=0
+                """, p);
+        return request.getId();
+    }
+
+    public void softDelete(String table, Long id) {
+        if (!List.of("project_management_follow_up", "project_management_progress_report", "project_management_material", "government_policy_file").contains(table)) {
+            throw new ServiceException("涓嶆敮鎸佺殑鍒犻櫎绫诲瀷");
+        }
+        jdbc.getJdbcTemplate().update("update " + table + " set is_deleted=1,update_time=now() where id=?", id);
+    }
+
+    public List<Map<String, Object>> listCategories() {
+        return query("""
+                select id,parent_id as parentId,category_name as categoryName,sort,remark
+                from project_management_category where is_deleted=0 order by sort,id
+                """, Map.of());
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public Long saveCategory(ProjectWorkflowDtos.CategoryRequest request) {
+        if (isBlank(request.getCategoryName())) throw new ServiceException("璇疯緭鍏ュ垎绫诲悕绉�");
+        Long parentId = request.getParentId() == null ? 0L : request.getParentId();
+        if (request.getId() != null && request.getId().equals(parentId)) throw new ServiceException("涓婄骇鍒嗙被涓嶈兘閫夋嫨鑷繁");
+        MapSqlParameterSource p = new MapSqlParameterSource().addValue("id", request.getId())
+                .addValue("parentId", parentId).addValue("categoryName", request.getCategoryName().trim())
+                .addValue("sort", request.getSort() == null ? 0 : request.getSort()).addValue("remark", request.getRemark());
+        if (request.getId() == null) {
+            GeneratedKeyHolder keys = new GeneratedKeyHolder();
+            jdbc.update("""
+                    insert into project_management_category(parent_id,category_name,sort,remark,is_deleted,create_time,update_time)
+                    values (:parentId,:categoryName,:sort,:remark,0,now(),now())
+                    """, p, keys, new String[]{"id"});
+            return Objects.requireNonNull(keys.getKey()).longValue();
+        }
+        jdbc.update("""
+                update project_management_category set parent_id=:parentId,category_name=:categoryName,
+                sort=:sort,remark=:remark,update_time=now() where id=:id and is_deleted=0
+                """, p);
+        return request.getId();
+    }
+
+    public void deleteCategory(Long id) {
+        int children = jdbc.queryForObject("select count(*) from project_management_category where parent_id=:id and is_deleted=0", Map.of("id", id), Integer.class);
+        if (children > 0) throw new ServiceException("璇峰厛鍒犻櫎涓嬬骇鍒嗙被");
+        jdbc.update("update project_management_category set is_deleted=1,update_time=now() where id=:id", Map.of("id", id));
+    }
+
+    public List<Map<String, Object>> listPolicies(String keyword) {
+        MapSqlParameterSource p = new MapSqlParameterSource().addValue("keyword", keyword == null ? "" : keyword.trim());
+        List<Map<String, Object>> rows = query("""
+                select id,policy_name as policyName,publish_date as publishDate,policy_url as policyUrl,
+                       attachments,maintainer_name as maintainerName,remark,create_time as createTime
+                from government_policy_file where is_deleted=0
+                and (:keyword='' or policy_name like concat('%',:keyword,'%'))
+                order by publish_date desc,id desc
+                """, p);
+        parseAttachments(rows);
+        return rows;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public Long savePolicy(ProjectWorkflowDtos.PolicyRequest request) {
+        if (isBlank(request.getPolicyName())) throw new ServiceException("璇疯緭鍏ユ斂绛栧悕绉�");
+        String maintainer = isBlank(request.getMaintainerName()) ? currentUserName() : request.getMaintainerName();
+        MapSqlParameterSource p = new MapSqlParameterSource().addValue("id", request.getId())
+                .addValue("policyName", request.getPolicyName()).addValue("publishDate", request.getPublishDate())
+                .addValue("policyUrl", request.getPolicyUrl()).addValue("attachments", json(request.getAttachments()))
+                .addValue("maintainer", maintainer).addValue("remark", request.getRemark());
+        if (request.getId() == null) {
+            GeneratedKeyHolder keys = new GeneratedKeyHolder();
+            jdbc.update("""
+                    insert into government_policy_file
+                    (policy_name,publish_date,policy_url,attachments,maintainer_name,remark,is_deleted,create_time,update_time)
+                    values (:policyName,:publishDate,:policyUrl,:attachments,:maintainer,:remark,0,now(),now())
+                    """, p, keys, new String[]{"id"});
+            return Objects.requireNonNull(keys.getKey()).longValue();
+        }
+        jdbc.update("""
+                update government_policy_file set policy_name=:policyName,publish_date=:publishDate,
+                policy_url=:policyUrl,attachments=:attachments,maintainer_name=:maintainer,
+                remark=:remark,update_time=now() where id=:id and is_deleted=0
+                """, p);
+        return request.getId();
+    }
+
+    private List<Map<String, Object>> memberStatistics(Long projectId) {
+        List<Map<String, Object>> reports = query("""
+                select r.module_id as moduleId,r.progress,r.reporter_ids as reporterIds,
+                       r.reporter_names as reporterNames,r.reporter_shares as reporterShares,
+                       m.project_weight as projectWeight
+                from project_management_progress_report r
+                join project_management_module m on m.id=r.module_id and m.is_deleted=0
+                where r.project_id=:projectId and r.is_deleted=0
+                order by r.module_id,r.report_date,r.id
+                """, Map.of("projectId", projectId));
+        Map<Long, BigDecimal> previousProgress = new LinkedHashMap<>();
+        Map<Long, Map<String, Object>> totals = new LinkedHashMap<>();
+        for (Map<String, Object> report : reports) {
+            Long moduleId = asLong(report.get("moduleId"));
+            BigDecimal progress = nvl((BigDecimal) report.get("progress"));
+            BigDecimal previous = previousProgress.getOrDefault(moduleId, BigDecimal.ZERO);
+            BigDecimal delta = progress.subtract(previous).max(BigDecimal.ZERO);
+            previousProgress.put(moduleId, progress.max(previous));
+            List<Map<String, Object>> shares = parseFileList(report.get("reporterShares"));
+            if (shares.isEmpty()) shares = equalReporterShares(report.get("reporterIds"), report.get("reporterNames"));
+            BigDecimal moduleWeight = nvl((BigDecimal) report.get("projectWeight"));
+            for (Map<String, Object> share : shares) {
+                Long userId = asLong(share.get("userId"));
+                if (userId == null) continue;
+                String userName = Objects.toString(share.get("userName"), "");
+                BigDecimal memberShare = new BigDecimal(Objects.toString(share.get("moduleShare"), "0"));
+                BigDecimal contribution = moduleWeight.multiply(delta).multiply(memberShare)
+                        .divide(BigDecimal.valueOf(10000), 2, RoundingMode.HALF_UP);
+                Map<String, Object> total = totals.computeIfAbsent(userId, id -> {
+                    Map<String, Object> item = new LinkedHashMap<>();
+                    item.put("userId", id); item.put("userName", userName); item.put("value", BigDecimal.ZERO);
+                    return item;
+                });
+                total.put("value", ((BigDecimal) total.get("value")).add(contribution));
+            }
+        }
+        return totals.values().stream()
+                .sorted((a, b) -> ((BigDecimal) b.get("value")).compareTo((BigDecimal) a.get("value")))
+                .toList();
+    }
+
+    private Map<String, Object> getFollowWindow(Long projectId) {
+        List<Map<String, Object>> projectRows = query("""
+                select follow_cycle as followCycle,plan_start_time as planStartTime
+                from project_management_info where id=:projectId and is_delete=0
+                """, Map.of("projectId", projectId));
+        if (projectRows.isEmpty()) return Map.of();
+        String cycle = Objects.toString(projectRows.getFirst().get("followCycle"), "");
+        LocalDate last = jdbc.query("""
+                select follow_date from project_management_follow_up
+                where project_id=:projectId and is_deleted=0 order by follow_date desc,id desc limit 1
+                """, Map.of("projectId", projectId), rs -> rs.next() ? rs.getDate(1).toLocalDate() : null);
+        Map<String, Object> result = new LinkedHashMap<>();
+        result.put("cycle", cycle);
+        result.put("lastFollowDate", last);
+        LocalDate planStart = projectRows.getFirst().get("planStartTime") instanceof java.sql.Date date ? date.toLocalDate() : null;
+        LocalDate base = last == null ? planStart : last;
+        if (base != null) {
+            LocalDate due = nextDue(base, cycle);
+            result.put("dueDate", due);
+            result.put("windowStart", due.minusDays(3));
+            result.put("windowEnd", due.plusDays(3));
+        }
+        return result;
+    }
+
+    private void ensurePhases(Long projectId) {
+        for (int i = 0; i < PHASE_CODES.size(); i++) {
+            jdbc.update("""
+                    insert into project_management_phase
+                    (project_id,phase_code,phase_name,phase_order,status,is_deleted,create_time,update_time)
+                    select :projectId,:phaseCode,:phaseName,:phaseOrder,'NOT_STARTED',0,now(),now()
+                    where not exists(select 1 from project_management_phase
+                      where project_id=:projectId and phase_code=:phaseCode and is_deleted=0)
+                    """, new MapSqlParameterSource().addValue("projectId", projectId)
+                    .addValue("phaseCode", PHASE_CODES.get(i)).addValue("phaseName", PHASE_NAMES.get(i))
+                    .addValue("phaseOrder", i + 1));
+        }
+    }
+
+    private Map<String, Object> getSourceBusiness(Long projectId) {
+        List<Map<String, Object>> rows = query("""
+                select sl.id,sl.project_name as projectName,sl.customer_id as customerId,
+                       sl.customer_name as customerName,sl.salesman,sl.entry_date as entryDate,
+                       sl.remarks,sl.attachment_materials as attachmentMaterials,
+                       sl.business_approval_status as approvalStatus,
+                       sl.business_approval_remark as approvalRemark
+                from project_management_info p
+                join sales_ledger sl on sl.id=p.source_business_id
+                where p.id=:projectId and p.source_business_id is not null
+                """, Map.of("projectId", projectId));
+        if (rows.isEmpty()) return Map.of();
+        Map<String, Object> row = rows.getFirst();
+        row.put("attachmentList", parseFileList(row.get("attachmentMaterials")));
+        return row;
+    }
+
+    private void validateFollowWindow(Long projectId, LocalDate followDate, Long excludeId) {
+        MapSqlParameterSource p = new MapSqlParameterSource().addValue("projectId", projectId).addValue("excludeId", excludeId);
+        LocalDate last = jdbc.query("""
+                select follow_date from project_management_follow_up
+                where project_id=:projectId and is_deleted=0 and (:excludeId is null or id<>:excludeId)
+                order by follow_date desc,id desc limit 1
+                """, p, rs -> rs.next() ? rs.getDate(1).toLocalDate() : null);
+        String cycle = jdbc.queryForObject("select follow_cycle from project_management_info where id=:projectId", Map.of("projectId", projectId), String.class);
+        LocalDate base = last;
+        if (base == null) {
+            base = jdbc.query("select plan_start_time from project_management_info where id=:projectId", Map.of("projectId", projectId),
+                    rs -> rs.next() && rs.getDate(1) != null ? rs.getDate(1).toLocalDate() : null);
+        }
+        if (base == null) throw new ServiceException("璇峰厛濉啓椤圭洰棰勮寮�濮嬫椂闂�");
+        LocalDate due = nextDue(base, cycle);
+        if (followDate.isBefore(due.minusDays(3)) || followDate.isAfter(due.plusDays(3))) {
+            throw new ServiceException("鏈璺熻繘搴斿湪" + due.minusDays(3) + "鑷�" + due.plusDays(3) + "涔嬮棿濉啓");
+        }
+    }
+
+    private LocalDate nextDue(LocalDate base, String cycle) {
+        return switch (Objects.toString(cycle, "MONTH").toUpperCase()) {
+            case "QUARTER", "瀛e害", "姣忓搴�" -> base.plusMonths(3);
+            case "YEAR", "骞村害", "姣忓勾" -> base.plusYears(1);
+            default -> base.plusMonths(1);
+        };
+    }
+
+    private void validateMembers(List<ProjectWorkflowDtos.MemberRequest> members) {
+        if (members == null || members.isEmpty()) throw new ServiceException("璇疯嚦灏戦�夋嫨涓�鍚嶆ā鍧楁墽琛屼汉");
+        List<Long> ids = new ArrayList<>();
+        for (ProjectWorkflowDtos.MemberRequest member : members) {
+            if (member.getUserId() == null || isBlank(member.getUserName())) throw new ServiceException("妯″潡鎵ц浜轰笉鑳戒负绌�");
+            if (ids.contains(member.getUserId())) throw new ServiceException("妯″潡鎵ц浜轰笉鑳介噸澶�");
+            ids.add(member.getUserId());
+        }
+    }
+
+    private List<Long> projectExecutorIds(Long projectId) {
+        List<Map<String, Object>> rows = query("""
+                select project_executor_ids as executorIds from project_management_info
+                where id=:projectId and is_delete=0
+                """, Map.of("projectId", projectId));
+        return rows.isEmpty() ? List.of() : parseLongList(rows.getFirst().get("executorIds"));
+    }
+
+    private boolean hasPositiveProjectShare(Long projectId, Long userId) {
+        return hasPositiveShare(query("""
+                select reporter_ids as reporterIds,reporter_names as reporterNames,reporter_shares as reporterShares
+                from project_management_progress_report where project_id=:projectId and is_deleted=0
+                """, Map.of("projectId", projectId)), userId);
+    }
+
+    private boolean hasPositiveModuleShare(Long moduleId, Long userId) {
+        return hasPositiveShare(query("""
+                select reporter_ids as reporterIds,reporter_names as reporterNames,reporter_shares as reporterShares
+                from project_management_progress_report where module_id=:moduleId and is_deleted=0
+                """, Map.of("moduleId", moduleId)), userId);
+    }
+
+    private boolean hasPositiveShare(List<Map<String, Object>> reports, Long userId) {
+        for (Map<String, Object> report : reports) {
+            List<Map<String, Object>> shares = parseFileList(report.get("reporterShares"));
+            if (shares.isEmpty()) shares = equalReporterShares(report.get("reporterIds"), report.get("reporterNames"));
+            for (Map<String, Object> share : shares) {
+                if (Objects.equals(asLong(share.get("userId")), userId)
+                        && new BigDecimal(Objects.toString(share.get("moduleShare"), "0")).compareTo(BigDecimal.ZERO) > 0) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private void validateReporterShares(List<ProjectWorkflowDtos.MemberRequest> members) {
+        if (members == null || members.isEmpty()) throw new ServiceException("璇疯嚦灏戦�夋嫨涓�鍚嶆眹鎶ヤ汉");
+        BigDecimal sum = BigDecimal.ZERO;
+        List<Long> ids = new ArrayList<>();
+        for (ProjectWorkflowDtos.MemberRequest member : members) {
+            if (member.getUserId() == null || isBlank(member.getUserName())) throw new ServiceException("姹囨姤浜轰笉鑳戒负绌�");
+            if (ids.contains(member.getUserId())) throw new ServiceException("姹囨姤浜轰笉鑳介噸澶�");
+            ids.add(member.getUserId());
+            sum = sum.add(percent(member.getModuleShare(), "鏈姹囨姤浜哄憳姣旈噸"));
+        }
+        if (sum.setScale(2, RoundingMode.HALF_UP).compareTo(BigDecimal.valueOf(100).setScale(2)) != 0) {
+            throw new ServiceException("鏈姹囨姤浜哄憳姣旈噸鍚堣蹇呴』涓�100%");
+        }
+    }
+
+    private List<ProjectWorkflowDtos.MemberRequest> normalizeReporterShares(ProjectWorkflowDtos.ProgressReportRequest request) {
+        if (request.getReporterShares() != null && !request.getReporterShares().isEmpty()) return request.getReporterShares();
+        List<Long> ids = request.getReporterIds() == null ? List.of() : request.getReporterIds();
+        List<String> names = request.getReporterNames() == null ? List.of() : request.getReporterNames();
+        if (ids.isEmpty()) return new ArrayList<>();
+        BigDecimal share = BigDecimal.valueOf(100).divide(BigDecimal.valueOf(ids.size()), 2, RoundingMode.DOWN);
+        List<ProjectWorkflowDtos.MemberRequest> result = new ArrayList<>();
+        for (int i = 0; i < ids.size(); i++) {
+            ProjectWorkflowDtos.MemberRequest member = new ProjectWorkflowDtos.MemberRequest();
+            member.setUserId(ids.get(i)); member.setUserName(i < names.size() ? names.get(i) : "");
+            member.setModuleShare(i == ids.size() - 1 ? BigDecimal.valueOf(100).subtract(share.multiply(BigDecimal.valueOf(i))) : share);
+            result.add(member);
+        }
+        return result;
+    }
+
+    private List<Map<String, Object>> equalReporterShares(Object rawIds, Object rawNames) {
+        List<Long> ids = parseLongList(rawIds);
+        List<String> names = parseStringList(rawNames);
+        if (ids.isEmpty()) return new ArrayList<>();
+        BigDecimal share = BigDecimal.valueOf(100).divide(BigDecimal.valueOf(ids.size()), 2, RoundingMode.DOWN);
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (int i = 0; i < ids.size(); i++) {
+            Map<String, Object> item = new LinkedHashMap<>();
+            item.put("userId", ids.get(i)); item.put("userName", i < names.size() ? names.get(i) : "");
+            item.put("moduleShare", i == ids.size() - 1 ? BigDecimal.valueOf(100).subtract(share.multiply(BigDecimal.valueOf(i))) : share);
+            result.add(item);
+        }
+        return result;
+    }
+
+    private BigDecimal percent(BigDecimal value, String label) {
+        BigDecimal val = nvl(value);
+        if (val.compareTo(BigDecimal.ZERO) < 0 || val.compareTo(BigDecimal.valueOf(100)) > 0) {
+            throw new ServiceException(label + "蹇呴』鍦�0鍒�100涔嬮棿");
+        }
+        return val.setScale(2, RoundingMode.HALF_UP);
+    }
+
+    private void requireProject(Long projectId) {
+        if (projectId == null) throw new ServiceException("椤圭洰涓嶈兘涓虹┖");
+        Integer count = jdbc.queryForObject("select count(*) from project_management_info where id=:id and is_delete=0", Map.of("id", projectId), Integer.class);
+        if (count == null || count == 0) throw new ServiceException("椤圭洰涓嶅瓨鍦�");
+    }
+
+    private List<Map<String, Object>> query(String sql, Map<String, ?> params) {
+        return jdbc.queryForList(sql, params);
+    }
+
+    private List<Map<String, Object>> query(String sql, MapSqlParameterSource params) {
+        return jdbc.queryForList(sql, params);
+    }
+
+    private void parseAttachments(List<Map<String, Object>> rows) {
+        for (Map<String, Object> row : rows) row.put("attachmentList", parseFileList(row.get("attachments")));
+    }
+
+    private List<Map<String, Object>> parseFileList(Object raw) {
+        if (raw == null || raw.toString().isBlank()) return new ArrayList<>();
+        try {
+            return objectMapper.readValue(raw.toString(), FILE_LIST_TYPE);
+        } catch (Exception ignored) {
+            return new ArrayList<>();
+        }
+    }
+
+    private List<Long> parseLongList(Object raw) {
+        if (raw == null || raw.toString().isBlank()) return new ArrayList<>();
+        try {
+            return objectMapper.readValue(raw.toString(), new TypeReference<>() { });
+        } catch (Exception ignored) {
+            return new ArrayList<>();
+        }
+    }
+
+    private List<String> parseStringList(Object raw) {
+        if (raw == null || raw.toString().isBlank()) return new ArrayList<>();
+        try {
+            return objectMapper.readValue(raw.toString(), new TypeReference<>() { });
+        } catch (Exception ignored) {
+            return new ArrayList<>();
+        }
+    }
+
+    private Map<String, Object> parseObjectMap(Object raw) {
+        if (raw == null || raw.toString().isBlank()) return new LinkedHashMap<>();
+        try {
+            return objectMapper.readValue(raw.toString(), new TypeReference<>() { });
+        } catch (Exception ignored) {
+            return new LinkedHashMap<>();
+        }
+    }
+
+    private String json(Object value) {
+        try {
+            return objectMapper.writeValueAsString(value == null ? List.of() : value);
+        } catch (Exception e) {
+            throw new ServiceException("闄勪欢鎴栦汉鍛樻暟鎹牸寮忎笉姝g‘");
+        }
+    }
+
+    private String jsonObject(Object value) {
+        try {
+            return objectMapper.writeValueAsString(value == null ? Map.of() : value);
+        } catch (Exception e) {
+            throw new ServiceException("闃舵淇℃伅鏍煎紡涓嶆纭�");
+        }
+    }
+
+    private String currentUserName() {
+        return SecurityUtils.getLoginUser() == null ? "" : SecurityUtils.getLoginUser().getNickName();
+    }
+
+    private boolean isBlank(String value) {
+        return value == null || value.trim().isEmpty();
+    }
+
+    private BigDecimal nvl(BigDecimal value) {
+        return value == null ? BigDecimal.ZERO : value;
+    }
+
+    private Long asLong(Object value) {
+        return value == null ? null : Long.valueOf(value.toString());
+    }
+}
diff --git a/src/main/java/com/ruoyi/projectManagement/service/impl/InfoServiceImpl.java b/src/main/java/com/ruoyi/projectManagement/service/impl/InfoServiceImpl.java
index 85d1e88..952c114 100644
--- a/src/main/java/com/ruoyi/projectManagement/service/impl/InfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/projectManagement/service/impl/InfoServiceImpl.java
@@ -85,6 +85,7 @@
         LambdaUpdateWrapper<Info> updateWrapper = new LambdaUpdateWrapper<Info>();
         updateWrapper.eq(Info::getId, id);
         updateWrapper.set(Info::getIsDelete, IsDeleteEnum.DELETED.getCode());
+        infoMapper.update(null, updateWrapper);
 
         // 瀵瑰簲闄勮〃淇℃伅鏄惁鍒犻櫎寰呯‘瀹氾紙鍥犱负鍚庣画鍙兘浼氳繘琛屽紩鐢ㄦ墍浠ュ厛涓嶅垹闄�
     }
diff --git a/src/main/java/com/ruoyi/projectManagement/service/impl/handle/InfoHandleService.java b/src/main/java/com/ruoyi/projectManagement/service/impl/handle/InfoHandleService.java
index a5f2ff4..77b8ad2 100644
--- a/src/main/java/com/ruoyi/projectManagement/service/impl/handle/InfoHandleService.java
+++ b/src/main/java/com/ruoyi/projectManagement/service/impl/handle/InfoHandleService.java
@@ -9,6 +9,7 @@
 import com.ruoyi.basic.service.CustomerFollowUpFileService;
 import com.ruoyi.common.enums.PlanStageEnum;
 import com.ruoyi.common.enums.ReviewStatusEnum;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.projectManagement.dto.InfoStageDto;
 import com.ruoyi.projectManagement.dto.PlanStageDto;
 import com.ruoyi.projectManagement.dto.SaveInfoDto;
@@ -58,13 +59,21 @@
         }
         info.setTeam(saveInfoDto.getTeamList());
         if (info.getId() == null) {
-            // 鐢熸垚瀵瑰簲鐨勯樁娈靛叧绯绘暟鎹�
-            info.setPlanStage(getPlanStageList(info.getProjectManagementPlanId()));
+            // 鏂伴」鐩樁娈电敱 project_management_phase 鐙珛缁存姢锛屼笉鍐嶇敓鎴愭棫璁″垝妯℃澘闃舵銆�
+            info.setPlanStage(Collections.emptyList());
+            if (StrUtil.isBlank(info.getCurrentPhase())) {
+                info.setCurrentPhase("鏈紑濮�");
+            }
             // 鎻掑叆榛樿鐘舵��
             info.setStatus(PlanStageEnum.TO_BEGIN.getCode());
             info.setReviewStatus(ReviewStatusEnum.PENDING_REVIEW.getCode());
             infoMapper.insert(info);
         } else {
+            Info existing = infoMapper.selectById(info.getId());
+            if (existing == null) throw new ServiceException("椤圭洰涓嶅瓨鍦�");
+            if (!StrUtil.isBlank(existing.getCurrentPhase()) && !"鏈紑濮�".equals(existing.getCurrentPhase())) {
+                throw new ServiceException("椤圭洰寮�濮嬪悗鍩烘湰淇℃伅鍜屽洟闃熶俊鎭凡閿佸畾锛屼粎鍙�氳繃浜哄憳璋冩暣鍔熻兘淇敼椤圭洰鎵ц浜�");
+            }
             infoMapper.updateById(info);
         }
         return info.getId();
diff --git a/src/main/java/com/ruoyi/sales/service/BusinessApprovalService.java b/src/main/java/com/ruoyi/sales/service/BusinessApprovalService.java
index 939cd2f..956d226 100644
--- a/src/main/java/com/ruoyi/sales/service/BusinessApprovalService.java
+++ b/src/main/java/com/ruoyi/sales/service/BusinessApprovalService.java
@@ -1,17 +1,11 @@
 package com.ruoyi.sales.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.enums.PlanStageEnum;
 import com.ruoyi.common.enums.ReviewStatusEnum;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.projectManagement.dto.PlanStageDto;
 import com.ruoyi.projectManagement.mapper.InfoMapper;
-import com.ruoyi.projectManagement.mapper.PlanMapper;
-import com.ruoyi.projectManagement.mapper.PlanNodeMapper;
 import com.ruoyi.projectManagement.pojo.Info;
-import com.ruoyi.projectManagement.pojo.Plan;
-import com.ruoyi.projectManagement.pojo.PlanNode;
 import com.ruoyi.sales.dto.BusinessReviewDto;
 import com.ruoyi.sales.mapper.SalesLedgerMapper;
 import com.ruoyi.sales.pojo.SalesLedger;
@@ -22,15 +16,12 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.List;
 
 @Service
 @RequiredArgsConstructor
 public class BusinessApprovalService {
     private final SalesLedgerMapper salesLedgerMapper;
     private final InfoMapper infoMapper;
-    private final PlanMapper planMapper;
-    private final PlanNodeMapper planNodeMapper;
 
     @Transactional(rollbackFor = Exception.class)
     public void submit(Long id) {
@@ -74,18 +65,6 @@
     }
 
     private Long createProject(SalesLedger ledger, Long selectedPlanId) {
-        Plan plan = selectedPlanId == null ? planMapper.selectOne(new LambdaQueryWrapper<Plan>()
-                .eq(Plan::getName, "椤圭洰鐢虫姤鍏樁娈�")
-                .eq(Plan::getIsDelete, 0).last("limit 1")) : planMapper.selectById(selectedPlanId);
-        if (plan == null) {
-            throw new ServiceException("鏈壘鍒扳�滈」鐩敵鎶ュ叚闃舵鈥濊鍒掞紝璇峰厛鎵ц鍗囩骇SQL");
-        }
-        List<PlanNode> nodes = planNodeMapper.selectList(new LambdaQueryWrapper<PlanNode>()
-                .eq(PlanNode::getProjectManagementPlanId, plan.getId())
-                .eq(PlanNode::getIsDelete, 0).orderByAsc(PlanNode::getSort));
-        if (nodes.isEmpty()) {
-            throw new ServiceException("椤圭洰鍏樁娈靛皻鏈厤缃�");
-        }
         Info info = new Info();
         info.setNo("XM" + LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE)
                 + String.format("%06d", ledger.getId()));
@@ -94,22 +73,16 @@
         info.setClientId(ledger.getCustomerId());
         info.setClientName(ledger.getCustomerName());
         info.setEstablishTime(LocalDate.now());
-        info.setProjectManagementPlanId(plan.getId());
-        info.setSource("涓氬姟瀹℃壒");
-        info.setManagerId(SecurityUtils.getUserId());
-        info.setManagerName(SecurityUtils.getLoginUser().getNickName());
+        info.setSource("涓氬姟鐢熸垚");
+        info.setSourceBusinessId(ledger.getId());
+        info.setCurrentPhase("鏈紑濮�");
         info.setSalesmanName(ledger.getSalesman());
         info.setIsDelete(0);
-        info.setPlanStartTime(LocalDate.now());
         info.setReviewStatus(ReviewStatusEnum.APPROVED.getCode());
         info.setStatus(PlanStageEnum.TO_BEGIN.getCode());
-        info.setOrderDate(ledger.getExecutionDate());
-        info.setOrderAmount(ledger.getContractAmount() == null ? null : ledger.getContractAmount().toPlainString());
         info.setRemark(ledger.getRemarks());
         info.setAttachment(ledger.getAttachmentMaterials());
         info.setDeptId(ledger.getDeptId());
-        info.setPlanStage(nodes.stream().map(node -> new PlanStageDto(node.getId(), node.getName(),
-                PlanStageEnum.TO_BEGIN, node.getSort(), node.getEstimatedDuration())).toList());
         infoMapper.insert(info);
         return info.getId();
     }
diff --git a/src/main/resources/application-zxsq.yml b/src/main/resources/application-zxsq.yml
index 8ec1cb6..a5e35dc 100644
--- a/src/main/resources/application-zxsq.yml
+++ b/src/main/resources/application-zxsq.yml
@@ -18,7 +18,7 @@
 # 寮�鍙戠幆澧冮厤缃�
 server:
   # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
-  port: 9005
+  port: 9006
   servlet:
     # 搴旂敤鐨勮闂矾寰�
     context-path: /
diff --git a/src/main/resources/mapper/projectManagement/InfoMapper.xml b/src/main/resources/mapper/projectManagement/InfoMapper.xml
index 4ef6518..bd245c8 100644
--- a/src/main/resources/mapper/projectManagement/InfoMapper.xml
+++ b/src/main/resources/mapper/projectManagement/InfoMapper.xml
@@ -15,6 +15,20 @@
             <result property="projectManagementPlanId" column="project_management_plan_id" jdbcType="BIGINT"/>
             <result property="source" column="source" jdbcType="VARCHAR"/>
             <result property="projectClassification" column="project_classification" jdbcType="VARCHAR"/>
+            <result property="projectLeaderId" column="project_leader_id" jdbcType="BIGINT"/>
+            <result property="projectLeaderName" column="project_leader_name" jdbcType="VARCHAR"/>
+            <result property="projectManagerIds" column="project_manager_ids"
+                    typeHandler="com.ruoyi.common.handler.LongListJacksonTypeHandler"/>
+            <result property="projectManagerNames" column="project_manager_names"
+                    typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+            <result property="projectExecutorIds" column="project_executor_ids"
+                    typeHandler="com.ruoyi.common.handler.LongListJacksonTypeHandler"/>
+            <result property="projectExecutorNames" column="project_executor_names"
+                    typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+            <result property="followCycle" column="follow_cycle" jdbcType="VARCHAR"/>
+            <result property="followDetail" column="follow_detail" jdbcType="VARCHAR"/>
+            <result property="currentPhase" column="current_phase" jdbcType="VARCHAR"/>
+            <result property="sourceBusinessId" column="source_business_id" jdbcType="BIGINT"/>
             <result property="managerId" column="manager_id" jdbcType="BIGINT"/>
             <result property="managerName" column="manager_name" jdbcType="VARCHAR"/>
             <result property="salesmanId" column="salesman_id" jdbcType="BIGINT"/>
@@ -40,7 +54,10 @@
     <sql id="Base_Column_List">
         id,no,title,
         client_id,client_name,project_management_info_parent_id,
-        establish_time,project_management_plan_id,source,
+        establish_time,project_management_plan_id,source,project_classification,
+        project_leader_id,project_leader_name,project_manager_ids,project_manager_names,
+        project_executor_ids,project_executor_names,
+        follow_cycle,follow_detail,current_phase,source_business_id,
         manager_id,manager_name,salesman_id,
         salesman_name,is_delete,create_time,
         update_time,create_user,update_user,
@@ -51,6 +68,21 @@
     </sql>
     <resultMap id="ListInfoVoMap" type="com.ruoyi.projectManagement.vo.ListInfoVo">
 
+        <result column="project_leader_id" property="projectLeaderId"/>
+        <result column="project_leader_name" property="projectLeaderName"/>
+        <result column="project_manager_ids" property="projectManagerIds"
+                typeHandler="com.ruoyi.common.handler.LongListJacksonTypeHandler"/>
+        <result column="project_manager_names" property="projectManagerNames"
+                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+        <result column="project_executor_ids" property="projectExecutorIds"
+                typeHandler="com.ruoyi.common.handler.LongListJacksonTypeHandler"/>
+        <result column="project_executor_names" property="projectExecutorNames"
+                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+        <result column="follow_cycle" property="followCycle"/>
+        <result column="follow_detail" property="followDetail"/>
+        <result column="current_phase" property="currentPhase"/>
+        <result column="source_business_id" property="sourceBusinessId"/>
+
         <result column="plan_stage"
                 property="planStage"
                 typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>

--
Gitblit v1.9.3