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

demand: TMS-财务中心销账审核：列表数据展示增添字段

Browse Source
This commit is contained in:
aike 2026-02-09 14:01:38 +08:00
parent a37bdf19d1
commit a62bd3607f
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWriteoffApplyController.java
View File

@ -124,6 +124,23 @@ public class EmisWriteoffApplyController extends EmisBaseController {
})
.reduce(BigDecimal.ZERO, BigDecimal::add);
apply.setApplyRecMoney(totalAmount);
// 提取发票号列表（去重）
List<String> invoiceNos = apply.getDetailList().stream()
.filter(detail -> detail != null && detail.getInvoiceNo() != null)
.flatMap(detail -> {
// 如果invoiceNo包含逗号，先拆分
String invoiceNo = detail.getInvoiceNo().trim();
if (invoiceNo.isEmpty()) {
return java.util.stream.Stream.empty();
}
return Arrays.stream(invoiceNo.split(","))
.map(String::trim)
.filter(no -> !no.isEmpty());
})
.distinct()
.collect(Collectors.toList());
apply.setInvoiceNo(invoiceNos.isEmpty() ? "" : String.join(",", invoiceNos));
}
}
}

16
emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml
View File

@ -14,7 +14,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="applyDate" column="apply_date" />
<result property="writeoffAmount" column="writeoff_amount" />
<result property="payType" column="pay_type" />
<result property="invoiceNo" column="invoice_no" />
<result property="tradeDate" column="trade_date" />
<result property="recipient" column="recipient" />
<result property="applyMemo" column="apply_memo" />
@ -50,15 +49,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectEmisWriteoffApplyList" parameterType="EmisWriteoffApply" resultMap="EmisWriteoffApplyResult">
select wa.id, wa.apply_no, wa.apply_man_code, wa.apply_man_name, wa.apply_site_code, wa.apply_site_name,
select distinct wa.id, wa.apply_no, wa.apply_man_code, wa.apply_man_name, wa.apply_site_code, wa.apply_site_name,
wa.apply_date, wa.writeoff_amount, wa.pay_type, wa.trade_date, wa.recipient, wa.apply_memo, wa.pay_id,
wa.bl_center_confirmed, wa.center_confirm_man_code, wa.center_confirm_man_name, wa.center_confirm_date,
wa.center_confirm_note, wa.center_reject_reason, wa.bl_headquarters_confirmed, wa.headquarters_confirm_man_code,
wa.headquarters_confirm_man_name, wa.headquarters_confirm_date, wa.headquarters_confirm_note,
wa.headquarters_reject_reason, wa.revoke_date, wa.revoke_man_code, wa.revoke_man_name, wa.revoke_reason,
wa.del_flag, wa.create_by, wa.create_time, wa.update_by, wa.update_time, wa.remark,
GROUP_CONCAT(DISTINCT ch.invoice_no ORDER BY ch.invoice_no SEPARATOR ',') as invoice_no
wa.del_flag, wa.create_by, wa.create_time, wa.update_by, wa.update_time, wa.remark
from emis_writeoff_apply wa
<if test="(params != null and params.queryParams != null and params.queryParams != '') or (settleBillName != null and settleBillName != '')">
left join emis_writeoff_apply_detail wad on wa.id = wad.apply_id and wad.del_flag = '0'
left join emis_settle_sub_bill ssb on wad.bill_code = ssb.bill_code and ssb.del_flag = '0'
left join emis_settle_invoice_bill_rel sibr on ssb.settle_bill_no = sibr.settle_bill_no and sibr.del_flag = '0'
@ -73,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
group by apply_seq_no
) ch2 on ch1.apply_seq_no = ch2.apply_seq_no and ch1.id = ch2.max_id
where ch1.del_flag = '0'
) ch on sir.apply_seq_no = ch.apply_seq_no
) ch on sir.apply_seq_no = ch.apply_seq_no </if>
<if test="settleBillName != null and settleBillName != ''">
left join emis_settle_bill sb on wad.settle_bill_no = sb.settle_bill_no and sb.del_flag = '0'
</if>
@ -148,13 +147,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</if>
</where>
group by wa.id, wa.apply_no, wa.apply_man_code, wa.apply_man_name, wa.apply_site_code, wa.apply_site_name,
wa.apply_date, wa.writeoff_amount, wa.pay_type, wa.trade_date, wa.recipient, wa.apply_memo, wa.pay_id,
wa.bl_center_confirmed, wa.center_confirm_man_code, wa.center_confirm_man_name, wa.center_confirm_date,
wa.center_confirm_note, wa.center_reject_reason, wa.bl_headquarters_confirmed, wa.headquarters_confirm_man_code,
wa.headquarters_confirm_man_name, wa.headquarters_confirm_date, wa.headquarters_confirm_note,
wa.headquarters_reject_reason, wa.revoke_date, wa.revoke_man_code, wa.revoke_man_name, wa.revoke_reason,
wa.del_flag, wa.create_by, wa.create_time, wa.update_by, wa.update_time, wa.remark
order by wa.create_time desc
</select>