diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java index 13b2726baf99c899d2d4333531348e683cf4e703..2b056fecea4b0b94ac8bc5c71eb7184cd7852d37 100644 --- a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java +++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/EntryCommandServiceImpl.java @@ -1267,6 +1267,7 @@ public class EntryCommandServiceImpl implements EntryCommandService { FileOut out = new FileOut(); out.setFileType("閾惰鍥炲崟"); out.setFileId(bankFileId); + out.setFileExtension("application/pdf"); fileOutList.add(out); } } @@ -1323,7 +1324,8 @@ public class EntryCommandServiceImpl implements EntryCommandService { // 鑾峰彇褰撳墠绱㈠紩浣嶇疆鐨� JSONObject JSONObject dataObj = data.getJSONObject(i); byte[] bytesArr = dataObj.getBytes("fileStream"); - if(out.getFileExtension().contains("image")){ + log.info("out.getFileExtension() =>"+out.getFileExtension()); + if(out.getFileExtension()!=null && out.getFileExtension().contains("image")){ byte[] bytes = convertImageToPdf(bytesArr); fileList.add(bytes); }else{ diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/api/InvoiceMapper.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/api/InvoiceMapper.java index 466e2ee378ecdfd3e88e717ce2299a955b0a7f93..bc7711d88954ff13924f3e025b635a5eaab0554a 100644 --- a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/api/InvoiceMapper.java +++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/api/InvoiceMapper.java @@ -39,7 +39,7 @@ public interface InvoiceMapper extends BaseMapper<InvoicePo> { }) List<String> selectInvoiceExsitList(@Param("stringList") List<String> stringList); - String selectInvoiceRemark(@Param("incomeId") Long incomeId, @Param("value")String value); + String selectInvoiceDetailRemark(@Param("incomeId") Long incomeId, @Param("value")String value); String selectInvoiceNo(@Param("incomeId") Long incomeId); diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/xml/InvoiceMapper.xml b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/xml/InvoiceMapper.xml index 77d27f446dc98dd22ca784ae5f0c4e9fec1b8a1f..07b4e62f30e14ce6d798ad92c7fe8bf8baba74b2 100644 --- a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/xml/InvoiceMapper.xml +++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/xml/InvoiceMapper.xml @@ -179,9 +179,11 @@ </select> - <select id = "selectInvoiceRemark" resultType="String"> - select GROUP_CONCAT(b.remark) from t_income_invoice a left join t_invoice b on a.invoice_id = b.id - and a.available = 'YES' and b.available = 'YES' where a.income_id = #{incomeId} + <select id = "selectInvoiceDetailRemark" resultType="String"> + select GROUP_CONCAT(c.project_name) from t_income_invoice a left join t_invoice b on a.invoice_id = b.id + and a.available = 'YES' and b.available = 'YES' + left join t_invoice_detail c on c.invoice_id = b.id and c.available = 'YES' + where a.income_id = #{incomeId} <if test="value != null and value !=''"> and a.invoice_type = #{value} </if> diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/utils/VoucherUtil.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/utils/VoucherUtil.java index 2fe2720092dddf6fd879690169056e2b564e7596..0bdda41d1e2921431f1501aa4201cb0f69b30cf3 100644 --- a/ServiceSite/src/main/java/com/seasky/ledgerincome/utils/VoucherUtil.java +++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/utils/VoucherUtil.java @@ -447,7 +447,8 @@ public class VoucherUtil { public Map<String,String> transformMapDataType(IncomeAggregate incomeAggregate){ Long incomeId = incomeAggregate.getIncomeId(); - String remark = invoiceMapper.selectInvoiceRemark(incomeId, null); + //2025-01-10 鏀逛负鏌ヨ鍙戠エ鏄庣粏椤圭洰鍚嶇О 澶氫釜閫楀彿闅斿紑 棰勫紑绁ㄩ櫎澶� 棰勫紑绁ㄦ殏鏃舵病鍋氾紝涓嶈€冭檻 + String remark = invoiceMapper.selectInvoiceDetailRemark(incomeId, null); remark = remark==null?"":remark; String invoiceNo = invoiceMapper.selectInvoiceNo(incomeId); invoiceNo = invoiceNo==null?"":invoiceNo;