Merge pull request 'demand: TMS-航信开票记录-定制导出:增加上旬和下旬,导出表格定制备注中' (#159) from develop into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/159
This commit is contained in:
heyu 2025-08-16 09:44:32 +08:00
commit d1ce6706f4

View File

@ -1,10 +1,10 @@
/** /**
* @Project: emis * @Project: emis
* @Title: EmisSettleInvoiceChRecordServiceImpl.java * @Title: EmisSettleInvoiceChRecordServiceImpl.java
* @author linfso * @author linfso
* @date 2024-07-24 23:39:08 * @date 2024-07-24 23:39:08
* @Copyright: ShangHai Duta 2022 All rights reserved. * @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0 * @version v1.0
* @Description: <p> 渠道开票记录表 实体类 </p> * @Description: <p> 渠道开票记录表 实体类 </p>
*/ */
@ -48,7 +48,7 @@ import javax.servlet.http.HttpServletResponse;
/** /**
* 渠道开票记录表Service业务层处理 * 渠道开票记录表Service业务层处理
* *
* @author linfso * @author linfso
* @date 2024-07-24 23:39:08 * @date 2024-07-24 23:39:08
*/ */
@ -94,7 +94,7 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem
/** /**
* 查询渠道开票记录表 * 查询渠道开票记录表
* *
* @param id 渠道开票记录表主键 * @param id 渠道开票记录表主键
* @return 渠道开票记录表 * @return 渠道开票记录表
*/ */
@ -107,7 +107,7 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem
/** /**
* 查询渠道开票记录表列表 * 查询渠道开票记录表列表
* *
* @param emisSettleInvoiceChRecord 渠道开票记录表 * @param emisSettleInvoiceChRecord 渠道开票记录表
* @return 渠道开票记录表 * @return 渠道开票记录表
*/ */
@ -257,6 +257,7 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem
record.setSettleType(extraInfo.getSettleType()); record.setSettleType(extraInfo.getSettleType());
record.setOpenBillRemark(extraInfo.getOpenBillRemark()); record.setOpenBillRemark(extraInfo.getOpenBillRemark());
record.setPayDays(extraInfo.getPayDays()); record.setPayDays(extraInfo.getPayDays());
record.setSettleBillName(extraInfo.getSettleBillName());
} }
}); });
} }
@ -271,8 +272,8 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem
/** /**
* 检查是否重复 * 检查是否重复
* *
* @param emisSettleInvoiceChRecord * @param emisSettleInvoiceChRecord
* @return 数量 * @return 数量
*/ */
@Override @Override
@ -283,7 +284,7 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem
/** /**
* 新增渠道开票记录表 * 新增渠道开票记录表
* *
* @param emisSettleInvoiceChRecord 渠道开票记录表 * @param emisSettleInvoiceChRecord 渠道开票记录表
* @return 结果 * @return 结果
*/ */
@ -669,7 +670,7 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem
/** /**
* 修改渠道开票记录表 * 修改渠道开票记录表
* *
* @param emisSettleInvoiceChRecord 渠道开票记录表 * @param emisSettleInvoiceChRecord 渠道开票记录表
* @return 结果 * @return 结果
*/ */
@ -726,7 +727,7 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem
/** /**
* 批量删除渠道开票记录表 * 批量删除渠道开票记录表
* *
* @param ids 需要删除的渠道开票记录表主键 * @param ids 需要删除的渠道开票记录表主键
* @return 结果 * @return 结果
*/ */
@ -738,7 +739,7 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem
/** /**
* 删除渠道开票记录表信息 * 删除渠道开票记录表信息
* *
* @param id 渠道开票记录表主键 * @param id 渠道开票记录表主键
* @return 结果 * @return 结果
*/ */