aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-08-19 07:09:45 +08:00
parent 7cf5da7f44
commit ff1ea9bc16
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceRecordController.java
View File

@ -15,6 +15,7 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.utils.WaybillHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.security.access.prepost.PreAuthorize;
@ -62,6 +63,15 @@ public class EmisSettleInvoiceRecordController extends BaseController
setPrivParams(emisSettleInvoiceRecord);
if(!StringUtils.isEmpty(emisSettleInvoiceRecord.getSettleBillNo())){
emisSettleInvoiceRecord.setSettleBillNo(WaybillHelper.formatQueryValue(emisSettleInvoiceRecord.getSettleBillNo()));
}
if(emisSettleInvoiceRecord.getParams().get("billCode")!=null){
String billCodeStr=WaybillHelper.formatQueryValue(emisSettleInvoiceRecord.getParams().get("billCode").toString());
emisSettleInvoiceRecord.getParams().put("billCode",billCodeStr);
}
List<EmisSettleInvoiceRecord> list = emisSettleInvoiceRecordService.selectEmisSettleInvoiceRecordList(emisSettleInvoiceRecord);
return getDataTable(list);
}

17
emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
View File

@ -78,7 +78,6 @@
<if test="applySiteCode != null and applySiteCode != ''"> and apply_site_code = #{applySiteCode}</if>
<if test="customerCode != null and customerCode != ''"> and customer_code = #{customerCode}</if>
<if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
<if test="settleBillNo != null and settleBillNo != ''"> and FIND_IN_SET(#{settleBillNo},settle_bill_no) </if>
<if test="settleBillName != null and settleBillName != ''"> and settle_bill_name like concat('%', #{settleBillName}, '%')</if>
<if test="applyMoney != null "> and apply_money = #{applyMoney}</if>
<if test="invoiceType != null and invoiceType != ''"> and invoice_type = #{invoiceType}</if>
@ -119,6 +118,22 @@
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
<if test="settleBillNo != null and settleBillNo != ''">
AND apply_seq_no IN (
SELECT x1.apply_seq_no FROM
emis_settle_invoice_record x1,
emis_settle_bill x2
WHERE
x1.del_flag = '0'
AND x2.del_flag = '0'
AND FIND_IN_SET( x2.settle_bill_no, x1.settle_bill_no )
AND FIND_IN_SET( x2.settle_bill_no, #{settleBillNo})
)
)
</if>
<if test="params.billCode != null and params.billCode != ''">
AND apply_seq_no IN (