diff --git a/srs-admin/src/main/java/com/srs/web/controller/routine/RtEnlistmentReserveAttachController.java b/srs-admin/src/main/java/com/srs/web/controller/routine/RtEnlistmentReserveAttachController.java index 4e5a911..7ee1374 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/routine/RtEnlistmentReserveAttachController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/routine/RtEnlistmentReserveAttachController.java @@ -127,4 +127,15 @@ public class RtEnlistmentReserveAttachController extends BaseController { public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(rtEnlistmentReserveAttachService.deleteRtEnlistmentReserveAttachByIds(ids)); } + + /** + * 删除保留学籍申请附件(入伍通知书等) + */ + @PreAuthorize("@ss.hasPermi('routine:enlistmentReserveAttach:remove')") + @Log(title = "保留学籍申请附件(入伍通知书等)", businessType = BusinessType.DELETE) + @PostMapping("/deleteRtEnlistmentReserve") + @ApiOperation("删除保留学籍申请附件(入伍通知书等)") + public AjaxResult deleteRtEnlistmentReserveAttachByFileNameAndStuName(String fileName, String studentName) { + return toAjax(rtEnlistmentReserveAttachService.deleteRtEnlistmentReserveAttachByFileNameAndStuName(fileName, studentName)); + } } diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/enlistmentReserve/ApprovalAssigneeListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/enlistmentReserve/ApprovalAssigneeListener.java index 7ec0e79..bdee1a8 100644 --- a/srs-flowable/src/main/java/com/srs/flowable/listener/enlistmentReserve/ApprovalAssigneeListener.java +++ b/srs-flowable/src/main/java/com/srs/flowable/listener/enlistmentReserve/ApprovalAssigneeListener.java @@ -15,6 +15,7 @@ import org.flowable.bpmn.model.BpmnModel; import org.flowable.bpmn.model.FlowNode; import org.flowable.engine.HistoryService; import org.flowable.engine.RepositoryService; +import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.ExecutionListener; diff --git a/srs-routine/src/main/java/com/srs/routine/mapper/RtEnlistmentReserveAttachMapper.java b/srs-routine/src/main/java/com/srs/routine/mapper/RtEnlistmentReserveAttachMapper.java index 1bdee46..b30b17f 100644 --- a/srs-routine/src/main/java/com/srs/routine/mapper/RtEnlistmentReserveAttachMapper.java +++ b/srs-routine/src/main/java/com/srs/routine/mapper/RtEnlistmentReserveAttachMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.srs.routine.domain.RtEnlistmentReserveAttach; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** * 保留学籍申请附件(入伍通知书等)Mapper接口 @@ -20,6 +21,8 @@ public interface RtEnlistmentReserveAttachMapper extends BaseMapper public TeacherVo getCounselorInfo(String stuNo); diff --git a/srs-routine/src/main/java/com/srs/routine/service/IRtEnlistmentReserveAttachService.java b/srs-routine/src/main/java/com/srs/routine/service/IRtEnlistmentReserveAttachService.java index 2a82054..5395144 100644 --- a/srs-routine/src/main/java/com/srs/routine/service/IRtEnlistmentReserveAttachService.java +++ b/srs-routine/src/main/java/com/srs/routine/service/IRtEnlistmentReserveAttachService.java @@ -4,6 +4,7 @@ import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; import com.srs.routine.domain.RtEnlistmentReserveAttach; +import org.apache.ibatis.annotations.Param; /** * 保留学籍申请附件(入伍通知书等)Service接口 @@ -65,4 +66,6 @@ public interface IRtEnlistmentReserveAttachService extends IService + + delete + from rt_enlistment_reserve_attach + where file_name = #{fileName} and student_name = #{studentName} + + delete from rt_enlistment_reserve_attach where id in diff --git a/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml b/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml index 907912f..5d0ed9b 100644 --- a/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml +++ b/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml @@ -167,6 +167,20 @@ where id = #{id} + + +