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

Merge pull request 'demand:' (#225) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/225
This commit is contained in:
heyu 2025-11-10 18:19:37 +08:00
commit 1d37eb88da
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleInvoiceRecordMapper.java
View File

@ -125,16 +125,19 @@ public interface EmisSettleInvoiceRecordMapper extends BaseMapper<EmisSettleInvo
* *
* @param ids 发票记录ID数组 * @param ids 发票记录ID数组
* @param delayOpManCode 延期操作人 * @param delayOpManCode 延期操作人
* @param updateSite 更新网点
* @return 结果 * @return 结果
*/ */
public int batchDelayInvoice(@Param("ids") Long[] ids, @Param("delayOpManCode") String delayOpManCode); public int batchDelayInvoice(@Param("ids") Long[] ids, @Param("delayOpManCode") String delayOpManCode, @Param("updateSite") String updateSite);
/** /**
* 批量取消发票延期 * 批量取消发票延期
* *
* @param ids 发票记录ID数组 * @param ids 发票记录ID数组
* @param cancelOpManCode 取消延期操作人
* @param updateSite 更新网点
* @return 结果 * @return 结果
*/ */
public int batchCancelDelayInvoice(@Param("ids") Long[] ids); public int batchCancelDelayInvoice(@Param("ids") Long[] ids, @Param("cancelOpManCode") String cancelOpManCode, @Param("updateSite") String updateSite);
} }

7
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java
View File

@ -1126,9 +1126,10 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
// 获取当前操作人 // 获取当前操作人
String delayOpManCode = getCurrentUser().getEmpCode(); String delayOpManCode = getCurrentUser().getEmpCode();
String updateSite = getCurrentUser().getOwnerSiteCode();
// 执行批量延期 // 执行批量延期
return emisSettleInvoiceRecordMapper.batchDelayInvoice(ids, delayOpManCode); return emisSettleInvoiceRecordMapper.batchDelayInvoice(ids, delayOpManCode, updateSite);
} }
/** /**
@ -1158,7 +1159,9 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
} }
// 执行批量取消延期 // 执行批量取消延期
return emisSettleInvoiceRecordMapper.batchCancelDelayInvoice(ids); String cancelOpManCode = getCurrentUser().getEmpCode();
String updateSite = getCurrentUser().getOwnerSiteCode();
return emisSettleInvoiceRecordMapper.batchCancelDelayInvoice(ids, cancelOpManCode, updateSite);
} }
} }

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

@ -68,6 +68,8 @@
<association property="delayOpManName" column="delay_op_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/> <association property="delayOpManName" column="delay_op_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
<association property="updateByName" column="update_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
</resultMap> </resultMap>
<!-- 简化版resultMap --> <!-- 简化版resultMap -->
@ -713,7 +715,10 @@
update emis_settle_invoice_record update emis_settle_invoice_record
set bl_delay = '1', set bl_delay = '1',
delay_op_man_code = #{delayOpManCode}, delay_op_man_code = #{delayOpManCode},
delay_op_date = now() delay_op_date = now(),
update_by = #{delayOpManCode},
update_time = now(),
update_site = #{updateSite}
where id in where id in
<foreach item="id" collection="ids" open="(" separator="," close=")"> <foreach item="id" collection="ids" open="(" separator="," close=")">
#{id} #{id}
@ -727,7 +732,10 @@
update emis_settle_invoice_record update emis_settle_invoice_record
set bl_delay = '0', set bl_delay = '0',
delay_op_man_code = null, delay_op_man_code = null,
delay_op_date = null delay_op_date = null,
update_by = #{cancelOpManCode},
update_time = now(),
update_site = #{updateSite}
where id in where id in
<foreach item="id" collection="ids" open="(" separator="," close=")"> <foreach item="id" collection="ids" open="(" separator="," close=")">
#{id} #{id}