Merge remote-tracking branch 'origin/main'

# Conflicts: # srs-survey/src/main/java/com/srs/survey/domain/SurItinerary.java # srs-survey/src/main/java/com/srs/survey/service/impl/SurItineraryServiceImpl.java
2025-09-30 10:07:58 +08:00
parent fb522488a8 6f69057678
commit 044699eb03
44 changed files with 519 additions and 423 deletions
--- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphBiyeApplyController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphBiyeApplyController.java
@@ -397,7 +397,7 @@ public class CphBiyeApplyController extends BaseController {
    /**
     * 修改优秀毕业生
     */
-    @PreAuthorize("@ss.hasPermi('comprehensive:biyeapply:edit')")
+//    @PreAuthorize("@ss.hasPermi('comprehensive:biyeapply:edit')")
    @Log(title = "优秀毕业生", businessType = BusinessType.UPDATE)
    @PostMapping("/update")
    @ApiOperation("修改优秀毕业生")
--- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphGoodAuditController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphGoodAuditController.java
@@ -53,12 +53,7 @@ public class CphGoodAuditController extends BaseController {
    @PostMapping("/changeApply")
    @ApiOperation("修改评优申请记录")
    public AjaxResult changeApply(@RequestBody CphGoodAudit param){
-        boolean hasRole = RoleBool.isJwc(getUserId(),_postService);
-        if(hasRole){
-            return cphGoodAuditService.changeApply(param);
-        }else{
-            return  AjaxResult.error(401,"你无权做这些");
-        }
+        return cphGoodAuditService.changeApply(param);
    }


--- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphLakeApplyController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphLakeApplyController.java
@@ -385,7 +385,7 @@ public class CphLakeApplyController extends BaseController {
    /**
     * 修改静湖之星申请
     */
-    @PreAuthorize("@ss.hasPermi('comprehensive:lakeapply:edit')")
+//    @PreAuthorize("@ss.hasPermi('comprehensive:lakeapply:edit')")
    @Log(title = "静湖之星申请", businessType = BusinessType.UPDATE)
    @PostMapping("/update")
    @ApiOperation("修改静湖之星申请")
--- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphNewGoodClassApplyController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphNewGoodClassApplyController.java
@@ -2,33 +2,34 @@ package com.srs.web.controller.comprehensive;

 import java.util.ArrayList;
 import java.util.List;
+
 import javax.servlet.http.HttpServletResponse;

-import com.srs.comprehensive.domain.CphBiyeApply;
-import com.srs.comprehensive.domain.Dto.CphCancel;
-import com.srs.comprehensive.domain.Vo.ExcelGoodClass;
-import com.srs.system.domain.SysDeptMap;
-import com.srs.system.service.ISysDeptMapService;
-import com.srs.system.service.ISysPostService;
 import com.srs.web.controller.common.RoleBool;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 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.RestController;
-import io.swagger.annotations.*;
-import org.springframework.security.access.prepost.PreAuthorize;

-import com.srs.comprehensive.domain.CphNewGoodClassApply;
-import com.srs.comprehensive.service.ICphNewGoodClassApplyService;
 import com.srs.common.core.controller.BaseController;
 import com.srs.common.core.domain.AjaxResult;
-import com.srs.common.utils.poi.ExcelUtil;
-import com.srs.common.enums.BusinessType;
-import com.srs.common.annotation.Log;
 import com.srs.common.core.page.TableDataInfo;
+import com.srs.common.enums.BusinessType;
+import com.srs.comprehensive.domain.CphNewGoodClassApply;
+import com.srs.comprehensive.domain.Dto.CphCancel;
+import com.srs.comprehensive.domain.Vo.ExcelGoodClass;
+import com.srs.comprehensive.service.ICphNewGoodClassApplyService;
+import com.srs.system.domain.SysDeptMap;
+import com.srs.system.service.ISysDeptMapService;
+import com.srs.system.service.ISysPostService;
+import com.srs.common.utils.poi.ExcelUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.srs.common.annotation.Log;

 /**
 * 先进班集体Controller
@@ -376,7 +377,7 @@ public class CphNewGoodClassApplyController extends BaseController {
    /**
     * 修改先进班集体
     */
-    @PreAuthorize("@ss.hasPermi('comprehensive:newClassGoodApply:edit')")
+//    @PreAuthorize("@ss.hasPermi('comprehensive:newClassGoodApply:edit')")
    @Log(title = "先进班集体", businessType = BusinessType.UPDATE)
    @PostMapping("/update")
    @ApiOperation("修改先进班集体")
--- a/srs-admin/src/main/java/com/srs/web/controller/routine/RtStuAtSchoolController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/routine/RtStuAtSchoolController.java
@@ -2,6 +2,7 @@ package com.srs.web.controller.routine;

 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,11 +38,10 @@ public class RtStuAtSchoolController extends BaseController {
    /**
     * 查询测试列表
     */
-@PreAuthorize("@ss.hasPermi('routine:school:list')")
-@GetMapping("/list")
-@ApiOperation("查询测试列表")
-    public TableDataInfo list(RtStuAtSchool rtStuAtSchool)
-    {
+    @PreAuthorize("@ss.hasPermi('routine:school:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询测试列表")
+    public TableDataInfo list(RtStuAtSchool rtStuAtSchool) {
        startPage();
        List<RtStuAtSchool> list = rtStuAtSchoolService.selectRtStuAtSchoolList(rtStuAtSchool);
        return getDataTable(list);
@@ -54,8 +54,7 @@ public class RtStuAtSchoolController extends BaseController {
    @Log(title = "测试", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    @ApiOperation("导出测试列表")
-    public void export(HttpServletResponse response, RtStuAtSchool rtStuAtSchool)
-    {
+    public void export(HttpServletResponse response, RtStuAtSchool rtStuAtSchool) {
        List<RtStuAtSchool> list = rtStuAtSchoolService.selectRtStuAtSchoolList(rtStuAtSchool);
        ExcelUtil<RtStuAtSchool> util = new ExcelUtil<RtStuAtSchool>(RtStuAtSchool.class);
        util.exportExcel(response, list, "测试数据");
@@ -67,8 +66,7 @@ public class RtStuAtSchoolController extends BaseController {
    @PreAuthorize("@ss.hasPermi('routine:school:query')")
    @GetMapping(value = "/{id}")
    @ApiOperation("获取测试详细信息")
-    public AjaxResult getInfo(@PathVariable("id") Integer id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Integer id) {
        return success(rtStuAtSchoolService.selectRtStuAtSchoolById(id));
    }

@@ -79,8 +77,7 @@ public class RtStuAtSchoolController extends BaseController {
    @Log(title = "测试", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @ApiOperation("新增测试")
-    public AjaxResult add(@RequestBody RtStuAtSchool rtStuAtSchool)
-    {
+    public AjaxResult add(@RequestBody RtStuAtSchool rtStuAtSchool) {
        return toAjax(rtStuAtSchoolService.insertRtStuAtSchool(rtStuAtSchool));
    }

@@ -91,8 +88,7 @@ public class RtStuAtSchoolController extends BaseController {
    @Log(title = "测试", businessType = BusinessType.UPDATE)
    @PostMapping("/update")
    @ApiOperation("修改测试")
-    public AjaxResult edit(@RequestBody RtStuAtSchool rtStuAtSchool)
-    {
+    public AjaxResult edit(@RequestBody RtStuAtSchool rtStuAtSchool) {
        return toAjax(rtStuAtSchoolService.updateRtStuAtSchool(rtStuAtSchool));
    }

@@ -103,8 +99,7 @@ public class RtStuAtSchoolController extends BaseController {
    @Log(title = "测试", businessType = BusinessType.DELETE)
    @PostMapping("/{ids}")
    @ApiOperation("删除测试")
-    public AjaxResult remove(@PathVariable Integer[] ids)
-    {
+    public AjaxResult remove(@PathVariable Integer[] ids) {
        return toAjax(rtStuAtSchoolService.deleteRtStuAtSchoolByIds(ids));
    }
 }
--- a/srs-admin/src/main/java/com/srs/web/controller/survey/SurItineraryController.java
+++ b/srs-admin/src/main/java/com/srs/web/controller/survey/SurItineraryController.java
@@ -229,6 +229,13 @@ public class SurItineraryController extends BaseController {
        return surItineraryService.manyLeaveAudit(ids);
    }

+    @PreAuthorize("@ss.hasPermi('survey:itinerary:leaveAudit')")
+    @PostMapping("/manyLeaveReject")
+    @ApiOperation("辅导员批量离校审核驳回")
+    public AjaxResult manyLeaveReject(@RequestBody Long[] ids){
+        return surItineraryService.manyLeaveReject(ids);
+    }
+
    @PreAuthorize("@ss.hasPermi('survey:itinerary:leaveAudit')")
    @PostMapping("/leaveAudit")
    @ApiOperation("辅导员离校审核")
@@ -468,13 +475,12 @@ public class SurItineraryController extends BaseController {
    /**
     * 修改学生假期返校
     */
-    @PreAuthorize("@ss.hasPermi('survey:itinerary:edit')")
    @Log(title = "学生假期返校", businessType = BusinessType.UPDATE)
    @PostMapping("/update")
    @ApiOperation("修改学生假期返校")
    public AjaxResult edit(@RequestBody SurItinerary surItinerary)
    {
-        return toAjax(surItineraryService.updateSurItinerary(surItinerary));
+        return toAjax(surItineraryService.updateById(surItinerary));
    }

    /**
--- a/srs-admin/src/main/resources/application.yml
+++ b/srs-admin/src/main/resources/application.yml
@@ -83,7 +83,7 @@ spring:
    # 地址
    host: localhost     #正式环境redis
 #    host: 47.112.118.149 #测试开发地址
-    # 端口，默认为6379
+#     端口，默认为6379
    port: 6379
    # 数据库索引
    database: 0