修改判断条件

release
yishiqihuasheng 2 years ago
parent 18d115f242
commit 84483e3b30
  1. 6
      dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java

@ -935,7 +935,7 @@ public class BaseInvoiceController extends AbstractController {
String companyCode = (String) map.get("companyCode"); String companyCode = (String) map.get("companyCode");
String gfsh = (String)map.get("gfsh"); String gfsh = (String)map.get("gfsh");
List<String> gfshList = new ArrayList<>(); List<String> gfshList = new ArrayList<>();
if(StringUtils.isBlank(gfsh) && "99".equals(gfsh)){ if(StringUtils.isNotBlank(gfsh) && "99".equals(gfsh)){
gfshList=UserInfoUtil.getGfshAll(getUserInfo().getOrg()); gfshList=UserInfoUtil.getGfshAll(getUserInfo().getOrg());
}else { }else {
gfshList.add(gfsh); gfshList.add(gfsh);
@ -963,7 +963,7 @@ public class BaseInvoiceController extends AbstractController {
// //
// map.put("gfsh",gfshList); // map.put("gfsh",gfshList);
// //
// map.put("sign","88"); map.put("sign","99");
if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){ if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){
map.put("companyCodes",getUserInfo().getCompanyCodes()); map.put("companyCodes",getUserInfo().getCompanyCodes());
@ -974,8 +974,10 @@ public class BaseInvoiceController extends AbstractController {
map.put("companyCode",companyCode); map.put("companyCode",companyCode);
} }
String sgrzzngxcx = baseInvoiceManualCheckService.inTellingCheck(map); String sgrzzngxcx = baseInvoiceManualCheckService.inTellingCheck(map);
log.info("sgrzzngxcx{}",sgrzzngxcx);
BaseReturnData baseReturnData = JSON.parseObject(sgrzzngxcx, BaseReturnData.class); BaseReturnData baseReturnData = JSON.parseObject(sgrzzngxcx, BaseReturnData.class);
String encode = Base64.decodeStr(baseReturnData.getData()); String encode = Base64.decodeStr(baseReturnData.getData());
log.info("encode{}",encode);
BaseReturnEntity baseReturnEntity = JSON.parseObject(encode, BaseReturnEntity.class); BaseReturnEntity baseReturnEntity = JSON.parseObject(encode, BaseReturnEntity.class);
List<BaseTDxRecordInvoice> dataList = baseReturnEntity.getDataList(); List<BaseTDxRecordInvoice> dataList = baseReturnEntity.getDataList();
StringBuilder uuids = new StringBuilder(); StringBuilder uuids = new StringBuilder();

Loading…
Cancel
Save