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() - .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 @@ - 备注:经济抚慰按明显性损伤2000元、轻微伤3000元、轻伤5000元、 - - - - - - - - - - 重伤10000元填报,并出具伤情法医鉴定书及其它相关材料。 + 备注:经济抚慰按明显性损伤2000元、轻微伤3000元、轻伤5000元、重伤10000元填报,并出具伤情法医鉴定书及其它相关材料。