提交代码
This commit is contained in:
1 parent
25892480cc
commit
718ab4cb38
12 files changed
+1804
-309
No files matched your search
@@ -412,4 +412,117 @@ lqw.orderByAsc(XgDormRoom::getSort); // 第二优先级:按排序号升序
|
||||
|
||||
#### 涉及文件
|
||||
- `web/src/views/xg/xgss/dormHygieneCheck/dormHygieneCheck/DormHygieneCheckDialog.vue`
|
||||
- `backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormRoomServiceImpl.java`
|
||||
- `backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormRoomServiceImpl.java`
|
||||
|
||||
---
|
||||
|
||||
## 违纪记录更新修复 (2025-01-03)
|
||||
|
||||
### 问题描述
|
||||
|
||||
在调用 `updateCompleteData` 接口更新宿舍卫生检查数据时,即使违纪记录入参中包含有效的 `disciplineRecordId`,系统仍然执行了"逻辑删除旧记录 + 新增新记录"的操作,而不是直接更新现有记录。
|
||||
|
||||
### 根本原因
|
||||
|
||||
**数据字段映射错误**:
|
||||
- `XgViolationDataBo` 中的 `id` 字段被误认为是违纪记录ID (`disciplineRecordId`)
|
||||
- 实际上 `id` 字段是关联表 `xg_hygiene_check_violation` 的主键ID
|
||||
- 真正的违纪记录ID应该通过 `disciplineRecordId` 字段传递
|
||||
|
||||
### 修复方案
|
||||
|
||||
#### 1. 扩展 XgViolationDataBo 字段
|
||||
|
||||
**文件**: `backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/domain/bo/XgViolationDataBo.java`
|
||||
|
||||
```java
|
||||
/**
|
||||
* 违纪记录ID(用于更新操作,新增时为null)
|
||||
*/
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 违纪记录ID,关联xskh_discipline_record.id(用于更新违纪记录)
|
||||
*/
|
||||
private Long disciplineRecordId;
|
||||
```
|
||||
|
||||
#### 2. 修复 handleViolationRecords 方法逻辑
|
||||
|
||||
**文件**: `backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/service/impl/XgDormHygieneCheckServiceImpl.java`
|
||||
|
||||
**修复前**:
|
||||
```java
|
||||
newDisciplineIds = newViolationData.stream()
|
||||
.map(XgViolationDataBo::getId) // 错误:使用关联表ID
|
||||
.filter(Objects::nonNull)
|
||||
.collect(Collectors.toSet());
|
||||
```
|
||||
|
||||
**修复后**:
|
||||
```java
|
||||
newDisciplineIds = newViolationData.stream()
|
||||
.map(violationBo -> {
|
||||
// 优先使用disciplineRecordId字段,如果为空则使用id字段(向后兼容)
|
||||
return violationBo.getDisciplineRecordId() != null
|
||||
? violationBo.getDisciplineRecordId()
|
||||
: violationBo.getId();
|
||||
})
|
||||
.filter(Objects::nonNull)
|
||||
.collect(Collectors.toSet());
|
||||
```
|
||||
|
||||
#### 3. 修复判断逻辑
|
||||
|
||||
**修复前**:
|
||||
```java
|
||||
if (violationBo.getId() != null && existingDisciplineIds.contains(violationBo.getId())) {
|
||||
// 更新逻辑
|
||||
}
|
||||
```
|
||||
|
||||
**修复后**:
|
||||
```java
|
||||
Long currentDisciplineRecordId = violationBo.getDisciplineRecordId() != null
|
||||
? violationBo.getDisciplineRecordId()
|
||||
: violationBo.getId();
|
||||
if (currentDisciplineRecordId != null && existingDisciplineIds.contains(currentDisciplineRecordId)) {
|
||||
// 更新逻辑
|
||||
}
|
||||
```
|
||||
|
||||
### 正确的入参格式
|
||||
|
||||
```json
|
||||
{
|
||||
"violationData": [
|
||||
{
|
||||
"id": "1964301377652428802", // 关联表ID (可选)
|
||||
"disciplineRecordId": "1964301377522405377", // 违纪记录ID (用于更新判断)
|
||||
"studentId": "1949114038914949121",
|
||||
"studentNo": "2025DQ21121",
|
||||
"studentName": "梁文清",
|
||||
"disciplineTypeId": "1963793291531026434",
|
||||
"disciplineTypeName": "地面未打扫",
|
||||
"disciplineReason": "未按要求打扫地面",
|
||||
"disciplineContent": "地面有明显垃圾",
|
||||
"scoreDeduction": "2.00",
|
||||
// ... 其他字段
|
||||
}
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
### 修复效果
|
||||
|
||||
1. **准确识别更新操作**:系统能正确识别哪些违纪记录需要更新,哪些需要新增
|
||||
2. **避免重复数据**:不再错误地删除现有记录并新增重复记录
|
||||
3. **向后兼容**:保持对旧版本数据格式的兼容性
|
||||
4. **数据完整性**:确保违纪记录的历史数据完整性
|
||||
|
||||
### 测试验证
|
||||
|
||||
使用修复后的接口,当入参包含 `disciplineRecordId` 时:
|
||||
- ✅ 系统识别为更新操作,直接更新现有违纪记录
|
||||
- ✅ 不再执行逻辑删除 + 新增的错误流程
|
||||
- ✅ 数据库中不会产生重复的违纪记录
|
||||
Reference in new issue
Block a user