From 4c06a62b1be2c7bfc15d2d1ab992db930957411e Mon Sep 17 00:00:00 2001
From: wxc <191104855@qq.com>
Date: Fri, 24 Oct 2025 15:27:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=8D=95=E4=BD=8D/?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E7=94=BB=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/action/FirstApproveReturnAction.java       |  2 +-
 .../com/biutag/supervision/pojo/dto/ModelDto.java   | 10 ++++++++++
 .../ftl/5、民警维权抚慰申请表.xml         | 13 +------------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/flow/action/FirstApproveReturnAction.java b/src/main/java/com/biutag/supervision/flow/action/FirstApproveReturnAction.java
index 32a99ed..80b39b1 100644
--- a/src/main/java/com/biutag/supervision/flow/action/FirstApproveReturnAction.java
+++ b/src/main/java/com/biutag/supervision/flow/action/FirstApproveReturnAction.java
@@ -45,7 +45,7 @@ public class FirstApproveReturnAction implements Action {
     public void updateNegative(String negativeId, String nextFlowKey) {
         Negative negative = negativeService.getById(negativeId);
         negativeService.update(new LambdaUpdateWrapper<Negative>()
-                .set(Negative::getFlowKey, nextFlowKey)
+                .set(Negative::getFlowKey, negative.getIsSecondHandle() ? FlowNodeEnum.VERIFY.getKey() : nextFlowKey)
                 .set(Negative::getUpdTime, LocalDateTime.now())
                 // 当前处理对象
                 .set(Negative::getCurrentProcessingObject, String.format("%s专班", negative.getHandleSecondDepartName()))
diff --git a/src/main/java/com/biutag/supervision/pojo/dto/ModelDto.java b/src/main/java/com/biutag/supervision/pojo/dto/ModelDto.java
index b2a9563..1ae43bd 100644
--- a/src/main/java/com/biutag/supervision/pojo/dto/ModelDto.java
+++ b/src/main/java/com/biutag/supervision/pojo/dto/ModelDto.java
@@ -70,6 +70,10 @@ public class ModelDto {
     // 预警问题处置
     private String warningHandling;
 
+
+    private String handleDepartType;
+
+
     private String handleDepartId;
 
     // 业务类型
@@ -113,4 +117,10 @@ public class ModelDto {
     // 同步机构映射
     private String clueDepartSource;
 
+    // 是否要求回复
+    private Boolean requestReply;
+
+    // 时限设置
+    private Integer replyLimit;
+
 }
\ No newline at end of file
diff --git a/src/main/resources/static/templates/ftl/5、民警维权抚慰申请表.xml b/src/main/resources/static/templates/ftl/5、民警维权抚慰申请表.xml
index ff9112c..4340a38 100644
--- a/src/main/resources/static/templates/ftl/5、民警维权抚慰申请表.xml
+++ b/src/main/resources/static/templates/ftl/5、民警维权抚慰申请表.xml
@@ -1844,18 +1844,7 @@
                                 <w:sz w:val="32"/>
                                 <w:szCs w:val="32"/>
                             </w:rPr>
-                            <w:t>备注：经济抚慰按明显性损伤2000元、轻微伤3000元、轻伤5000元、</w:t>
-                        </w:r>
-                        <w:r>
-                            <w:rPr>
-                                <w:rFonts w:ascii="仿宋_GB2312" w:eastAsia="仿宋_GB2312" w:hAnsi="Times New Roman"
-                                          w:cs="仿宋_GB2312" w:hint="eastAsia"/>
-                                <w:color w:val="auto"/>
-                                <w:sz w:val="32"/>
-                                <w:szCs w:val="32"/>
-                            </w:rPr>
-                            <w:lastRenderedPageBreak/>
-                            <w:t>重伤10000元填报，并出具伤情法医鉴定书及其它相关材料。</w:t>
+                            <w:t>备注：经济抚慰按明显性损伤2000元、轻微伤3000元、轻伤5000元、重伤10000元填报，并出具伤情法医鉴定书及其它相关材料。</w:t>
                         </w:r>
                     </w:p>
                     <w:p w14:paraId="67DA84A0" w14:textId="77777777" w:rsidR="00A12578" w:rsidRDefault="00A12578"/>