diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index 6e36c958..ba89f674 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -1260,7 +1260,7 @@ public class BaseInvoiceController extends AbstractController { if (map == null){ return ResponseEntity.ok(R.error("缺少请求参数")); } -// log.info("getUserInfo====>{}",getUserInfo()); + log.info("getUserInfo====>{}",getUserInfo()); // List gfshAll = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); // if (gfshAll ==null || gfshAll.isEmpty()){ // return ResponseEntity.ok(R.error("购方信息不能为空")); diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java index d8453541..fe444171 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java @@ -189,7 +189,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl for (int i = 0; i < pageList.size(); i++) { pageList.get(i).setXh(String.valueOf((curr - 1) * size + i + 1)); // 字典转换 - pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.DK_STATUS, - pageList.get(i).getInAccountStatus())); + if ("1".equals(pageList.get(i).getInAccountStatus())){ + pageList.get(i).setInAccountStatus("已入账"); + }else { + pageList.get(i).setInAccountStatus("未入账"); + } pageList.get(i) .setInvoiceType(new InvoiceTypeUtils().invoiceTypeName(pageList.get(i).getInvoiceType())); String invoiceStatus = pageList.get(i).getInvoiceStatus(); diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index 036406d8..96c3c747 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -32,13 +32,16 @@ - - - + + + + + +