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

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

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

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

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

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

@ -66,7 +66,7 @@
<association property="opManName" column="op_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
<association property="opSiteName" column="op_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
<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.selectEmpNameByUserId"/>
</resultMap>