czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

耗材列表 关联 商品

This commit is contained in:
wangw 2024-10-17 10:42:12 +08:00
parent 0f7502df06
commit 312c9cc1be
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfo.java
View File

@ -25,6 +25,8 @@ import javax.validation.constraints.*;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
import java.util.Map;
/** /**
* @author admin * @author admin
@ -108,7 +110,7 @@ public class TbConsInfo implements Serializable {
private String isCheck; private String isCheck;
@Transient @Transient
private String product; private List<Map<Integer, Object>> product;
public void copy(TbConsInfo source){ public void copy(TbConsInfo source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));

5
eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoRepository.java
View File

@ -9,6 +9,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* @website https://eladmin.vip * @website https://eladmin.vip
@ -26,11 +27,11 @@ public interface TbConsInfoRepository extends JpaRepository<TbConsInfo, Integer>
@Query(value = @Query(value =
"SELECT CONCAT(pro.id, '_', pro.NAME) AS product" + "SELECT pro.id, pro.name" +
" FROM" + " FROM" +
" tb_prosku_con conPro" + " tb_prosku_con conPro" +
" LEFT JOIN tb_product pro ON conPro.product_id = pro.id AND pro.shop_id = :shopId AND conPro.shop_id = :shopId" + " LEFT JOIN tb_product pro ON conPro.product_id = pro.id AND pro.shop_id = :shopId AND conPro.shop_id = :shopId" +
" where conPro.con_info_id = :conInfoId " + " where conPro.con_info_id = :conInfoId " +
" group by conPro.product_id ",nativeQuery = true) " group by conPro.product_id ",nativeQuery = true)
List<String> queryAllAndPro(@Param("shopId") Integer shopId,@Param("conInfoId")Integer conInfoId); List<Map<Integer, Object>> queryAllAndPro(@Param("shopId") Integer shopId, @Param("conInfoId")Integer conInfoId);
} }

4
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbConsInfoDto.java
View File

@ -22,6 +22,8 @@ import javax.persistence.Column;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
import java.util.Map;
/** /**
* @author admin * @author admin
@ -81,5 +83,5 @@ public class TbConsInfoDto implements Serializable {
private String isCheck; private String isCheck;
private String product; private List<Map<Integer, Object>> product;
} }

4
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
View File

@ -102,8 +102,8 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
Page<TbConsInfo> page = tbConsInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable); Page<TbConsInfo> page = tbConsInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable);
Page<TbConsInfoDto> result = page.map(tbConsInfoMapper::toDto); Page<TbConsInfoDto> result = page.map(tbConsInfoMapper::toDto);
result.getContent().forEach(it -> { result.getContent().forEach(it -> {
List<String> list = tbConsInfoRepository.queryAllAndPro(criteria.getShopId(), it.getId()); List<Map<Integer, Object>> list = tbConsInfoRepository.queryAllAndPro(criteria.getShopId(), it.getId());
it.setProduct(String.join(",", list)); it.setProduct(list);
}); });
return PageUtil.toPage(result); return PageUtil.toPage(result);
} }