sun15684712291/impm_zxf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0820-需求变更

Browse Source
This commit is contained in:
sunyg
2025-08-21 10:51:55 +08:00
parent eb1c8d5e6f
commit 9a4177462b
34 changed files with 434 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ktg-mes/src/main/resources/mapper/wm/WmIssueHeaderMapper.xml
View File

@@ -112,12 +112,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="areaId != null "> and area_id = #{areaId}</if>
<if test="areaCode != null and areaCode != ''"> and area_code = #{areaCode}</if>
<if test="areaName != null and areaName != ''"> and area_name like concat('%', #{areaName}, '%')</if>
<if test="issueDate != null "> and issue_date = #{issueDate}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(issue_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
AND date_format(issue_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
order by create_time desc
</select>
<select id="selectWmIssueHeaderListForExport" parameterType="WmIssueHeader" resultType="com.ktg.mes.wm.vo.WmIssueHeaderExportVo">
select wih.issue_date,wil.item_code, wil.item_name, wil.specification,wil.quantity_issued
from wm_issue_header wih left join wm_issue_line wil on wih.issue_id = wil.issue_id
<where>
<if test="issueCode != null and issueCode != ''"> and wih.issue_code = #{issueCode}</if>
<if test="issueName != null and issueName != ''"> and wih.issue_name like concat('%', #{issueName}, '%')</if>
<if test="warehouseName != null and warehouseName != ''"> and wih.warehouse_name like concat('%', #{warehouseName}, '%')</if>
<if test="status != null and status != ''"> and wih.status = #{status}</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(wih.issue_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
AND date_format(wih.issue_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
order by wih.create_time desc
</select>
<select id="selectWmIssueHeaderByIssueId" parameterType="Long" resultMap="WmIssueHeaderResult">
<include refid="selectWmIssueHeaderVo"/>
where issue_id = #{issueId}

62
ktg-mes/src/main/resources/mapper/wm/WmItemRecptMapper.xml
View File

@@ -35,7 +35,9 @@
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="quantityRecived" column="quantity_recived" />
</resultMap>
<resultMap type="ItemRecptTxBean" id="ItemRecptTxBeanResult">
@@ -77,33 +79,45 @@
</sql>
<select id="selectWmItemRecptList" parameterType="WmItemRecpt" resultMap="WmItemRecptResult">
<include refid="selectWmItemRecptVo"/>
select wit.recpt_id, wit.recpt_code,
wit.recpt_name, wit.iqc_id, wit.iqc_code, wit.po_code,
wit.vendor_id, wit.vendor_code, wit.vendor_name,
wit.vendor_nick, wit.warehouse_id, wit.warehouse_code,
wit.warehouse_name, wit.location_id, wit.location_code,
wit.location_name, wit.area_id, wit.area_code, wit.area_name,
wit.recpt_date, wit.status, wit.remark, wit.cancel_remark,wit.attr1,
wit.attr2, wit.attr3, wit.attr4, wit.create_by, wit.create_time,
wit.update_by, wit.update_time,witl_r.item_name,witl_r.specification,ifnull(witl_r2.quantity_recived,0) as quantity_recived
from wm_item_recpt wit
left join (SELECT *, ROW_NUMBER() OVER (PARTITION BY recpt_id ORDER BY line_id) AS rn FROM wm_item_recpt_line) as witl_r on witl_r.recpt_id=wit.recpt_id and witl_r.rn = 1
left join (select sum(quantity_recived) as quantity_recived,recpt_id from wm_item_recpt_line group by recpt_id) as witl_r2 on witl_r2.recpt_id = wit.recpt_id
<where>
<if test="recptCode != null and recptCode != ''"> and recpt_code = #{recptCode}</if>
<if test="recptName != null and recptName != ''"> and recpt_name like concat('%', #{recptName}, '%')</if>
<if test="iqcId != null "> and iqc_id = #{iqcId}</if>
<if test="iqcCode != null and iqcCode != ''"> and iqc_code = #{iqcCode}</if>
<if test="poCode != null and poCode != ''"> and po_code = #{poCode}</if>
<if test="vendorId != null "> and vendor_id = #{vendorId}</if>
<if test="vendorCode != null and vendorCode != ''"> and vendor_code = #{vendorCode}</if>
<if test="vendorName != null and vendorName != ''"> and vendor_name like concat('%', #{vendorName}, '%')</if>
<if test="vendorNick != null and vendorNick != ''"> and vendor_nick = #{vendorNick}</if>
<if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
<if test="warehouseCode != null and warehouseCode != ''"> and warehouse_code = #{warehouseCode}</if>
<if test="warehouseName != null and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
<if test="locationId != null "> and location_id = #{locationId}</if>
<if test="locationCode != null and locationCode != ''"> and location_code = #{locationCode}</if>
<if test="locationName != null and locationName != ''"> and location_name like concat('%', #{locationName}, '%')</if>
<if test="areaId != null "> and area_id = #{areaId}</if>
<if test="areaCode != null and areaCode != ''"> and area_code = #{areaCode}</if>
<if test="areaName != null and areaName != ''"> and area_name like concat('%', #{areaName}, '%')</if>
<if test="recptDate != null "> and recpt_date = #{recptDate}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="recptCode != null and recptCode != ''"> and wit.recpt_code = #{recptCode}</if>
<if test="recptName != null and recptName != ''"> and wit.recpt_name like concat('%', #{recptName}, '%')</if>
<if test="iqcId != null "> and wit.iqc_id = #{iqcId}</if>
<if test="iqcCode != null and iqcCode != ''"> and wit.iqc_code = #{iqcCode}</if>
<if test="poCode != null and poCode != ''"> and wit.po_code = #{poCode}</if>
<if test="vendorId != null "> and wit.vendor_id = #{vendorId}</if>
<if test="vendorCode != null and vendorCode != ''"> and wit.vendor_code = #{vendorCode}</if>
<if test="vendorName != null and vendorName != ''"> and wit.vendor_name like concat('%', #{vendorName}, '%')</if>
<if test="vendorNick != null and vendorNick != ''"> and wit.vendor_nick = #{vendorNick}</if>
<if test="warehouseId != null "> and wit.warehouse_id = #{warehouseId}</if>
<if test="warehouseCode != null and warehouseCode != ''"> and wit.warehouse_code = #{warehouseCode}</if>
<if test="warehouseName != null and warehouseName != ''"> and wit.warehouse_name like concat('%', #{warehouseName}, '%')</if>
<if test="locationId != null "> and wit.location_id = #{locationId}</if>
<if test="locationCode != null and locationCode != ''"> and wit.location_code = #{locationCode}</if>
<if test="locationName != null and locationName != ''"> and wit.location_name like concat('%', #{locationName}, '%')</if>
<if test="areaId != null "> and wit.area_id = #{areaId}</if>
<if test="areaCode != null and areaCode != ''"> and wit.area_code = #{areaCode}</if>
<if test="areaName != null and areaName != ''"> and wit.area_name like concat('%', #{areaName}, '%')</if>
<if test="recptDate != null "> and wit.recpt_date = #{recptDate}</if>
<if test="status != null and status != ''"> and wit.status = #{status}</if>
<if test="itemCode != null and itemCode != ''"> and wit.recpt_id in (select recpt_id from wm_item_recpt_line where item_code = #{itemCode})</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(recpt_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
AND date_format(wit.recpt_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
AND date_format(recpt_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
AND date_format(wit.recpt_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
order by create_time desc

13
ktg-mes/src/main/resources/mapper/wm/WmMaterialStockMapper.xml
View File

@@ -88,6 +88,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="workorderId !=null">and workorder_id = #{workorderId}</if>
<if test="workorderCode !=null and workorderCode !=''">and workorder_code = #{workorderCode}</if>
<if test="expireDate != null "> and expire_date = #{expireDate}</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(expire_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
AND date_format(expire_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null "> and attr3 = #{attr3}</if>
@@ -124,7 +130,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="recptDate !=null"> and recpt_date = #{recptDate}</if>
<if test="workorderId !=null">and workorder_id = #{workorderId}</if>
<if test="workorderCode !=null and workorderCode !=''">and workorder_code like concat('%',#{workorderCode},'%') </if>
<if test="expireDate != null "> and expire_date = #{expireDate}</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(expire_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
AND date_format(expire_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null "> and attr3 = #{attr3}</if>

17
ktg-mes/src/main/resources/mapper/wm/WmProductRecptMapper.xml
View File

@@ -168,18 +168,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
wpr.team_name as teamName,
wpr.machinery_name as machineryName,
wpr.machinery_no as machineryNo,
wprl.item_name as itemName,
wprl.specification,
wprl_r.item_name as itemName,
wprl_r.specification,
wprl.quantity_recived as quantityRecived,
wprl.unit_of_measure as unitOfMeasure,
wps.salse_date as salseDate,
wps.client_name as clientName,
wrs.rt_date as rtDate
wprl_r.unit_of_measure as unitOfMeasure,
wpr.remark as remark
from wm_product_recpt wpr
LEFT JOIN wm_product_recpt_line wprl on wpr.recpt_id = wprl.recpt_id
LEFT JOIN wm_product_salse_line wpsl ON wpsl.batch_code = wprl.batch_code
LEFT JOIN wm_product_salse wps ON wpsl.salse_id = wps.salse_id
LEFT JOIN wm_rt_salse wrs ON wrs.so_code = wps.so_code
left join (SELECT *, ROW_NUMBER() OVER (PARTITION BY recpt_id ORDER BY line_id) AS rn FROM wm_product_recpt_line)
as wprl_r on wprl_r.recpt_id = wpr.recpt_id and wprl_r.rn = 1
LEFT JOIN (select sum(quantity_recived) as quantity_recived,recpt_id from wm_product_recpt_line group by recpt_id) wprl on wprl.recpt_id = wpr.recpt_id
<where>
<if test="recptCode != null and recptCode != ''"> and wpr.recpt_code = #{recptCode}</if>
<if test="recptName != null and recptName != ''"> and wpr.recpt_name like concat('%', #{recptName}, '%')</if>

37
ktg-mes/src/main/resources/mapper/wm/WmProductSalseMapper.xml
View File

@@ -37,6 +37,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="sumQuantity" column="sum_quantity" />
<result property="itemName" column="item_name"></result>
<result property="specification" column="specification"></result>
<result property="sendDate" column="send_date"></result>
<result property="sendCarCode" column="send_car_code"></result>
</resultMap>
@@ -78,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select salse_id, salse_code, salse_name, oqc_id, oqc_code, so_code, client_id, client_code, client_name,
client_nick, warehouse_id, warehouse_code, warehouse_name, location_id,
location_code, location_name, area_id, area_code, area_name, salse_date,
status, remark,cancel_remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_salse
status, remark,cancel_remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time,send_date,send_car_code from wm_product_salse
</sql>
<select id="selectWmProductSalseList" parameterType="WmProductSalse" resultMap="WmProductSalseResult">
@@ -86,9 +90,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
client_id, client_code, client_name, client_nick, warehouse_id,
warehouse_code, warehouse_name, location_id, location_code,
location_name, area_id, area_code, area_name, salse_date,
status, remark, cancel_remark,attr1, attr2, attr3, attr4, create_by,
create_time, update_by, update_time,q.sum_quantity from wm_product_salse wps
left join (select salse_id,sum(quantity_salse) as sum_quantity from wm_product_salse_line group by salse_id) q on q.salse_id = wps.salse_id
status, remark, cancel_remark,attr1, attr2, attr3, attr4, create_by,send_date,send_car_code,
create_time, update_by, update_time,q.sum_quantity,wpsl.item_name, wpsl.specification from wm_product_salse wps
left join (SELECT item_name,specification,salse_id, ROW_NUMBER() OVER (PARTITION BY salse_id ORDER BY line_id) AS rn FROM wm_product_salse_line) as wpsl on wpsl.salse_id=wps.salse_id and wpsl.rn = 1
left join (select salse_id,sum(quantity_salse) as sum_quantity from wm_product_salse_line group by salse_id) q on q.salse_id = wps.salse_id
<where>
<if test="salseCode != null and salseCode != ''"> and salse_code = #{salseCode}</if>
<if test="salseName != null and salseName != ''"> and salse_name like concat('%', #{salseName}, '%')</if>
@@ -110,7 +115,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="areaName != null and areaName != ''"> and area_name like concat('%', #{areaName}, '%')</if>
<if test="salseDate != null "> and salse_date = #{salseDate}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="status != null and status != ''"> and status = #{}</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(salse_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
AND date_format(salse_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
order by create_time desc
</select>
@@ -144,15 +154,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectWmProductSalseExportVOList" resultType="com.ktg.mes.wm.vo.WmProductSalseExportVO">
SELECT
wps.salse_code as salseCode,
wps.salse_date as salseDate,
wps.client_name as clientName,
wpsl.item_name as itemName,
wpsl.specification,
wps.remark as remark,
wpsl.quantity_salse as quantitySalse,
wpsl.unit_of_measure as unitOfMeasure,
wpsl.remark
wpsl_r.item_name as itemName,
wpsl_r.specification as specification
from wm_product_salse wps
left join wm_product_salse_line wpsl on wps.salse_id = wpsl.salse_id
left join (SELECT item_name,specification,salse_id, ROW_NUMBER() OVER (PARTITION BY salse_id ORDER BY line_id) AS rn FROM wm_product_salse_line) as wpsl_r on wpsl_r.salse_id=wps.salse_id and wpsl_r.rn = 1
left join (select sum(quantity_salse) as quantity_salse, salse_id from wm_product_salse_line group by salse_id) as wpsl on wps.salse_id = wpsl.salse_id
<where>
<if test="salseCode != null and salseCode != ''"> and wps.salse_code = #{salseCode}</if>
<if test="salseName != null and salseName != ''"> and wps.salse_name like concat('%', #{salseName}, '%')</if>
@@ -200,6 +211,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="areaCode != null">area_code,</if>
<if test="areaName != null">area_name,</if>
<if test="salseDate != null">salse_date,</if>
<if test="sendDate != null">send_date,</if>
<if test="sendCarCode != null">send_car_code,</if>
<if test="status != null">status,</if>
<if test="remark != null">remark,</if>
<if test="attr1 != null">attr1,</if>
@@ -231,6 +244,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="areaCode != null">#{areaCode},</if>
<if test="areaName != null">#{areaName},</if>
<if test="salseDate != null">#{salseDate},</if>
<if test="sendDate != null">#{sendDate},</if>
<if test="sendCarCode != null">#{sendCarCode},</if>
<if test="status != null">#{status},</if>
<if test="remark != null">#{remark},</if>
<if test="attr1 != null">#{attr1},</if>
@@ -266,6 +281,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="areaCode != null">area_code = #{areaCode},</if>
<if test="areaName != null">area_name = #{areaName},</if>
<if test="salseDate != null">salse_date = #{salseDate},</if>
<if test="sendDate != null">send_date = #{sendDate},</if>
<if test="sendCarCode != null">send_car_code = #{sendCarCode},</if>
<if test="status != null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="cancelRemark != null">cancel_remark = #{cancelRemark},</if>

7
ktg-mes/src/main/resources/mapper/wm/WmRtIssueMapper.xml
View File

@@ -85,8 +85,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="areaId != null "> and area_id = #{areaId}</if>
<if test="areaCode != null and areaCode != ''"> and area_code = #{areaCode}</if>
<if test="areaName != null and areaName != ''"> and area_name like concat('%', #{areaName}, '%')</if>
<if test="rtDate != null "> and rt_date = #{rtDate}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(rt_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
AND date_format(rt_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
order by create_time desc
</select>

7
ktg-mes/src/main/resources/mapper/wm/WmRtSalseMapper.xml
View File

@@ -107,13 +107,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="areaId != null "> and area_id = #{areaId}</if>
<if test="areaCode != null and areaCode != ''"> and area_code = #{areaCode}</if>
<if test="areaName != null and areaName != ''"> and area_name like concat('%', #{areaName}, '%')</if>
<if test="rtDate != null "> and rt_date = #{rtDate}</if>
<if test="rtReason != null and rtReason != ''"> and rt_reason = #{rtReason}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null "> and attr3 = #{attr3}</if>
<if test="attr4 != null "> and attr4 = #{attr4}</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(rtDate,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
AND date_format(rtDate,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
order by create_time desc
</select>

7
ktg-mes/src/main/resources/mapper/wm/WmRtVendorMapper.xml
View File

@@ -75,8 +75,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="vendorName != null and vendorName != ''"> and vendor_name like concat('%', #{vendorName}, '%')</if>
<if test="vendorNick != null and vendorNick != ''"> and vendor_nick = #{vendorNick}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
<if test="rtDate != null "> and rt_date = #{rtDate}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(rt_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
AND date_format(rt_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
order by create_time desc
</select>

8
ktg-mes/src/main/resources/mapper/wm/WmTransactionMapper.xml
View File

@@ -86,7 +86,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="transactionQuantity != null "> and transaction_quantity = #{transactionQuantity}</if>
<if test="transactionDate != null "> and transaction_date = #{transactionDate}</if>
<if test="relatedTransactionId != null "> and related_transaction_id = #{relatedTransactionId}</if>
<if test="recptDate ！= null"> and recpt_date = #{recptDate}</if>
<if test="workorderId !=null">and workorder_id = #{workorderId}</if>
<if test="workorderCode !=null">and workorder_code = #{workorderCode}</if>
<if test="erpDate != null "> and erp_date = #{erpDate}</if>
@@ -94,7 +93,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
<if test="attr3 != null "> and attr3 = #{attr3}</if>
<if test="attr4 != null "> and attr4 = #{attr4}</if>
<if test="attr4 != null "> and attr4 = #{attr4}</if><if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(recptDate,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
AND date_format(recptDate,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
</select>