|
@@ -133,8 +133,8 @@
|
|
|
and i.business_no like concat (#{item.businessNo},'%')
|
|
|
</if>
|
|
|
<if test="item!=null and item.isCurYear!=null and item.isCurYear==true">
|
|
|
- AND i.sign_date >= concat( YEAR ( now())- 1, '-12-23' )
|
|
|
- AND i.sign_date <= concat( YEAR ( now()), '-12-22' )
|
|
|
+ AND i.upload_date >= concat( YEAR ( now())- 1, '-12-23' )
|
|
|
+ AND i.upload_date <= concat( YEAR ( now()), '-12-22' )
|
|
|
</if>
|
|
|
<if test="item!=null and item.clientManager!=null and item.clientManager!='' ">
|
|
|
and u.name like concat ('%',#{item.clientManager},'%')
|
|
@@ -355,8 +355,8 @@
|
|
|
and i.business_no like concat (#{item.businessNo},'%')
|
|
|
</if>
|
|
|
<if test="item!=null and item.isCurYear!=null and item.isCurYear==true">
|
|
|
- AND i.sign_date >= concat( YEAR ( now())- 1, '-12-23' )
|
|
|
- AND i.sign_date <= concat( YEAR ( now()), '-12-22' )
|
|
|
+ AND i.upload_date >= concat( YEAR ( now())- 1, '-12-23' )
|
|
|
+ AND i.upload_date <= concat( YEAR ( now()), '-12-22' )
|
|
|
</if>
|
|
|
<if test="item!=null and item.clientManager!=null and item.clientManager!='' ">
|
|
|
and u.name like concat ('%',#{item.clientManager},'%')
|