diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/SuppFlow.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/SuppFlow.java index 30993bbf..a41b2991 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/SuppFlow.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/SuppFlow.java @@ -1,8 +1,6 @@ package cn.ysk.cashier.cons.domain; import lombok.Data; -import org.springframework.security.core.parameters.P; - import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -31,7 +29,7 @@ public class SuppFlow implements Serializable { @Data public static class ConInfos{ - private Integer conInfold; + private Integer conInfoId; private BigDecimal price; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java index a4b93b49..99303f2c 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java @@ -1,7 +1,6 @@ package cn.ysk.cashier.cons.service.impl; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import cn.ysk.cashier.cons.domain.*; import cn.ysk.cashier.cons.repository.TbConsInfoFlowRepository; import cn.ysk.cashier.cons.repository.TbConsInfoRepository; @@ -39,18 +38,11 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.math.BigDecimal; -import java.math.RoundingMode; import java.sql.Timestamp; import java.util.*; import static cn.ysk.cashier.utils.StringCodeUtil.TYPE.LETTER_CAPITAL_NUMBER; -/** - * @author admin - * @website https://eladmin.vip - * @description 服务实现 - * @date 2024-06-22 - **/ @Service @RequiredArgsConstructor @Slf4j @@ -83,10 +75,8 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { public List queryAll(TbConsInfoQueryCriteria criteria) { List list = tbConsInfoMapper.toDto(tbConsInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder))); - if (Objects.nonNull(list) && list.size() > 0) { - list.parallelStream().forEach(it -> { - it.setContypeCode(tbConsTypeRepository.findById(it.getConTypeId()).orElseGet(TbConsType::new).getConTypeCode()); - }); + if (Objects.nonNull(list) && !list.isEmpty()) { + list.parallelStream().forEach(it -> it.setContypeCode(tbConsTypeRepository.findById(it.getConTypeId()).orElseGet(TbConsType::new).getConTypeCode())); } return list; } @@ -217,7 +207,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { stockOperate.setShopId(tbShopInfo.getId().toString()); stockOperate.setStockSnap(""); - stockOperate.setType(resources.getType().equals("in") ? "cons_in" : "cons_out"); + stockOperate.setType("in".equals(resources.getType()) ? "cons_in" : "cons_out"); Map operatorSnapMap = new HashMap<>(); operatorSnapMap.put("name", tbShopInfo.getShopName()); operatorSnapMap.put("account", tbShopInfo.getAccount()); @@ -235,7 +225,7 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { for (SuppFlow.ConInfos conInfos : resources.getList()) { JSONObject object = new JSONObject(); - TbConsInfo info = tbConsInfoRepository.getById(conInfos.getConInfold()); + TbConsInfo info = tbConsInfoRepository.getById(conInfos.getConInfoId()); if (Objects.isNull(info)) { log.info("耗材信息不存在"); continue; @@ -367,7 +357,6 @@ public class TbConsInfoServiceImpl implements TbConsInfoService { XSSFSheet sheet = xssfWorkbook.getSheetAt(0); XSSFRow row = null; - List consInfos = new ArrayList<>(); for (int i = 1; i < sheet.getPhysicalNumberOfRows(); i++) { row = sheet.getRow(i); if (row != null) {