修改mapper文件

release
yishiqihuasheng 2 years ago
parent 34adecb9a5
commit c04d13ca44
  1. 5
      dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java
  2. 16
      dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
  3. 1
      dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java

@ -285,12 +285,13 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
try {
String[] titlelist = {"序号", "发票类型", "发票代码", "发票号码", "发票状态", "开票日期", "购方名称", "购方税号", "金额", "税额", "价税合计",
"清单标志", "备注", "优惠政策类型", "采集状态", "采集时间", "采集来源", "签收方式", "对接系统", "签收状态", "签收日期", "签收人", "入账月份", "入账状态",
"凭证号", "业务单号", "入池时间"};
"凭证号", "业务单号", "入池时间","影像号","账期","过账日期"};
String[] titleprop = {"xh", "invoiceType", "invoiceCode", "invoiceNo", "invoiceStatus", "invoiceDate",
"gfmc", "gfsh", "invoiceAmount", "taxAmount", "totalAmount", "listStatus", "remark", "incentiveFlag",
"collectStatus", "collectDate", "collectFrom", "qsfs", "systemName", "qszt", "qsrq", "qsr",
"inAccountMonth", "inAccountStatus", "voucherNo", "documentNumber", "createDate"};
"inAccountMonth", "inAccountStatus", "snVoucherNo", "documentNumber", "createDate","imageId","accountPeriod"
,"postingTime"};
// 需要设置返回列表标题时调用
json = super.setTitleList(titlelist, titleprop);
PageHelper.startPage(curr, size);

@ -450,6 +450,10 @@
<include refid="sql_fields_added"/>
,t.incentive_flag incentiveFlag
,t.system_name systemName
,t.sn_voucher_no snVoucherNo
,t.image_id imageId
,t.account_period accountPeriod
,t.posting_time postingTime
from t_dx_sale_record_invoice t
where 1 = 1
<if test="cjksyf != null and cjksyf!= '' and cjjsyf != null and cjjsyf != ''">
@ -507,6 +511,18 @@
<if test="invoiceSource!=null and invoiceSource!='' and invoiceSource!='99'">
and t.invoice_source = #{invoiceSource}
</if>
<if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
and t.sn_voucher_number = #{snVoucherNumber}
</if>
<if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">
and t.posting_time = #{postingTime}
</if>
<if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
and t.image_id = #{imageId}
</if>
<if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
and t.account_period = #{accountPeriod}
</if>
GROUP BY t.uuid
ORDER BY t.create_date DESC
</select>

@ -308,6 +308,7 @@ public class FpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao, TDx
// 3、扫描方式获取底账库信息
TDxRecordInvoice invoice = null;
if (qsType.equals(QsfsEnum.SMYQS.getQsfsDm())) {
log.info("判断为扫码签收");
if (rules != null && rules.size() > 0) {
for (SignRulesEntity signRulesEntity : rules) {
if ("1008".contains(signRulesEntity.getRuleCode())) {

Loading…
Cancel
Save