食堂项目功能修改
This commit is contained in:
@@ -9,7 +9,9 @@ import com.zf.foodpurchase.common.core.domain.AjaxResult;
|
||||
import com.zf.foodpurchase.common.core.domain.entity.SysUser;
|
||||
import com.zf.foodpurchase.common.core.page.TableDataInfo;
|
||||
import com.zf.foodpurchase.common.utils.DateUtils;
|
||||
import com.zf.foodpurchase.fdsafe.entity.FoodRepo;
|
||||
import com.zf.foodpurchase.fdsafe.entity.Repository;
|
||||
import com.zf.foodpurchase.fdsafe.mapper.FoodRepoMapper;
|
||||
import com.zf.foodpurchase.fdsafe.service.IRepositoryService;
|
||||
import com.zf.foodpurchase.fdsafe.vo.RepositoryVO;
|
||||
import com.zf.foodpurchase.system.service.ISysUserService;
|
||||
@@ -20,6 +22,8 @@ import org.springframework.web.bind.annotation.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
@@ -37,6 +41,8 @@ public class RepositoryController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private ISysUserService userService;
|
||||
@Autowired
|
||||
private FoodRepoMapper foodRepoMapper;
|
||||
|
||||
@GetMapping("/list")
|
||||
public AjaxResult list(Repository repository) {
|
||||
@@ -105,7 +111,23 @@ public class RepositoryController extends BaseController {
|
||||
public AjaxResult delete(Long[] ids) {
|
||||
boolean flag = false;
|
||||
List<Long> list = Arrays.asList(ids);
|
||||
flag = repositoryService.removeByIds( list);
|
||||
List<FoodRepo> foodRepos = foodRepoMapper.selectByRepoId(list);
|
||||
List<Long> newList = new ArrayList<>();
|
||||
for (Long repoId : list) {
|
||||
List<FoodRepo> matchRepos = foodRepos.stream()
|
||||
.filter(foodRepo -> repoId.longValue() == foodRepo.getRepoId())
|
||||
.collect(Collectors.toList());
|
||||
// 1.无记录 || 2.存在记录数量>0
|
||||
boolean allZero = matchRepos.isEmpty()
|
||||
|| matchRepos.stream().allMatch(foodRepo -> Objects.equals(foodRepo.getFoodProductNum(), 0));
|
||||
if(allZero){
|
||||
newList.add(repoId);
|
||||
}
|
||||
}
|
||||
if(CollectionUtil.isEmpty(newList)){
|
||||
return AjaxResult.error("存在商品数量不为0的仓库,不能删除");
|
||||
}
|
||||
flag = repositoryService.removeByIds( newList);
|
||||
return flag?AjaxResult.success("删除成功"):AjaxResult.error("删除失败");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user