xgxt_sd/zhxg_java
19
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
weishengyou
2025-12-24 09:14:53 +08:00
parent a0c6add408 f328cf9109
commit dbd6ebfd2e
62 changed files with 1795 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphAuditDetailsController.java
View File

@@ -266,14 +266,6 @@ public class CphAuditDetailsController extends BaseController {
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(cphAuditDetailsService.selectCphAuditDetailsById(id));
}
/**
* 查询个人思想品得加分项申请
*/
@PostMapping("/getcphiamByOne/{stuNo}")
public TableDataInfo getcphiamByOne(@PathVariable("stuNo") String stuNo) {
List<CphAuditDetails> list=cphAuditDetailsService.getcphiamByOne(stuNo);
return getDataTable(list);
}
/**
* 新增审核明细

2
srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphSqlServerDataController.java
View File

@@ -144,7 +144,7 @@ public class CphSqlServerDataController extends BaseController {
List<Map> list=sqlServerDataService.getBZRClassInfoList();
return success(list);
}
//辅导员
//教职工
@RequestMapping("/getEmployEEInfoList")
public AjaxResult getEmployEEInfoList(){
//startPage();

45
srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCqScoreController.java
View File

@@ -5,6 +5,7 @@ import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import com.srs.comprehensive.domain.CphAuditDetails;
import com.srs.comprehensive.domain.Dto.CphExport;
import com.srs.comprehensive.domain.SrsCqScore;
import com.srs.comprehensive.domain.SrsMajors;
@@ -235,13 +236,6 @@ public class SrsCqScoreController extends BaseController {
}
@GetMapping("/getOwn")
public AjaxResult getOwn() {
String stuNo = getUsername();
return success(srsCqScoreService.getOwn(stuNo));
}
/**
* 导出学生综合素质评分表列表
*/
@@ -337,4 +331,41 @@ public class SrsCqScoreController extends BaseController {
return getDataTable(list);
}
/**
* 查询个人思想品得加分项申请
*/
@PostMapping("/getcphiamByOne/{stuNo}")
public TableDataInfo getcphiamByOne(@PathVariable("stuNo") String stuNo) {
List<CphAuditDetails> list=srsCqScoreService.getcphiamByOne(stuNo);
return getDataTable(list);
}
@GetMapping("/getOwncphiamByOne")
public TableDataInfo getOwncphiamByOne() {
List<CphAuditDetails> list=srsCqScoreService.getcphiamByOne(getUsername());
return getDataTable(list);
}
/**
* 查询个人素质综合信息
*/
@GetMapping("/getStuData")
public TableDataInfo getStuData(String stuNo) {
List<SrsCqScore> list=srsCqScoreService.getStuData(stuNo);
return getDataTable(list);
}
@GetMapping("/getOwnData")
public TableDataInfo getOwnData() {
List<SrsCqScore> list=srsCqScoreService.getStuData(getUsername());
return getDataTable(list);
}
//查询综合素质分数
@GetMapping("/getOwn")
public TableDataInfo getOwn() {
String stuNo = getUsername();
return getDataTable(srsCqScoreService.getOwn2(stuNo));
}
@GetMapping("/getStu")
public TableDataInfo getStu(String stuNo){
return getDataTable(srsCqScoreService.getOwn2(stuNo));
}
}

37
srs-admin/src/main/java/com/srs/web/controller/comprehensive/SyncDataController.java Normal file
View File

@@ -0,0 +1,37 @@
package com.srs.web.controller.comprehensive;
import com.srs.common.core.controller.BaseController;
import com.srs.common.core.domain.AjaxResult;
import com.srs.common.core.page.TableDataInfo;
import com.srs.comprehensive.service.ICphTeacherService;
import com.srs.comprehensive.service.SyncDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/syncdata")
public class SyncDataController extends BaseController {
@Autowired
private SyncDataService syncDataService;
@Autowired
private ICphTeacherService iCphTeacherService;
@RequestMapping("/getEmployEEInfoList")
public TableDataInfo getEmployEEInfoList(){
startPage();
List<Map> list=syncDataService.getEmployEEInfoList();
return getDataTable(list);
}
//同步教职工
@RequestMapping("/synchronousEmployEEInfoList")
public AjaxResult synchronousEmployEEInfoList(){
List<Map> list=syncDataService.getEmployEEInfoList();
iCphTeacherService.sqlserverSynchronousMYSQL(list);//同步教职工
//iCphTeacherService.Usertb();
return success();
}
}

2
srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsOutsideAccommodationApplyController.java
View File

@@ -75,7 +75,7 @@ public class DmsOutsideAccommodationApplyController extends BaseController {
/**
* 获取外宿申请详细信息
*/
@PreAuthorize("@ss.hasPermi('dormitory:enlistmentReserve:query')")
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApply:query')")
@GetMapping(value = "/process/{processInstanceId}")
@ApiOperation("获取应征入伍保留学籍申请详细信息")
public AjaxResult getInfoByProcessInstanceId(@PathVariable("processInstanceId") String processInstanceId) {

36
srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsOutsideAccommodationApprovalController.java
View File

@@ -2,6 +2,7 @@ package com.srs.web.controller.dormitory;
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 DmsOutsideAccommodationApprovalController extends BaseController {
/**
* 查询外宿申请审批记录列表
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApproval:list')")
@GetMapping("/list")
@ApiOperation("查询外宿申请审批记录列表")
public TableDataInfo list(DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval)
{
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApproval:list')")
@GetMapping("/list")
@ApiOperation("查询外宿申请审批记录列表")
public TableDataInfo list(DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval) {
startPage();
List<DmsOutsideAccommodationApproval> list = dmsOutsideAccommodationApprovalService.selectDmsOutsideAccommodationApprovalList(dmsOutsideAccommodationApproval);
return getDataTable(list);
@@ -54,8 +54,7 @@ public class DmsOutsideAccommodationApprovalController extends BaseController {
@Log(title = "外宿申请审批记录", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation("导出外宿申请审批记录列表")
public void export(HttpServletResponse response, DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval)
{
public void export(HttpServletResponse response, DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval) {
List<DmsOutsideAccommodationApproval> list = dmsOutsideAccommodationApprovalService.selectDmsOutsideAccommodationApprovalList(dmsOutsideAccommodationApproval);
ExcelUtil<DmsOutsideAccommodationApproval> util = new ExcelUtil<DmsOutsideAccommodationApproval>(DmsOutsideAccommodationApproval.class);
util.exportExcel(response, list, "外宿申请审批记录数据");
@@ -67,8 +66,7 @@ public class DmsOutsideAccommodationApprovalController extends BaseController {
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApproval:query')")
@GetMapping(value = "/{id}")
@ApiOperation("获取外宿申请审批记录详细信息")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(dmsOutsideAccommodationApprovalService.selectDmsOutsideAccommodationApprovalById(id));
}
@@ -79,11 +77,21 @@ public class DmsOutsideAccommodationApprovalController extends BaseController {
@Log(title = "外宿申请审批记录", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ApiOperation("新增外宿申请审批记录")
public AjaxResult add(@RequestBody DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval)
{
public AjaxResult add(@RequestBody DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval) {
return toAjax(dmsOutsideAccommodationApprovalService.insertDmsOutsideAccommodationApproval(dmsOutsideAccommodationApproval));
}
/**
* 新增或修改外宿申请审批记录
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationApproval:add')")
@Log(title = "外宿申请审批记录", businessType = BusinessType.INSERT)
@PostMapping("/addOrUpdate")
@ApiOperation("新增或修改外宿申请审批记录")
public AjaxResult addOrUpdateAccommodationApproval(@RequestBody DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval) {
return toAjax(dmsOutsideAccommodationApprovalService.addOrUpdateAccommodationApproval(dmsOutsideAccommodationApproval));
}
/**
* 修改外宿申请审批记录
*/
@@ -91,8 +99,7 @@ public class DmsOutsideAccommodationApprovalController extends BaseController {
@Log(title = "外宿申请审批记录", businessType = BusinessType.UPDATE)
@PostMapping("/update")
@ApiOperation("修改外宿申请审批记录")
public AjaxResult edit(@RequestBody DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval)
{
public AjaxResult edit(@RequestBody DmsOutsideAccommodationApproval dmsOutsideAccommodationApproval) {
return toAjax(dmsOutsideAccommodationApprovalService.updateDmsOutsideAccommodationApproval(dmsOutsideAccommodationApproval));
}
@@ -103,8 +110,7 @@ public class DmsOutsideAccommodationApprovalController extends BaseController {
@Log(title = "外宿申请审批记录", businessType = BusinessType.DELETE)
@PostMapping("/{ids}")
@ApiOperation("删除外宿申请审批记录")
public AjaxResult remove(@PathVariable Long[] ids)
{
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(dmsOutsideAccommodationApprovalService.deleteDmsOutsideAccommodationApprovalByIds(ids));
}
}

58
srs-admin/src/main/java/com/srs/web/controller/dormitory/DmsOutsideAccommodationAttachmentController.java
View File

@@ -2,6 +2,8 @@ package com.srs.web.controller.dormitory;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.srs.routine.domain.RtEnlistmentReserveAttach;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -37,11 +39,10 @@ public class DmsOutsideAccommodationAttachmentController extends BaseController
/**
* 查询外宿申请附件列表
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:list')")
@GetMapping("/list")
@ApiOperation("查询外宿申请附件列表")
public TableDataInfo list(DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment)
{
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:list')")
@GetMapping("/list")
@ApiOperation("查询外宿申请附件列表")
public TableDataInfo list(DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment) {
startPage();
List<DmsOutsideAccommodationAttachment> list = dmsOutsideAccommodationAttachmentService.selectDmsOutsideAccommodationAttachmentList(dmsOutsideAccommodationAttachment);
return getDataTable(list);
@@ -54,8 +55,7 @@ public class DmsOutsideAccommodationAttachmentController extends BaseController
@Log(title = "外宿申请附件", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation("导出外宿申请附件列表")
public void export(HttpServletResponse response, DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment)
{
public void export(HttpServletResponse response, DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment) {
List<DmsOutsideAccommodationAttachment> list = dmsOutsideAccommodationAttachmentService.selectDmsOutsideAccommodationAttachmentList(dmsOutsideAccommodationAttachment);
ExcelUtil<DmsOutsideAccommodationAttachment> util = new ExcelUtil<DmsOutsideAccommodationAttachment>(DmsOutsideAccommodationAttachment.class);
util.exportExcel(response, list, "外宿申请附件数据");
@@ -67,8 +67,7 @@ public class DmsOutsideAccommodationAttachmentController extends BaseController
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:query')")
@GetMapping(value = "/{id}")
@ApiOperation("获取外宿申请附件详细信息")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(dmsOutsideAccommodationAttachmentService.selectDmsOutsideAccommodationAttachmentById(id));
}
@@ -79,11 +78,31 @@ public class DmsOutsideAccommodationAttachmentController extends BaseController
@Log(title = "外宿申请附件", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ApiOperation("新增外宿申请附件")
public AjaxResult add(@RequestBody DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment)
{
public AjaxResult add(@RequestBody DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment) {
return toAjax(dmsOutsideAccommodationAttachmentService.insertDmsOutsideAccommodationAttachment(dmsOutsideAccommodationAttachment));
}
/**
* 批量新增保留学籍申请附件（入伍通知书等）
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:add')")
@Log(title = "外宿申请附件", businessType = BusinessType.INSERT)
@PostMapping("/batchAdd") // 注意：修改接口路径避免与原单条接口冲突
@ApiOperation("批量新增外宿申请附件")
public AjaxResult batchAdd(@RequestBody List<DmsOutsideAccommodationAttachment> list) {
// 1. 校验参数合法性
if (list == null || list.isEmpty()) {
return AjaxResult.error("批量插入失败：附件列表不能为空");
}
// 2. 调用Service层批量插入方法
int rows = dmsOutsideAccommodationAttachmentService.batchInsertDmsOutsideAccommodationAttachment(list);
// 3. 返回结果（rows为成功插入的条数）
return rows > 0 ? AjaxResult.success("批量插入成功，共插入 " + rows + " 条记录")
: AjaxResult.error("批量插入失败");
}
/**
* 修改外宿申请附件
*/
@@ -91,8 +110,7 @@ public class DmsOutsideAccommodationAttachmentController extends BaseController
@Log(title = "外宿申请附件", businessType = BusinessType.UPDATE)
@PostMapping("/update")
@ApiOperation("修改外宿申请附件")
public AjaxResult edit(@RequestBody DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment)
{
public AjaxResult edit(@RequestBody DmsOutsideAccommodationAttachment dmsOutsideAccommodationAttachment) {
return toAjax(dmsOutsideAccommodationAttachmentService.updateDmsOutsideAccommodationAttachment(dmsOutsideAccommodationAttachment));
}
@@ -103,8 +121,18 @@ public class DmsOutsideAccommodationAttachmentController extends BaseController
@Log(title = "外宿申请附件", businessType = BusinessType.DELETE)
@PostMapping("/{ids}")
@ApiOperation("删除外宿申请附件")
public AjaxResult remove(@PathVariable Long[] ids)
{
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(dmsOutsideAccommodationAttachmentService.deleteDmsOutsideAccommodationAttachmentByIds(ids));
}
/**
* 删除保留学籍申请附件（入伍通知书等）
*/
@PreAuthorize("@ss.hasPermi('dormitory:outsideAccommodationAttachment:remove')")
@Log(title = "外宿申请附件", businessType = BusinessType.DELETE)
@PostMapping("/OutsideAccommodationAttachment")
@ApiOperation("删除外宿申请附件")
public AjaxResult deleteOutsideAccommodationAttachmentNameAndStuName(String attachmentName, String studentName) {
return toAjax(dmsOutsideAccommodationAttachmentService.deleteOutsideAccommodationAttachmentNameAndStuName(attachmentName, studentName));
}
}

2
srs-admin/src/main/java/com/srs/web/controller/dormitory/SrsDormitoryStudentController.java
View File

@@ -226,7 +226,7 @@ public class SrsDormitoryStudentController extends BaseController {
}
@PreAuthorize("@ss.hasPermi('dms:dormStu:add')")
@ApiOperation(value = "学生自主选择床位", notes = "id不用填写,只能选择是当前学生班级并且为空的宿舍床位", response = StudentDormitoryDto.class)
@PostMapping("/addCheckInInformation")
public AjaxResult addCheckInInformation(@RequestBody StudentDormitoryDto dto) {

8
srs-admin/src/main/resources/application.yml
View File

@@ -64,8 +64,8 @@ spring:
# 国际化资源文件路径
basename: i18n/messages
profiles:
# active: druid #正式环境
active: dev #测试环境
active: druid #正式环境
# active: dev #测试环境
# 文件上传
servlet:
multipart:
@@ -82,13 +82,13 @@ spring:
redis:
# 地址
host: localhost #正式环境redis
# host: 47.112.118.149 #测试开发地址
# host: 47.112.118.149 #测试开发地址
# 端口，默认为6379
port: 6379
# 数据库索引
database: 0
# 密码SSSS
# password: Houpuyfb #测试开发密码
# password: Houpuyfb #测试开发密码
password: #正式环境密码
# 连接超时时间
timeout: 10s