销售台账功能修改

chenrui

4 天以前 4b61be20efa8cdc1a9086b07a2fdc16725c55099

销售台账功能修改

 src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.pojo.SalesLedger;
import org.apache.ibatis.annotations.Param;

@@ -27,4 +28,11 @@
    List getSalesNo();

    <T> BigDecimal selectSum(LambdaQueryWrapper<T> wrapper, SFunction<T, BigDecimal> column);

    /**
     *
     * @param salesLedgerDto
     * @return
     */
    List<SalesLedger> selectSalesLedgerList(@Param("salesLedgerDto") SalesLedgerDto salesLedgerDto);
}

 src/main/java/com/ruoyi/sales/pojo/SalesLedger.java

@@ -71,9 +71,13 @@
    /**
     * 录入人
     */
    @Excel(name = "录入人")
    private String entryPerson;

    @TableField(exist = false)
    @ApiModelProperty(value = "录入人")
    @Excel(name = "录入人")
    private String entryPersonName;

    /**
     * 备注
     */

 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java

@@ -82,11 +82,7 @@

    @Override
    public List<SalesLedger> selectSalesLedgerList(SalesLedgerDto salesLedgerDto) {
        LambdaQueryWrapper<SalesLedger> queryWrapper = new LambdaQueryWrapper<>();
        if (StringUtils.isNotBlank(salesLedgerDto.getCustomerName())) {
            queryWrapper.eq(SalesLedger::getCustomerName, salesLedgerDto.getCustomerName());
        }
        return salesLedgerMapper.selectList(queryWrapper);
        return salesLedgerMapper.selectSalesLedgerList(salesLedgerDto);
    }

    public SalesLedgerDto getSalesLedgerWithProducts(SalesLedgerDto salesLedgerDto) {

 src/main/resources/mapper/sales/SalesLedgerMapper.xml

@@ -12,4 +12,30 @@
    <select id="getSalesNo" resultType="com.ruoyi.sales.pojo.SalesLedger">
        
    </select>

    <select id="selectSalesLedgerList" resultType="com.ruoyi.sales.pojo.SalesLedger">
        SELECT
            T1.id,
            T1.sales_contract_no,
            T1.customer_contract_no,
            T1.project_name,
            T1.entry_date,
            T1.salesman,
            T1.customer_id,
            T1.customer_name,
            T1.entry_person,
            T1.remarks,
            T1.attachment_materials,
            T1.tenant_id,
            T1.contract_amount,
            T2.nick_name AS entry_person_name
        FROM
            sales_ledger T1
        LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
        <where>
            <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
                T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
            </if>
        </where>
    </select>
</mapper>