|
|
@@ -303,6 +303,11 @@
|
|
|
LEFT JOIN business_commission_rate bcr ON bcr.id = t.commission_rate_id
|
|
|
LEFT JOIN dict_data dd ON dd.id = bcr.business_cate_id
|
|
|
LEFT JOIN user u1 ON u1.id = t.declare_user_id
|
|
|
+ <where>
|
|
|
+ <if test="checkVO!=null and checkVO.businessCate!=null and checkVO.businessCate!='' ">
|
|
|
+ and dd.NAME = #{checkVO.businessCate}
|
|
|
+ </if>
|
|
|
+ </where>
|
|
|
</sql>
|
|
|
|
|
|
<select id="selectMajorSimple" resultType="com.dayou.dto.MajorDeclareSimpleDTO">
|
|
|
@@ -319,6 +324,15 @@
|
|
|
LEFT JOIN ( SELECT id, name, major_id, report_no FROM major_production WHERE deleted = 0 ) mp ON
|
|
|
m.id = mp.major_id
|
|
|
where m.id = #{majorId} and mp.id= #{prodId}
|
|
|
+ <if test="checkVO!=null and checkVO.orderId!=null and checkVO.orderId!='' ">
|
|
|
+ and m.order_id like concat('%',#{checkVO.orderId},'%')
|
|
|
+ </if>
|
|
|
+ <if test="checkVO!=null and checkVO.orderName!=null and checkVO.orderName!='' ">
|
|
|
+ and m.NAME like concat('%',#{checkVO.orderName},'%')
|
|
|
+ </if>
|
|
|
+ <if test="checkVO!=null and checkVO.reportNo!=null and checkVO.reportNo!='' ">
|
|
|
+ and mp.report_no like concat('%',#{checkVO.reportNo},'%')
|
|
|
+ </if>
|
|
|
</if>
|
|
|
<if test="majorId!=null and prodId==null">
|
|
|
SELECT
|
|
|
@@ -328,6 +342,13 @@
|
|
|
FROM
|
|
|
major m
|
|
|
where m.id = #{majorId}
|
|
|
+ <if test="checkVO!=null and checkVO.orderId!=null and checkVO.orderId!='' ">
|
|
|
+ and m.order_id like concat('%',#{checkVO.orderId},'%')
|
|
|
+ </if>
|
|
|
+ <if test="checkVO!=null and checkVO.orderName!=null and checkVO.orderName!='' ">
|
|
|
+ and m.NAME like concat('%',#{checkVO.orderName},'%')
|
|
|
+ </if>
|
|
|
+
|
|
|
</if>
|
|
|
</select>
|
|
|
<select id="todoCheckPage" parameterType="com.dayou.vo.CommissionDeclareTodoCheckVO" resultMap="majorDeclareTodoCheckMap">
|
