fix 80253 车型项目库详情-删除不符合项中存在整改中/审批中的数据,删除成功了
This commit is contained in:
+21
@@ -14,9 +14,11 @@ import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
|
||||
import com.jero.modules.projectLibrary.common.AssessCommon;
|
||||
import com.jero.modules.projectLibrary.entity.LawsAssess;
|
||||
import com.jero.modules.projectLibrary.entity.LawsAssessResults;
|
||||
import com.jero.modules.projectLibrary.entity.LawsEvaluationNotMet;
|
||||
import com.jero.modules.projectLibrary.mapper.LawsAssessMapper;
|
||||
import com.jero.modules.projectLibrary.service.ILawsAssessResultsService;
|
||||
import com.jero.modules.projectLibrary.service.ILawsAssessService;
|
||||
import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService;
|
||||
import com.jero.modules.projectLibrary.vo.DecompositionOrderSourceVO;
|
||||
import com.jero.modules.projectLibrary.vo.LawsAssessAddVo;
|
||||
import com.jero.modules.split.entity.SarFileSplitInfoEO;
|
||||
@@ -62,6 +64,8 @@ public class LawsAssessServiceImpl extends ServiceImpl<LawsAssessMapper, LawsAss
|
||||
private LawsAssessMapper lawsAssessMapper;
|
||||
@Resource
|
||||
private ILawsAssessResultsService lawsAssessResultsService;
|
||||
@Resource
|
||||
private ILawsEvaluationNotMetService notMetService;
|
||||
/**
|
||||
* 分页查询
|
||||
*
|
||||
@@ -135,6 +139,23 @@ public class LawsAssessServiceImpl extends ServiceImpl<LawsAssessMapper, LawsAss
|
||||
@Override
|
||||
public void deleteById(String id) {
|
||||
LawsAssess lawsAssess = getById(id);
|
||||
String processStatus = lawsAssess.getProcessStatus();
|
||||
if (AssessCommon.UNDER_EVALUATION.equals(processStatus)){
|
||||
throw new JeroBootException(ResultCommon.ERROR);
|
||||
}
|
||||
//未符合项中有整改中、审批中的数据时,不允许删除
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
lawsAssess.setDelFlag(CommonConstant.DEL_FLAG_1.toString());
|
||||
updateById(lawsAssess);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user