luminghui
/
sdny-jxpt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release' of http://192.168.12.182/invoice/pt into 0507

Browse Source
release
yishiqihuasheng 2 years ago
parent bcb1307920 4946442848
commit a2b4892330
2 changed files with 5 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
  2. 4
      dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml

6
dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
Unescape View File

@ -378,7 +378,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
updateWrapper.set("bzdh",zdata1.getZBZDH()); updateWrapper.set("bzdh",zdata1.getZBZDH());
//入账状态 //入账状态
updateWrapper.set("inaccount_status",zdata1.getZYWZT()); updateWrapper.set("inaccount_status",zdata1.getZYWZT());
updateWrapper.set("company_code",zdata1.getZGSDM()); updateWrapper.set("comp_code",zdata1.getZGSDM());
DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE); DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
int update = tDxrecordInvoiceDao.update(null, updateWrapper); int update = tDxrecordInvoiceDao.update(null, updateWrapper);
if(update>0){ if(update>0){
@ -413,7 +413,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
updateWrapper.set("bzdh",zdata1.getZBZDH()); updateWrapper.set("bzdh",zdata1.getZBZDH());
//入账状态 //入账状态
updateWrapper.set("inaccount_status",zdata1.getZYWZT()); updateWrapper.set("inaccount_status",zdata1.getZYWZT());
updateWrapper.set("company_code",zdata1.getZGSDM()); updateWrapper.set("comp_code",zdata1.getZGSDM());
DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE); DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
tDxInvoiceReimburseService.getBaseMapper().update(null,updateWrapper); tDxInvoiceReimburseService.getBaseMapper().update(null,updateWrapper);
} }
@ -424,7 +424,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
updateWrapper.set("account_period",zdata1.getBUDAT().substring(0,7)); updateWrapper.set("account_period",zdata1.getBUDAT().substring(0,7));
updateWrapper.set("bzdh",zdata1.getZBZDH()); updateWrapper.set("bzdh",zdata1.getZBZDH());
updateWrapper.set("inaccount_status",zdata1.getZYWZT()); updateWrapper.set("inaccount_status",zdata1.getZYWZT());
updateWrapper.set("company_code",zdata1.getZGSDM()); updateWrapper.set("comp_code",zdata1.getZGSDM());
updateWrapper.eq("uuid",uuid); updateWrapper.eq("uuid",uuid);
tdxSaleRecordInvoiceDao.update(null,updateWrapper); tdxSaleRecordInvoiceDao.update(null,updateWrapper);
if(!flag){ if(!flag){

4
dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml
Unescape View File

@ -86,10 +86,10 @@
<if test="qszt != null and qszt != '' and qszt != 'null' "> <if test="qszt != null and qszt != '' and qszt != 'null' ">
and t.qs_status = #{qszt} and t.qs_status = #{qszt}
</if> </if>
<if test="rzzt != null and rzzt != '' and rzzt != 'null' and rzzt != '3'"> <if test="rzzt != null and rzzt != '' and rzzt != 'null' and rzzt != 3">
and t.rzh_yesorno = #{rzzt} and t.rzh_yesorno = #{rzzt}
</if> </if>
<if test="rzzt != null and rzzt == '3'"> <if test="rzzt != null and rzzt == 3">
and (t.rzh_yesorno = '2' OR t.rzh_yesorno = '1') and (t.rzh_yesorno = '2' OR t.rzh_yesorno = '1')
</if> </if>
<if test="xfmc != null and xfmc != '' and xfmc != 'null' "> <if test="xfmc != null and xfmc != '' and xfmc != 'null' ">

Write Preview
Loading…
Cancel
Save