fix

Helius

2021-07-07 1a3edbd0f4f581534485e93cbf10a83a16390779

fix

 gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java

@@ -69,4 +69,10 @@

    @ApiModelProperty(value = "集物员电话")
    private String jhyPhone;

    @ApiModelProperty(value = "回收/台")
    private String recycleTai;

    @ApiModelProperty(value = "回收/kg")
    private String recycleKg;
}

 gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml

@@ -16,11 +16,17 @@
            ,date_format(a.receiving_time, '%Y-%m-%d %H:%i') receivingTime
            ,CONCAT(a.reserve_date, ' ', a.reserve_time) reserveTime
            ,GROUP_CONCAT(b.title) items
            ,sum(b.score) recycleScore
            ,IFNULL(SUM(case when d.item_unit = '台' then b.weight
                else 0 end), 0) recycleTai
            ,IFNULL(SUM(case when d.item_unit = 'kg' then b.weight
                else 0 end), 0) recycleKg
            ,c.username jhyName
            ,c.mobile jhyPhone
        from xzx_jhy_order a
        inner join xzx_jhy_order_items b on a.id=b.order_id
        left join xzx_jhy_info c on a.jhy_id=c.user_id
        left join xzx_sys_environmental_info d on b.item_type = d.id
        <where>
            <if test="record.type == 1">
                and a.user_id=#{record.userId}

 gc-order/src/main/resources/mapper/order/SysEnvironmentalInfoMapper.xml

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xzx.gc.order.mapper.SysEnvironmentalInfoMapper">

</mapper>