Merge remote-tracking branch 'origin/dev_New' into dev_New

maven

10 天以前 539624ef39177ebb6fd5577b83df7097dd6f4bec

 src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml

对比新文件
@@ -0,0 +1,39 @@
<?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.ruoyi.purchase.mapper.PurchaseReturnOrdersMapper">

    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.purchase.pojo.PurchaseReturnOrders">
        <id column="id" property="id" />
        <result column="no" property="no" />
        <result column="return_type" property="returnType" />
        <result column="supplier_id" property="supplierId" />
        <result column="project_id" property="projectId" />
        <result column="project_phase" property="projectPhase" />
        <result column="prepared_at" property="preparedAt" />
        <result column="prepared_user_id" property="preparedUserId" />
        <result column="return_user_id" property="returnUserId" />
        <result column="purchase_ledger_id" property="purchaseLedgerId" />
        <result column="remark" property="remark" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
    </resultMap>

    <select id="listPage" resultType="com.ruoyi.purchase.vo.PurchaseReturnOrderVo">
        SELECT
        pro.*,
        sm.supplier_name as supplierName,
        pl.purchase_contract_number as purchaseContractNumber,
        su.user_name as returnUserName,
        su1.user_name as createUserName
        FROM purchase_return_orders pro
        LEFT JOIN supplier_manage sm ON pro.supplier_id = sm.id
        LEFT JOIN purchase_ledger pl ON pl.id = pro.purchase_ledger_id
        LEFT JOIN sys_user su ON su.user_id = pro.return_user_id
        LEFT JOIN sys_user su1 ON su1.user_id = pro.prepared_user_id
        where 1=1
        <if test="params.no != null and params.no != '' ">
            AND pro.no LIKE CONCAT('%',#{params.no},'%')
        </if>
    </select>
</mapper>