添加了产品看板

hx-account/src/main/java/com/fjhx/account/entity/account/po/AccountPayment.java

@@ -61,7 +61,7 @@ public class AccountPayment extends BasePo {
     private BigDecimal amount;
 
     /**
-     * 打款状态（字典（payment_status）
+     * 打款状态(10已打款 20 未打款)
      */
     private String status;
 

hx-item/src/main/java/com/fjhx/item/mapper/product/ProductInfoMapper.java

@@ -38,7 +38,11 @@ public interface ProductInfoMapper extends BaseMapper<ProductInfo> {
      *
      * @return
      */
-    List<ProductInfoVo> getListByProductType(@Param("productType") Integer productType, @Param("definition") Integer definition);
+    List<ProductInfoVo> getListByProductType(@Param("productType") Integer productType,
+                                             @Param("definition") Integer definition,
+                                             @Param("productName") String productName,
+                                             @Param("productCode") String productCode
+    );
 
     /**
      * 产品类型排行（数据看板-产品分析页面）

hx-item/src/main/java/com/fjhx/item/service/product/ProductInfoService.java

@@ -107,7 +107,7 @@ public interface ProductInfoService extends BaseService<ProductInfo> {
      *
      * @return
      */
-    List<ProductInfoVo> getListByProductType(Integer productType, Integer definition);
+    List<ProductInfoVo> getListByProductType(Integer productType, Integer definition,String productName,String productCode);
 
     /**
      * excel导入

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -537,8 +537,8 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
      * @return
      */
     @Override
-    public List<ProductInfoVo> getListByProductType(Integer productType, Integer definition) {
-        return baseMapper.getListByProductType(productType, definition);
+    public List<ProductInfoVo> getListByProductType(Integer productType, Integer definition,String productName,String productCode) {
+        return baseMapper.getListByProductType(productType, definition,productName,productCode);
     }
 
     @Override

hx-item/src/main/resources/mapper/product/ProductInfoMapper.xml

@@ -57,6 +57,13 @@
             <if test="definition neq null">
                 and t1.definition = #{definition}
             </if>
+
+            <if test="productName neq null and productName neq '' ">
+                and t1.name = #{productName}
+            </if>
+            <if test="productCode neq null and productName neq ''">
+                and t1.code = #{productCode}
+            </if>
         </where>
     </select>
     <select id="productTypeRanking" resultType="com.fjhx.item.entity.product.vo.ProductInfoVo">

hx-purchase/src/main/java/com/fjhx/purchase/controller/subscribe/SubscribeDetailController.java

@@ -12,6 +12,7 @@ import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -19,7 +20,7 @@ import java.util.List;
  * 申购单 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-03
  */
 @DS(SourceConstant.PURCHASE)
@@ -39,6 +40,14 @@ public class SubscribeDetailController {
     }
 
     /**
+     * 申购统计（申购单分页）
+     */
+    @PostMapping("/subscribeStatistics")
+    public Map<String,Object> subscribeStatistics(@RequestBody SubscribeDetailSelectDto dto) {
+        return subscribeDetailService.subscribeStatistics(dto);
+    }
+
+    /**
      * 待采购 维多利亚
      */
     @PostMapping("/pageByWdly")

hx-purchase/src/main/java/com/fjhx/purchase/entity/subscribe/dto/SubscribeDetailSelectDto.java

@@ -22,6 +22,11 @@ public class SubscribeDetailSelectDto extends BaseSelectDto {
     private Integer productType;
 
     /**
+     * 产品编码
+     */
+    private String productCode;
+
+    /**
      * 状态
      */
     private String status;
@@ -53,4 +58,20 @@ public class SubscribeDetailSelectDto extends BaseSelectDto {
      */
     private String neStatus;
 
+    /**
+     * 产品名称
+     */
+    private String productName;
+
+
+
+    /**
+     * 申购编码
+     */
+    private String code;
+
+    /**
+     * 申购状态 0草稿 10、审批中；20、驳回  30、通过
+     */
+    private Integer subscribeStatus;
 }

hx-purchase/src/main/java/com/fjhx/purchase/entity/subscribe/vo/SubscribeDetailVo.java

@@ -76,4 +76,24 @@ public class SubscribeDetailVo extends SubscribeDetail {
      * 流程id
      */
     private Long flowId;
+
+    /**
+     * 产品类型
+     */
+    private String productType;
+
+    /**
+     * 个数
+     */
+    private Integer counts;
+
+    /**
+     * 货品种类个数
+     */
+    private Integer typeCount;
+
+    /**
+     * 产品类型
+     */
+    private String type;
 }

hx-purchase/src/main/java/com/fjhx/purchase/mapper/subscribe/SubscribeDetailMapper.java

@@ -1,5 +1,6 @@
 package com.fjhx.purchase.mapper.subscribe;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fjhx.purchase.entity.subscribe.po.SubscribeDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,7 +17,7 @@ import java.util.List;
  * 申购单 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-03
  */
 public interface SubscribeDetailMapper extends BaseMapper<SubscribeDetail> {
@@ -32,4 +33,6 @@ public interface SubscribeDetailMapper extends BaseMapper<SubscribeDetail> {
      * @return
      */
     List<SubscribeDetailVo> getDetail(@Param("ids")List<Long> ids);
+
+    List<SubscribeDetailVo> subscribeStatistics(@Param("ew") QueryWrapper<Object> query);
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/SubscribeDetailService.java

@@ -8,6 +8,7 @@ import com.fjhx.purchase.entity.subscribe.dto.SubscribeDetailSelectDto;
 import com.fjhx.purchase.entity.subscribe.dto.SubscribeDetailDto;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -50,4 +51,8 @@ public interface SubscribeDetailService extends BaseService<SubscribeDetail> {
      */
     void delete(Long id);
 
+    /**
+     * 申购统计（申购单分页）
+     */
+    Map<String, Object> subscribeStatistics(SubscribeDetailSelectDto dto);
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeDetailServiceImpl.java

@@ -3,7 +3,10 @@ package com.fjhx.purchase.service.subscribe.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
@@ -18,19 +21,22 @@ import com.fjhx.purchase.entity.subscribe.vo.SubscribeDetailVo;
 import com.fjhx.purchase.mapper.subscribe.SubscribeDetailMapper;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
 import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
+import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
+import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
+import com.fjhx.tenant.service.dict.DictTenantDataService;
 import com.fjhx.wms.entity.warehouse.po.Warehouse;
 import com.fjhx.wms.service.warehouse.WarehouseService;
 import com.obs.services.internal.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.commons.collections4.MapUtils;
+import org.apache.poi.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -54,6 +60,9 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
     @Autowired
     PurchaseDetailService purchaseDetailService;
 
+    @Autowired
+    private DictTenantDataService dictTenantDataService;
+
     /**
      * 分页
      *
@@ -63,12 +72,24 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
     @Override
     public Page<SubscribeDetailVo> getPage(SubscribeDetailSelectDto dto) {
         IWrapper<SubscribeDetail> wrapper = getWrapper();
+        //申购单号
+        wrapper.like(StringUtils.isEmpty(dto.getCode()),"t2.code",dto.getCode());
+
+        //申购时间
+        wrapper.ge(ObjectUtil.isNotEmpty(dto.getBeginTime()),"t2.create_time",dto.getBeginTime());
+        wrapper.ge(ObjectUtil.isNotEmpty(dto.getEndTime()),"t2.create_time",dto.getEndTime());
+        wrapper.ge(ObjectUtil.isNotEmpty(dto.getSubscribeStatus()),"t2.subcribe_status",dto.getSubscribeStatus());
+
         if (ObjectUtil.isNotEmpty(dto.getStatus())) {
             wrapper.in("t1", SubscribeDetail::getStatus, Arrays.asList(dto.getStatus().split(",")));
         }
 
         // 如果类型存在带入类型查询
-        List<ProductInfoVo> productList = productInfoService.getListByProductType(dto.getProductType(), dto.getDefinition());
+        List<ProductInfoVo> productList = productInfoService.getListByProductType(dto.getProductType(),
+                                                                dto.getDefinition(),
+                                                                dto.getProductName(),
+                                                                dto.getProductCode()
+        );
         if (ObjectUtil.isEmpty(productList)) {
             return new Page<>();
         }
@@ -228,4 +249,65 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
         this.removeById(id);
     }
 
+    /**
+     * 申购统计（申购单分页）
+     */
+    @Override
+    public Map<String, Object> subscribeStatistics(SubscribeDetailSelectDto dto) {
+        //存放申购统计数据
+        Map<String, Object> map = new HashMap<>();
+
+        //存放申购统计详情数据
+        List<Map<String,Object>> list = new ArrayList<>();
+
+        QueryWrapper<Object> query = Wrappers.query();
+        query.groupBy("pi.type");
+        //查询申购统计（产品类型分组）
+        List<SubscribeDetailVo> subscribeDetailVos = baseMapper.subscribeStatistics(query);
+        Map<String, List<SubscribeDetailVo>> subscribeDetailVoMap = subscribeDetailVos.stream()
+                .collect(Collectors.groupingBy(SubscribeDetailVo::getType));
+
+        //计算申购笔合计数据
+        Integer amount = subscribeDetailVos.stream().map(SubscribeDetailVo::getCounts).reduce(Integer::sum).orElse(0);
+        map.put("amount",amount);
+        //计算申购货品种类合计数据
+        Integer typeAmount = subscribeDetailVos.stream().map(SubscribeDetailVo::getTypeCount).reduce(Integer::sum).orElse(0);
+        map.put("typeAmount",typeAmount);
+        //切换数据源
+        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+        //获取产品类型字典数据
+        List<DictTenantDataVo> dictTenantDataVoList = getDict("product_type");
+        DynamicDataSourceContextHolder.poll();
+
+        if (ObjectUtil.isEmpty(dictTenantDataVoList)){
+            throw  new ServiceException("数据有误：产品没有配置产品类型字典，请先添加产品类型字典");
+        }
+
+        //赋值笔数、货品种类数据
+        for (DictTenantDataVo dictTenantDataVo : dictTenantDataVoList) {
+            //设置初始值
+            Map<String,Object> typeMap = new HashMap<>();
+            typeMap.put("type",dictTenantDataVo.getDictValue());
+            typeMap.put("count",0);
+            typeMap.put("typeCount",0);
+
+            //赋值
+            List<SubscribeDetailVo> subscribeDetailVoList = subscribeDetailVoMap.get(dictTenantDataVo.getDictKey());
+            if (ObjectUtil.isNotEmpty(subscribeDetailVoList)){
+                typeMap.put("count",subscribeDetailVoList.get(0).getCounts());
+                typeMap.put("typeCount",subscribeDetailVoList.get(0).getTypeCount());
+            }
+            list.add(typeMap);
+        }
+        map.put("productTypeList",list);
+        return map;
+    }
+
+    //根据字典编码获取字典的数据
+    private List<DictTenantDataVo> getDict(String code){
+        DictTenantDataSelectDto dto = new DictTenantDataSelectDto();
+        dto.setDictCode(code);
+        return dictTenantDataService.getList(dto);
+    }
+
 }

hx-purchase/src/main/resources/mapper/subscribe/SubscribeDetailMapper.xml

@@ -37,4 +37,15 @@
         GROUP BY
             t1.id
     </select>
+    <select id="subscribeStatistics" resultType="com.fjhx.purchase.entity.subscribe.vo.SubscribeDetailVo">
+        SELECT
+            count(DISTINCT(pi.id)) typeCount,
+            count(DISTINCT(su.id)) counts,
+	        ifnull(pi.type,-1) type
+        FROM
+            subscribe su
+            LEFT JOIN subscribe_detail sd ON su.id = sd.subscribe_id
+            LEFT JOIN bytesailing_item.product_info pi ON sd.bussiness_id = pi.id
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

hx-sale/src/main/java/com/fjhx/sale/controller/claim/ClaimController.java

@@ -1,6 +1,8 @@
 package com.fjhx.sale.controller.claim;
 
 import com.fjhx.sale.entity.claim.po.Claim;
+import com.fjhx.sale.entity.claim.po.ClaimContract;
+import com.fjhx.sale.entity.claim.vo.ClaimContractVo;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.claim.vo.ClaimVo;
@@ -11,6 +13,7 @@ import com.fjhx.sale.service.claim.ClaimService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 
 /**
@@ -18,7 +21,7 @@ import java.math.BigDecimal;
  * 到账认领 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-18
  */
 @RestController
@@ -76,4 +79,13 @@ public class ClaimController {
         return claimService.sumClaimMoney(businessId);
     }
 
+
+    /**
+     * 查询认领记录
+     */
+    @PostMapping("/claimRecord")
+    public List<ClaimContractVo> claimRecord(@RequestBody Claim claim) {
+        return claimService.claimRecord(claim.getBusinessId());
+    }
+
 }

hx-sale/src/main/java/com/fjhx/sale/entity/claim/vo/ClaimContractVo.java

@@ -7,11 +7,21 @@ import lombok.Setter;
 /**
  * 到账认领-合同关联表列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-04-18
  */
 @Getter
 @Setter
 public class ClaimContractVo extends ClaimContract {
 
+
+    /**
+     * 认领人ID
+     */
+    private  Long claimUserId;
+
+    /**
+     * 认领人名称
+     */
+    private  String claimUserName;
 }

hx-sale/src/main/java/com/fjhx/sale/entity/claim/vo/ClaimVo.java

@@ -1,20 +1,25 @@
 package com.fjhx.sale.entity.claim.vo;
 
 import com.fjhx.sale.entity.claim.po.Claim;
+import com.fjhx.sale.entity.claim.po.ClaimContract;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 到账认领列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-04-18
  */
 @Getter
 @Setter
 public class ClaimVo extends Claim {
 
-
+    /**
+     * 认领合同列表
+     */
+    List<ClaimContract> claimContracts;
 }

hx-sale/src/main/java/com/fjhx/sale/mapper/claim/ClaimMapper.java

@@ -1,19 +1,23 @@
 package com.fjhx.sale.mapper.claim;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fjhx.sale.entity.claim.po.Claim;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.claim.vo.ClaimContractVo;
 import com.fjhx.sale.entity.claim.vo.ClaimVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 /**
  * <p>
  * 到账认领 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-18
  */
 public interface ClaimMapper extends BaseMapper<Claim> {
@@ -23,4 +27,8 @@ public interface ClaimMapper extends BaseMapper<Claim> {
      */
     Page<ClaimVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Claim> wrapper);
 
+    /**
+     * 查询认领记录 businessId 流水表ID
+     */
+    List<ClaimContractVo> claimRecord(@Param("ew") LambdaQueryWrapper<Claim> eq);
 }

hx-sale/src/main/java/com/fjhx/sale/service/claim/ClaimService.java

@@ -1,6 +1,8 @@
 package com.fjhx.sale.service.claim;
 
 import com.fjhx.sale.entity.claim.po.Claim;
+import com.fjhx.sale.entity.claim.po.ClaimContract;
+import com.fjhx.sale.entity.claim.vo.ClaimContractVo;
 import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.claim.vo.ClaimVo;
@@ -8,6 +10,7 @@ import com.fjhx.sale.entity.claim.dto.ClaimSelectDto;
 import com.fjhx.sale.entity.claim.dto.ClaimDto;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 
 /**
@@ -15,7 +18,7 @@ import java.math.BigDecimal;
  * 到账认领 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-18
  */
 public interface ClaimService extends BaseService<Claim> {
@@ -50,4 +53,8 @@ public interface ClaimService extends BaseService<Claim> {
      */
     BigDecimal sumClaimMoney(Long businessId);
 
+    /**
+     * 查询认领记录
+     */
+    List<ClaimContractVo> claimRecord(Long businessId);
 }

hx-sale/src/main/java/com/fjhx/sale/service/claim/impl/ClaimServiceImpl.java

@@ -6,17 +6,21 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.account.entity.account.po.AccountRunningWater;
+import com.fjhx.account.entity.account.vo.AccountPaymentVo;
 import com.fjhx.account.service.account.AccountRunningWaterService;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.sale.entity.claim.po.Claim;
 import com.fjhx.sale.entity.claim.po.ClaimContract;
+import com.fjhx.sale.entity.claim.vo.ClaimContractVo;
 import com.fjhx.sale.mapper.claim.ClaimMapper;
 import com.fjhx.sale.service.claim.ClaimContractService;
 import com.fjhx.sale.service.claim.ClaimService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.obs.services.internal.ServiceException;
+import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -36,7 +40,7 @@ import java.util.stream.Collectors;
  * 到账认领 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-18
  */
 @Service
@@ -143,4 +147,18 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
         return claim==null?BigDecimal.ZERO:claim.getSumAmount();
     }
 
+    /**
+     * 查询认领记录 businessId 流水表ID
+     */
+    @Override
+    public List<ClaimContractVo>  claimRecord(Long businessId) {
+        //查询认领合同表的信息
+        List<ClaimContractVo> claimContractVoList = baseMapper.claimRecord(Wrappers.<Claim>lambdaQuery().eq(Claim::getBusinessId, businessId));
+
+        // 赋值用户名称
+        UserUtil.assignmentNickName(claimContractVoList,ClaimContractVo::getClaimUserId, ClaimContractVo::setClaimUserName);
+
+        return claimContractVoList;
+    }
+
 }

hx-sale/src/main/resources/mapper/claim/ClaimMapper.xml

@@ -18,5 +18,14 @@
         from claim c
             ${ew.customSqlSegment}
     </select>
+    <select id="claimRecord" resultType="com.fjhx.sale.entity.claim.vo.ClaimContractVo">
+        SELECT
+            cc.*,
+            cl.claim_user_id  claimUserId
+        FROM
+            claim cl
+                LEFT JOIN claim_contract cc ON cl.id = cc.claim_id
+            ${ew.customSqlSegment}
+    </select>
 
 </mapper>