diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java index a4e1480e..c470b937 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java @@ -290,7 +290,7 @@ public class EmailMaintainController extends AbstractController { String jsonString = Base64.encode(json.toJSONString()); return ResponseEntity.ok(R.ok().put("data",jsonString)); }else{ - return ResponseEntity.ok(R.ok().put("data","未查询到用户名为"+userName+"数据")); + return ResponseEntity.ok(R.error().put("data","未查询到用户名为"+userName+"数据")); } } diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java index 9285755b..94d4daf2 100644 --- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java +++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java @@ -466,6 +466,8 @@ public class CustomsSignServiceImpl extends MpBaseServiceImpl(); JSONObject tabulateMenu = tabulateRedisService.getTabulateMenu(company, menuId); resultData.putTabulateMenu(tabulateMenu); + resultData.setNumberSerial(false); + resultData.setTotal(returnList.size()); return resultData.setDataList(returnList).toJsonBase(); } diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index e1f96b24..284e7cce 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -346,6 +346,10 @@ AND create_date between #{cjksyf} and #{cjjsyf} + AND gf_tax_no in + + #{item} + AND invoice_date between #{kpksrq} and #{kpjsrq}