|
@@ -22,8 +22,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="delFlag" column="del_flag" />
|
|
<result property="delFlag" column="del_flag" />
|
|
|
<result property="createBy" column="create_by" />
|
|
<result property="createBy" column="create_by" />
|
|
|
<result property="updateBy" column="update_by" />
|
|
<result property="updateBy" column="update_by" />
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
<result property="orderType" column="order_type" />
|
|
<result property="orderType" column="order_type" />
|
|
|
<result property="senderCity" column="sender_city" />
|
|
<result property="senderCity" column="sender_city" />
|
|
|
<result property="receiverCity" column="receiver_city" />
|
|
<result property="receiverCity" column="receiver_city" />
|
|
@@ -31,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="goodsWeight" column="goods_weight" />
|
|
<result property="goodsWeight" column="goods_weight" />
|
|
|
<result property="productCode" column="product_code" />
|
|
<result property="productCode" column="product_code" />
|
|
|
<result property="userName" column="user_name" />
|
|
<result property="userName" column="user_name" />
|
|
|
-
|
|
|
|
|
|
|
+ <result property="summaryMonth" column="summaryMonth" />
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -54,14 +52,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
a.fee_item_code,
|
|
a.fee_item_code,
|
|
|
a.fee_item_name,
|
|
a.fee_item_name,
|
|
|
ifnull( a.adjust_amount, a.rate_amount ) rate_amount,
|
|
ifnull( a.adjust_amount, a.rate_amount ) rate_amount,
|
|
|
- a.adjust_amount,
|
|
|
|
|
|
|
+ DATE_FORMAT( b.sign_time, '%Y.%m' ) summaryMonth,
|
|
|
a.remark,
|
|
a.remark,
|
|
|
a.create_time,
|
|
a.create_time,
|
|
|
a.update_time,
|
|
a.update_time,
|
|
|
a.dept_id,
|
|
a.dept_id,
|
|
|
a.del_flag,
|
|
a.del_flag,
|
|
|
a.create_by,
|
|
a.create_by,
|
|
|
- a.update_by
|
|
|
|
|
|
|
+ a.update_by,u.nick_name user_name
|
|
|
FROM
|
|
FROM
|
|
|
biz_waybill_cost_details a
|
|
biz_waybill_cost_details a
|
|
|
LEFT JOIN biz_waybill_order b ON a.waybill_id = b.waybill_id
|
|
LEFT JOIN biz_waybill_order b ON a.waybill_id = b.waybill_id
|
|
@@ -73,15 +71,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<include refid="selectBizWaybillCostDetailsVo"/>
|
|
<include refid="selectBizWaybillCostDetailsVo"/>
|
|
|
<where>
|
|
<where>
|
|
|
b.order_status = 6
|
|
b.order_status = 6
|
|
|
- <if test="monthCode != null "> AND DATE_FORMAT( b.sign_time, '%Y.%m' ) = #{monthCode}</if>
|
|
|
|
|
|
|
+ <if test="summaryMonth != null "> AND DATE_FORMAT( b.sign_time, '%Y.%m' ) = #{summaryMonth}</if>
|
|
|
<if test="deptId != null "> AND a.dept_id = #{deptId}</if>
|
|
<if test="deptId != null "> AND a.dept_id = #{deptId}</if>
|
|
|
|
|
+ <if test="externalWaybillNo != null and externalWaybillNo != ''"> and a.external_waybill_no = #{externalWaybillNo}</if>
|
|
|
|
|
|
|
|
-
|
|
|
|
|
- <!-- 数据范围过滤 -->
|
|
|
|
|
- ${params.dataScope}
|
|
|
|
|
|
|
+ <!-- <!– 数据范围过滤 –>
|
|
|
|
|
+ ${params.dataScope}-->
|
|
|
|
|
|
|
|
<!-- <if test="waybillId != null "> and waybill_id = #{waybillId}</if>
|
|
<!-- <if test="waybillId != null "> and waybill_id = #{waybillId}</if>
|
|
|
- <if test="externalWaybillNo != null and externalWaybillNo != ''"> and external_waybill_no = #{externalWaybillNo}</if>
|
|
|
|
|
|
|
+
|
|
|
<if test="feeItemCode != null and feeItemCode != ''"> and fee_item_code = #{feeItemCode}</if>
|
|
<if test="feeItemCode != null and feeItemCode != ''"> and fee_item_code = #{feeItemCode}</if>
|
|
|
<if test="feeItemName != null and feeItemName != ''"> and fee_item_name like concat('%', #{feeItemName}, '%')</if>
|
|
<if test="feeItemName != null and feeItemName != ''"> and fee_item_name like concat('%', #{feeItemName}, '%')</if>
|
|
|
<if test="feeName != null and feeName != ''"> and fee_name like concat('%', #{feeName}, '%')</if>
|
|
<if test="feeName != null and feeName != ''"> and fee_name like concat('%', #{feeName}, '%')</if>
|
|
@@ -112,7 +110,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="userId != null "> and user_id = #{userId}</if>-->
|
|
<if test="userId != null "> and user_id = #{userId}</if>-->
|
|
|
</where>
|
|
</where>
|
|
|
</select>
|
|
</select>
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ <select id="getAccountAdjustmentById" parameterType="com.ruoyi.logistics.domain.BizWaybillCostDetails" resultMap="BizWaybillCostDetailsResult">
|
|
|
|
|
+ SELECT
|
|
|
|
|
+ a.waybill_detail_id,
|
|
|
|
|
+ b.sign_time,
|
|
|
|
|
+ b.external_waybill_no,
|
|
|
|
|
+ b.sender_city,
|
|
|
|
|
+ b.receiver_city,
|
|
|
|
|
+ b.goods_weight,
|
|
|
|
|
+ b.order_type,
|
|
|
|
|
+ b.product_code,
|
|
|
|
|
+ a.waybill_id,
|
|
|
|
|
+ a.external_waybill_no,
|
|
|
|
|
+ a.fee_item_code,
|
|
|
|
|
+ a.fee_item_name,
|
|
|
|
|
+ ifnull( a.adjust_amount, a.rate_amount ) rate_amount,
|
|
|
|
|
+ DATE_FORMAT( b.sign_time, '%Y.%m' ) summaryMonth,
|
|
|
|
|
+ a.remark,
|
|
|
|
|
+ a.create_time,
|
|
|
|
|
+ a.update_time,
|
|
|
|
|
+ a.dept_id,
|
|
|
|
|
+ a.update_by,u.nick_name user_name
|
|
|
|
|
+ FROM
|
|
|
|
|
+ biz_waybill_cost_details a
|
|
|
|
|
+ LEFT JOIN biz_waybill_order b ON a.waybill_id = b.waybill_id
|
|
|
|
|
+ LEFT JOIN sys_user u ON b.user_id = u.user_id
|
|
|
|
|
+ LEFT JOIN sys_dept d ON a.dept_id = d.dept_id
|
|
|
|
|
+
|
|
|
|
|
+ <where>
|
|
|
|
|
+
|
|
|
|
|
+ <if test="waybillId != null "> and waybill_detail_id = #{waybillDetailId}</if>
|
|
|
|
|
+
|
|
|
|
|
+ </where>
|
|
|
|
|
+ </select>
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
<select id="selectBizWaybillCostDetailsByWaybillDetailId" parameterType="Long" resultMap="BizWaybillCostDetailsResult">
|
|
<select id="selectBizWaybillCostDetailsByWaybillDetailId" parameterType="Long" resultMap="BizWaybillCostDetailsResult">
|
|
|
<include refid="selectBizWaybillCostDetailsVo"/>
|
|
<include refid="selectBizWaybillCostDetailsVo"/>
|
|
|
where a.waybill_detail_id = #{waybillDetailId}
|
|
where a.waybill_detail_id = #{waybillDetailId}
|