From c057a07946df22aeaab2a464426d630b78646d01 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: Thu, 05 Feb 2026 09:00:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
multi-admin/src/main/resources/application.yml | 4 ++--
multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditPersonServiceImpl.java | 14 +++++++-------
multi-system/src/main/java/com/gkhy/exam/system/domain/Catalogue.java | 2 +-
multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditEvaluateServiceImpl.java | 12 ++++++------
multi-system/src/main/java/com/gkhy/exam/system/domain/Material.java | 4 ++++
5 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/multi-admin/src/main/resources/application.yml b/multi-admin/src/main/resources/application.yml
index f2ad82e..bb6d0f7 100644
--- a/multi-admin/src/main/resources/application.yml
+++ b/multi-admin/src/main/resources/application.yml
@@ -7,9 +7,9 @@
multipart:
enabled: true
# 单个文件大小
- max-file-size: 100MB
+ max-file-size: 500MB
# 设置总上传的文件大小
- max-request-size: 200MB
+ max-request-size: 1GB
mvc:
pathmatch:
matching-strategy: ant_path_matcher
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/Catalogue.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/Catalogue.java
index e0aec1f..63c795a 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/Catalogue.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/Catalogue.java
@@ -37,7 +37,7 @@
@TableField(value = "mess")
private String mess;
- @ApiModelProperty("目录名称 （1范围目录 2技术类 3项目类 4组织环境目录 5领导作业目录 6策划目录 7支持目录 8运行目录 9绩效评价目录 10改进目录 11项目策划目录12生产过程目录13不合格品目录）")
+ @ApiModelProperty("目录名称 （1范围目录 2技术类 3项目类 4组织环境目录 5领导作业目录 6策划目录 7支持目录 8运行目录 9绩效评价目录 10改进目录 11项目策划目录12生产过程目录13不合格品目录14项目交付）")
@TableField(value = "type")
private Integer type;
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/Material.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/Material.java
index 8c49bb8..34e0dc8 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/Material.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/Material.java
@@ -42,6 +42,10 @@
@NotBlank(message = "名称不能为空")
private String materialName;
+ @ApiModelProperty(value = "材料批次")
+ @TableField("material_batch")
+ private String materialBatch;
+
@ApiModelProperty(value = "单位", required = true)
@TableField("material_unit")
@NotBlank(message = "单位不能为空")
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditEvaluateServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditEvaluateServiceImpl.java
index 1646a61..af9f008 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditEvaluateServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditEvaluateServiceImpl.java
@@ -48,12 +48,12 @@
if (!user.getUserType().equals(UserTypeEnum.SYSTEM_USER.getCode())&&!user.getUserType().equals(UserTypeEnum.COMPANY_USER.getCode())&&!user.getUserType().equals(UserTypeEnum.COMPANY_ADMIN.getCode())){
throw new ApiException("普通用户无法添加相关数据");
}
- ExStudent exStudent = exStudentMapper.selectStudentById(Long.valueOf(evaluate.getPersonId()));
- if ( user.getDeptId()!=null){
- if ( user.getDeptId().equals(exStudent.getDeptId())) {
- throw new ApiException("请勿选择本部门成员");
- }
- }
+// ExStudent exStudent = exStudentMapper.selectStudentById(Long.valueOf(evaluate.getPersonId()));
+// if ( user.getDeptId()!=null){
+// if ( user.getDeptId().equals(exStudent.getDeptId())) {
+// throw new ApiException("请勿选择本部门成员");
+// }
+// }
evaluate.setCreateBy(SecurityUtils.getUsername());
evaluate.setCreateTime(LocalDateTime.now());
evaluateMapper.insert(evaluate);
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditPersonServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditPersonServiceImpl.java
index f9a69e0..5f2a838 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditPersonServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditPersonServiceImpl.java
@@ -42,13 +42,13 @@
@Override
public CommonResult insertPerson(InternalAuditPerson person) {
- SysUser user = SecurityUtils.getLoginUser().getUser();
- ExStudent exStudent = exStudentMapper.selectStudentById(Long.valueOf(person.getPersonId()));
- if (user.getDeptId()!=null){
- if (user.getDeptId().equals(exStudent.getDeptId())){
- throw new ApiException("请勿选择本部门成员");
- }
- }
+// SysUser user = SecurityUtils.getLoginUser().getUser();
+// ExStudent exStudent = exStudentMapper.selectStudentById(Long.valueOf(person.getPersonId()));
+// if (user.getDeptId()!=null){
+// if (user.getDeptId().equals(exStudent.getDeptId())){
+// throw new ApiException("请勿选择本部门成员");
+// }
+// }
person.setCreateBy(SecurityUtils.getUsername());
person.setCreateTime(LocalDateTime.now());
personMapper.insert(person);
--
Gitblit v1.9.2