Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

2025-10-28 855c37305ae40c123e1cb93565df3216377cdae6

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java

@@ -321,7 +321,7 @@
            // 其余的添加到其他
            List<SupplierSalesStatisticsGoodsTypeVO> otherList = supplierSalesStatisticsGoodsTypeVOS.subList(9, supplierSalesStatisticsGoodsTypeVOS.size());
            SupplierSalesStatisticsGoodsTypeVO other = new SupplierSalesStatisticsGoodsTypeVO();
            other.setTypeName("其他");
            other.setGoodsName("其他");
            other.setGoodsCount(otherList.stream().mapToInt(SupplierSalesStatisticsGoodsTypeVO::getGoodsCount).sum());
            supplierSalesStatisticsGoodsTypeVOS.add(other);
            supplierSalesStatisticsGoodsTypeVOS = supplierSalesStatisticsGoodsTypeVOS.subList(0, 9);
@@ -490,7 +490,7 @@
            // 其余的添加到其他
            List<ClinicSalesStatisticsGoodsTypeVO> otherList = clinicSalesStatisticsGoodsTypeVOS.subList(9, clinicSalesStatisticsGoodsTypeVOS.size());
            ClinicSalesStatisticsGoodsTypeVO other = new ClinicSalesStatisticsGoodsTypeVO();
            other.setTypeName("其他");
            other.setGoodsName("其他");
            other.setGoodsCount(otherList.stream().mapToInt(ClinicSalesStatisticsGoodsTypeVO::getGoodsCount).sum());
            clinicSalesStatisticsGoodsTypeVOS.add(other);
            clinicSalesStatisticsGoodsTypeVOS = clinicSalesStatisticsGoodsTypeVOS.subList(0, 9);
@@ -860,7 +860,7 @@
                List<ClinicSalesStatisticsGoodsTypeVO> thirtyMoneyProcurementStatisticsVOS = collect2.entrySet().stream().map(entry -> {
                    ClinicSalesStatisticsGoodsTypeVO clinicSalesStatisticsGoodsTypeVO = new ClinicSalesStatisticsGoodsTypeVO();
                    clinicSalesStatisticsGoodsTypeVO.setGoodsCount(entry.getValue().stream().mapToInt(TErpProcurementGoods::getPurchaseCount).sum());
                    clinicSalesStatisticsGoodsTypeVO.setTypeName(entry.getValue().get(0).getGoodsName());
                    clinicSalesStatisticsGoodsTypeVO.setGoodsName(entry.getValue().get(0).getGoodsName());
                    return clinicSalesStatisticsGoodsTypeVO;
                }).sorted(Comparator.comparing(ClinicSalesStatisticsGoodsTypeVO::getGoodsCount).reversed()).limit(9).collect(Collectors.toList());
                // 总数
@@ -869,7 +869,7 @@
                if (sum - sum1 > 0) {
                    ClinicSalesStatisticsGoodsTypeVO clinicSalesStatisticsGoodsTypeVO = new ClinicSalesStatisticsGoodsTypeVO();
                    clinicSalesStatisticsGoodsTypeVO.setGoodsCount(sum - sum1);
                    clinicSalesStatisticsGoodsTypeVO.setTypeName("其他");
                    clinicSalesStatisticsGoodsTypeVO.setGoodsName("其他");
                    thirtyMoneyProcurementStatisticsVOS.add(clinicSalesStatisticsGoodsTypeVO);
                }
                vo.setThirtyMoneyProcurementStatisticsVOS(thirtyMoneyProcurementStatisticsVOS);
@@ -1214,7 +1214,7 @@
            List<ClinicSalesStatisticsGoodsTypeVO> thirtyMoneyProcurementStatisticsVOS = collect2.entrySet().stream().map(entry -> {
                ClinicSalesStatisticsGoodsTypeVO clinicSalesStatisticsGoodsTypeVO = new ClinicSalesStatisticsGoodsTypeVO();
                clinicSalesStatisticsGoodsTypeVO.setGoodsCount(entry.getValue().stream().mapToInt(TErpProcurementGoods::getPurchaseCount).sum());
                clinicSalesStatisticsGoodsTypeVO.setTypeName(entry.getValue().get(0).getGoodsName());
                clinicSalesStatisticsGoodsTypeVO.setGoodsName(entry.getValue().get(0).getGoodsName());
                return clinicSalesStatisticsGoodsTypeVO;
            }).sorted(Comparator.comparing(ClinicSalesStatisticsGoodsTypeVO::getGoodsCount).reversed()).limit(9).collect(Collectors.toList());
            // 总数
@@ -1223,7 +1223,7 @@
            if (sum - sum1 > 0) {
                ClinicSalesStatisticsGoodsTypeVO clinicSalesStatisticsGoodsTypeVO = new ClinicSalesStatisticsGoodsTypeVO();
                clinicSalesStatisticsGoodsTypeVO.setGoodsCount(sum - sum1);
                clinicSalesStatisticsGoodsTypeVO.setTypeName("其他");
                clinicSalesStatisticsGoodsTypeVO.setGoodsName("其他");
                thirtyMoneyProcurementStatisticsVOS.add(clinicSalesStatisticsGoodsTypeVO);
            }
            vo.setThirtyMoneyProcurementStatisticsVOS(thirtyMoneyProcurementStatisticsVOS);
@@ -1431,7 +1431,7 @@
            List<ClinicSalesStatisticsGoodsTypeVO> thirtyMoneyProcurementStatisticsVOS = collect2.entrySet().stream().map(entry -> {
                ClinicSalesStatisticsGoodsTypeVO clinicSalesStatisticsGoodsTypeVO = new ClinicSalesStatisticsGoodsTypeVO();
                clinicSalesStatisticsGoodsTypeVO.setGoodsCount(entry.getValue().stream().mapToInt(TErpProcurementGoods::getPurchaseCount).sum());
                clinicSalesStatisticsGoodsTypeVO.setTypeName(entry.getValue().get(0).getGoodsName());
                clinicSalesStatisticsGoodsTypeVO.setGoodsName(entry.getValue().get(0).getGoodsName());
                return clinicSalesStatisticsGoodsTypeVO;
            }).sorted(Comparator.comparing(ClinicSalesStatisticsGoodsTypeVO::getGoodsCount).reversed()).limit(9).collect(Collectors.toList());
            // 总数
@@ -1440,7 +1440,7 @@
            if (sum - sum1 > 0) {
                ClinicSalesStatisticsGoodsTypeVO clinicSalesStatisticsGoodsTypeVO = new ClinicSalesStatisticsGoodsTypeVO();
                clinicSalesStatisticsGoodsTypeVO.setGoodsCount(sum - sum1);
                clinicSalesStatisticsGoodsTypeVO.setTypeName("其他");
                clinicSalesStatisticsGoodsTypeVO.setGoodsName("其他");
                thirtyMoneyProcurementStatisticsVOS.add(clinicSalesStatisticsGoodsTypeVO);
            }
            vo.setThirtyMoneyProcurementStatisticsVOS(thirtyMoneyProcurementStatisticsVOS);

 ruoyi-system/src/main/java/com/ruoyi/system/export/PlatformLedgerReportExport.java

@@ -22,9 +22,9 @@
    private String payTimeStr;
    @Excel(name = "采购金额", width = 20)
    private BigDecimal payMoney;
    @Excel(name = "供应商获得金额", width = 20)
    private BigDecimal money;
    @Excel(name = "平台分佣金额", width = 20)
    private BigDecimal money;
    @Excel(name = "供应商获得金额", width = 20)
    private BigDecimal supplierMoney;
    private LocalDateTime payTime;


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysProductIntroductionServiceImpl.java

@@ -14,6 +14,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.Set;
@@ -54,12 +55,7 @@
        pageInfo.setTotal(list.size());

        // 排序是否已读，未读的排前面,false排前面 true排后面
        list.stream().sorted((o1, o2) -> {
            if(o1.getIsView()){
                return 1;
            }
            return -1;
        }).collect(Collectors.toList());
//        list.sort(Comparator.comparing(TSysProductIntroductionVO::isView));

        if (pageInfo.getTotal() > index) {
            //此时存在数据

 ruoyi-system/src/main/java/com/ruoyi/system/vo/ClinicSalesStatisticsGoodsTypeVO.java

@@ -9,8 +9,8 @@
@Data
@ApiModel(value = "诊所销售统计销售前十占比ClinicSalesStatisticsGoodsTypeVO")
public class ClinicSalesStatisticsGoodsTypeVO implements Serializable {
    @ApiModelProperty(value = "类型名称")
    private String typeName;
    @ApiModelProperty(value = "商品名称")
    private String goodsName;
    @ApiModelProperty(value = "商品数量")
    private Integer goodsCount;


 ruoyi-system/src/main/java/com/ruoyi/system/vo/SupplierSalesStatisticsGoodsTypeVO.java

@@ -10,8 +10,8 @@
@Data
@ApiModel(value = "供应商销售统计销售前十占比SupplierSalesStatisticsGoodsTypeVO")
public class SupplierSalesStatisticsGoodsTypeVO implements Serializable {
    @ApiModelProperty(value = "类型名称")
    private String typeName;
    @ApiModelProperty(value = "商品名称")
    private String goodsName;
    @ApiModelProperty(value = "商品数量")
    private Integer goodsCount=0;


 ruoyi-system/src/main/resources/mapper/system/TErpProcurementMapper.xml

@@ -184,7 +184,7 @@
    </select>
    <select id="supplierSalesStatisticsGoodsType"
            resultType="com.ruoyi.system.vo.SupplierSalesStatisticsGoodsTypeVO">
        select count(1), tegt.type_name
        select count(1), tegt.goods_name
        from t_erp_procurement tep
                 left join t_erp_procurement_goods tepg on tep.id = tepg.procurement_id
                 left join t_erp_goods teg on tepg.goods_id = teg.id
@@ -193,7 +193,6 @@
          and tep.status in (3,4,5)
          and tep.pay_time between #{startTime} and #{endTime}
          and tep.supplier_id = #{supplierId}
        group by teg.type_id
        order by count(1) desc
    </select>
    <select id="supplierSalesStatisticsGoodsCount"

 ruoyi-system/src/main/resources/mapper/system/TSysOrderMapper.xml

@@ -70,15 +70,12 @@
    </select>
    <select id="clinicSalesStatisticsGoodsType"
            resultType="com.ruoyi.system.vo.ClinicSalesStatisticsGoodsTypeVO">
        select count(1), tegt.type_name
        select count(1), tsog.goods_name
        from t_sys_order tso
                 left join t_sys_order_goods tsog on tso.id = tsog.order_id
                 left join t_erp_goods teg on tsog.goods_id = teg.id
                 left join t_erp_goods_type tegt on teg.type_id = tegt.id
        where tso.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
          and tso.pay_time between #{startTime} and #{endTime}
          and tso.clinic_id = #{clinicId}
        group by teg.type_id
        order by count(1) desc
    </select>
    <select id="clinicSalesStatisticsGoodsCount"