admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
GUO 2024-05-05 19:08:48 +08:00
parent a215665d59
commit 0ba4e7e415
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityInspectTaskItemRecordServiceImpl.java
View File

@ -3,22 +3,21 @@ package com.zhgd.xmgl.modules.xz.security.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
import com.zhgd.xmgl.modules.dangerous.entity.HiddenDangerInspectRecord;
import com.zhgd.xmgl.modules.dangerous.service.IHiddenDangerInspectRecordService;
import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityInspectTaskItemRecord;
import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityInspectTaskRecord;
import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord;
import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityInspectTaskItemRecordMapper;
import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
import com.zhgd.xmgl.modules.dangerous.service.IHiddenDangerInspectRecordService;
import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityInspectTaskRecordMapper;
import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityInspectTaskItemRecordService;
import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord;
import com.zhgd.xmgl.modules.quality.service.IQualityInspectionRecordService;
import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
@ -42,9 +41,8 @@ public class XzSecurityXzSecurityInspectTaskItemRecordServiceImpl extends Servic
private IHiddenDangerInspectRecordService hiddenDangerInspectRecordService;
@Autowired
private SystemUserMapper systemUserMapper;
@Autowired
private IQualityInspectionRecordService qualityInspectionRecordService;
private IXzSecurityQualityInspectionRecordService qualityInspectionRecordService;
@Override
@ -85,11 +83,11 @@ public class XzSecurityXzSecurityInspectTaskItemRecordServiceImpl extends Servic
}
}
} else {
QueryWrapper<QualityInspectionRecord> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(QualityInspectionRecord::getItemId, id);
List<QualityInspectionRecord> list = qualityInspectionRecordService.list(queryWrapper);
QueryWrapper<XzSecurityQualityInspectionRecord> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(XzSecurityQualityInspectionRecord::getItemId, id);
List<XzSecurityQualityInspectionRecord> list = qualityInspectionRecordService.list(queryWrapper);
if (list != null && list.size() > 0) {
for (QualityInspectionRecord record : list) {
for (XzSecurityQualityInspectionRecord record : list) {
qualityInspectionRecordService.deleteQualityInspectionRecord(record.getId().toString());
}
}

14
src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityInspectTaskRecordServiceImpl.java
View File

@ -11,11 +11,11 @@ import com.zhgd.xmgl.modules.dangerous.entity.HiddenDangerInspectRecord;
import com.zhgd.xmgl.modules.dangerous.service.IHiddenDangerInspectRecordService;
import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityInspectTaskItemRecord;
import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityInspectTaskRecord;
import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord;
import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityInspectTaskItemRecordMapper;
import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityInspectTaskRecordMapper;
import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityInspectTaskRecordService;
import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord;
import com.zhgd.xmgl.modules.quality.service.IQualityInspectionRecordService;
import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService;
import com.zhgd.xmgl.util.DateUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
@ -45,7 +45,7 @@ public class XzSecurityXzSecurityInspectTaskRecordServiceImpl extends ServiceImp
private IHiddenDangerInspectRecordService hiddenDangerInspectRecordService;
@Autowired
private IQualityInspectionRecordService qualityInspectionRecordService;
private IXzSecurityQualityInspectionRecordService qualityInspectionRecordService;
@Override
public void saveInspectTaskRecord(XzSecurityInspectTaskRecord xzSecurityInspectTaskRecord) {
@ -133,11 +133,11 @@ public class XzSecurityXzSecurityInspectTaskRecordServiceImpl extends ServiceImp
}
}
} else {
QueryWrapper<QualityInspectionRecord> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.lambda().eq(QualityInspectionRecord::getTaskId, id);
List<QualityInspectionRecord> list = qualityInspectionRecordService.list(queryWrapper1);
QueryWrapper<XzSecurityQualityInspectionRecord> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.lambda().eq(XzSecurityQualityInspectionRecord::getTaskId, id);
List<XzSecurityQualityInspectionRecord> list = qualityInspectionRecordService.list(queryWrapper1);
if (list != null && list.size() > 0) {
for (QualityInspectionRecord inspectRecord : list) {
for (XzSecurityQualityInspectionRecord inspectRecord : list) {
qualityInspectionRecordService.deleteQualityInspectionRecord(inspectRecord.getId().toString());
}
}