|
@@ -191,22 +191,7 @@ public class BizArchiveInputController extends BaseController {
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
public AjaxResult alter(@RequestBody BizArchiveInput bizArchiveInput) {
|
|
public AjaxResult alter(@RequestBody BizArchiveInput bizArchiveInput) {
|
|
Long userId = SecurityUtils.getUserId();
|
|
Long userId = SecurityUtils.getUserId();
|
|
- List<BizArchiveInputDetail> details = archiveInputDetailService.query()
|
|
|
|
- .eq("deleted",0)
|
|
|
|
- .eq("contract_id", bizArchiveInput.getId()).list();
|
|
|
|
- for (BizArchiveInputDetail item : details) {
|
|
|
|
- BizCollectionDetail detail = new BizCollectionDetail();
|
|
|
|
- detail.setContractId(bizArchiveInput.getId());
|
|
|
|
- detail.setContractDetailId(item.getId());
|
|
|
|
- detail.setTaskTypeId(item.getTaskTypeId());
|
|
|
|
- List<BizCollectionDetail> list = bizCollectionDetailService.list(new LambdaQueryWrapper<BizCollectionDetail>()
|
|
|
|
- .eq(BizCollectionDetail::getContractId, bizArchiveInput.getId())
|
|
|
|
- .eq(BizCollectionDetail::getContractDetailId, item.getId())
|
|
|
|
- .eq(BizCollectionDetail::getTaskTypeId, item.getTaskTypeId()));
|
|
|
|
- if(CollectionUtils.isNotEmpty(list)){
|
|
|
|
- throw new RuntimeException("已存在该任务类型的收款合同,无法删除");
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
BizArchiveInput oldBizArchiveInput = getById(bizArchiveInput.getId());
|
|
BizArchiveInput oldBizArchiveInput = getById(bizArchiveInput.getId());
|
|
checkAlter(bizArchiveInput, oldBizArchiveInput);
|
|
checkAlter(bizArchiveInput, oldBizArchiveInput);
|
|
setNullId(oldBizArchiveInput);
|
|
setNullId(oldBizArchiveInput);
|
|
@@ -324,6 +309,16 @@ public class BizArchiveInputController extends BaseController {
|
|
if (!changeList.isEmpty() && !bizArchiveInputService.checkWorkOrderChangeStatus(changeList)) {
|
|
if (!changeList.isEmpty() && !bizArchiveInputService.checkWorkOrderChangeStatus(changeList)) {
|
|
throw new ServiceException("修改任务月数小于已完成月数。");
|
|
throw new ServiceException("修改任务月数小于已完成月数。");
|
|
}
|
|
}
|
|
|
|
+ for (BizArchiveInputDetail item : delList) {
|
|
|
|
+
|
|
|
|
+ List<BizCollectionDetail> list = bizCollectionDetailService.list(new LambdaQueryWrapper<BizCollectionDetail>()
|
|
|
|
+ .eq(BizCollectionDetail::getContractId, newBizArchiveInput.getId())
|
|
|
|
+ .eq(BizCollectionDetail::getContractDetailId, item.getId())
|
|
|
|
+ .eq(BizCollectionDetail::getTaskTypeId, item.getTaskTypeId()));
|
|
|
|
+ if(CollectionUtils.isNotEmpty(list)){
|
|
|
|
+ throw new RuntimeException("已存在该任务类型的收款合同,无法删除");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|