fix 80266 车型项目库-如果项目库中有数据,删除后,数据全部同步删除嘛?
This commit is contained in:
+33
-2
@@ -1,10 +1,17 @@
|
||||
package com.jero.modules.projectLibrary.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.jero.common.api.vo.ResultCommon;
|
||||
import com.jero.common.constant.CommonConstant;
|
||||
import com.jero.modules.projectLibrary.common.AssessCommon;
|
||||
import com.jero.modules.projectLibrary.entity.LawsAssess;
|
||||
import com.jero.modules.projectLibrary.entity.LawsEvaluationNotMet;
|
||||
import com.jero.modules.projectLibrary.entity.LawsProjectLibrary;
|
||||
import com.jero.modules.projectLibrary.mapper.LawsProjectLibraryMapper;
|
||||
import com.jero.modules.projectLibrary.service.ILawsAssessService;
|
||||
import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService;
|
||||
import com.jero.modules.projectLibrary.service.ILawsProjectLibraryService;
|
||||
import com.jero.modules.system.entity.SysUser;
|
||||
import com.jero.modules.system.service.ISysUserService;
|
||||
@@ -17,6 +24,8 @@ import java.util.List;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
@@ -32,9 +41,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
@Transactional(rollbackFor = JeroBootException.class)
|
||||
public class LawsProjectLibraryServiceImpl extends ServiceImpl<LawsProjectLibraryMapper, LawsProjectLibrary> implements ILawsProjectLibraryService {
|
||||
|
||||
@Autowired
|
||||
@Resource
|
||||
private ISysUserService sysUserService;
|
||||
|
||||
@Resource
|
||||
private ILawsAssessService lawsAssessService;
|
||||
@Resource
|
||||
private ILawsEvaluationNotMetService notMetService;
|
||||
/**
|
||||
* 分页查询
|
||||
*/
|
||||
@@ -76,6 +88,25 @@ public class LawsProjectLibraryServiceImpl extends ServiceImpl<LawsProjectLibrar
|
||||
@Override
|
||||
public void deleteById(String id) {
|
||||
LawsProjectLibrary projectLibrary = getById(id);
|
||||
List<LawsAssess> allByProjectIdNotDeleted = lawsAssessService.getAllByProjectIdNotDeleted(id);
|
||||
for (LawsAssess lawsAssess : allByProjectIdNotDeleted) {
|
||||
String processStatus = lawsAssess.getProcessStatus();
|
||||
if (AssessCommon.UNDER_EVALUATION.equals(processStatus)){
|
||||
throw new JeroBootException(ResultCommon.ASSESS_DELETE_ERROR2);
|
||||
}
|
||||
//未符合项中有整改中、审批中的数据时,不允许删除
|
||||
LambdaQueryWrapper<LawsEvaluationNotMet> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(LawsEvaluationNotMet::getProjectId, lawsAssess.getProjectId());
|
||||
queryWrapper.in(LawsEvaluationNotMet::getStandardId, lawsAssess.getStandardId());
|
||||
List<LawsEvaluationNotMet> notMetList = notMetService.list(queryWrapper);
|
||||
for (LawsEvaluationNotMet notMet : notMetList) {
|
||||
String state = notMet.getState();
|
||||
if (AssessCommon.RECTIFICATION.equals(state)||
|
||||
AssessCommon.UNDER_APPROVAL.equals(state)){
|
||||
throw new JeroBootException(ResultCommon.ASSESS_DELETE_ERROR);
|
||||
}
|
||||
}
|
||||
}
|
||||
removeById(id);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user