From 3c2af20542521bf0f7f3c5ac452b79289f961663 Mon Sep 17 00:00:00 2001
From: yangzhe123 <2824096059@qq.com>
Date: Wed, 14 Jan 2026 17:31:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BDGET?=
 =?UTF-8?q?=E6=94=B9POST?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gunshi/project/ss/controller/PersonnelPlanController.java  | 2 +-
 .../java/com/gunshi/project/ss/entity/es/EsObjectDocument.java | 2 +-
 .../java/com/gunshi/project/ss/mapper/StbprpBVoMapper.java     | 3 ++-
 src/main/java/com/gunshi/project/ss/model/ProjectEvents.java   | 1 -
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gunshi/project/ss/controller/PersonnelPlanController.java b/src/main/java/com/gunshi/project/ss/controller/PersonnelPlanController.java
index c5fd011..9598cba 100644
--- a/src/main/java/com/gunshi/project/ss/controller/PersonnelPlanController.java
+++ b/src/main/java/com/gunshi/project/ss/controller/PersonnelPlanController.java
@@ -284,7 +284,7 @@ public class PersonnelPlanController extends AbstractCommonFileController {
 
     }
 
-    @GetMapping("/template")
+    @PostMapping("/template")
     @Operation(summary = "下载模板")
     public void download(HttpServletResponse response) {
         ExcelUtil<PersonnelPlan> util = new ExcelUtil<>(PersonnelPlan.class);
diff --git a/src/main/java/com/gunshi/project/ss/entity/es/EsObjectDocument.java b/src/main/java/com/gunshi/project/ss/entity/es/EsObjectDocument.java
index 7d7a71e..99191f7 100644
--- a/src/main/java/com/gunshi/project/ss/entity/es/EsObjectDocument.java
+++ b/src/main/java/com/gunshi/project/ss/entity/es/EsObjectDocument.java
@@ -9,7 +9,7 @@ import org.springframework.data.elasticsearch.annotations.FieldType;
 import java.math.BigDecimal;
 
 @Data
-//@Document(indexName="ss_object")
+@Document(indexName="ss_object")
 public class EsObjectDocument {
     @Id  // 必须添加这个注解
     private String id;  // 字段名可以是id或自定义
diff --git a/src/main/java/com/gunshi/project/ss/mapper/StbprpBVoMapper.java b/src/main/java/com/gunshi/project/ss/mapper/StbprpBVoMapper.java
index fe4552e..fd3f316 100644
--- a/src/main/java/com/gunshi/project/ss/mapper/StbprpBVoMapper.java
+++ b/src/main/java/com/gunshi/project/ss/mapper/StbprpBVoMapper.java
@@ -22,7 +22,8 @@ public interface StbprpBVoMapper {
                    	st.lgtd,
                    	st.lttd,COALESCE ( SUM ( r.drp ), 0 ) v FROM st_stbprp_b st
             LEFT JOIN ( SELECT stcd, drp FROM st_pptn_r WHERE tm BETWEEN #{dto.stm} AND #{dto.etm} ) r ON st.stcd = r.stcd
-            WHERE st.sttp = 'PP'
+            JOIN st_stbprp_b_elem ste on st.stcd = ste.stcd
+            WHERE ste.elem = 'drp'
             GROUP BY st.stcd
             </script>
             """)
diff --git a/src/main/java/com/gunshi/project/ss/model/ProjectEvents.java b/src/main/java/com/gunshi/project/ss/model/ProjectEvents.java
index 09afd70..75c63f9 100644
--- a/src/main/java/com/gunshi/project/ss/model/ProjectEvents.java
+++ b/src/main/java/com/gunshi/project/ss/model/ProjectEvents.java
@@ -59,7 +59,6 @@ public class ProjectEvents implements Serializable {
 
     @TableField(value = "events_desc")
     @Schema(description="事件内容描述")
-    @NotEmpty(message = "事件内容描述不可为空",groups = {Insert.class,Update.class})
     private String eventsDesc;
 
     @TableField(exist = false)