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 1e7d121c..134afce5 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 @@ -850,51 +850,34 @@ public class BaseInvoiceController extends AbstractController { @SysLog("调用智能勾选查询接口") @ResponseBody public Object sgrzzngxcx(@RequestBody Map map) { -// String gfsh = (String)map.get("gfsh"); -// String invoiceType = (String)map.get("invoiceType"); -// String invoiceSource = (String)map.get("invoiceSource"); -// String kpksrq = (String)map.get("kpksrq"); -// String kpjsrq = (String)map.get("kpjsrq"); -// String qszt = (String)map.get("qszt"); -// String qsfs = (String)map.get("qsfs"); -// String businessCode = (String)map.get("businessCode"); -// String invoiceNo = (String)map.get("invoiceNo"); -// String qsksrq = (String)map.get("qsksrq"); -// String qsjsrq = (String)map.get("qsjsrq"); -// String xfmc = (String)map.get("xfmc"); -// String position = (String)map.get("position"); -// String fpzt = (String)map.get("invoiceStatus"); -// String sfkrz = (String)map.get("sfkrz"); -// String qsr = (String)map.get("qsr"); -// String bzdh = (String) map.get("bzdh"); + String inAccountStatus = (String) map.get("inAccountStatus"); String companyCode = (String) map.get("companyCode"); - String gfsh = (String)map.get("gfsh"); + String gfsh = (String) map.get("gfsh"); String maxTax = (String) map.get("maxTax"); - String menuId = (String)map.get("menuId"); - String company = (String)map.get("company"); + String menuId = (String) map.get("menuId"); + String company = (String) map.get("company"); int curr = 0; - if (map.get("curr") != null){ + if (map.get("curr") != null) { curr = (int) map.get("curr"); - }else { + } else { ResponseEntity.ok(R.error("分页数据不能为空")); } int size = 0; - if (map.get("size")!= null){ + if (map.get("size") != null) { size = (int) map.get("size"); - }else { + } else { ResponseEntity.ok(R.error("分页大小不能为空")); } - if (StringUtils.isNotBlank(inAccountStatus)){ - if (StringUtils.isBlank(inAccountStatus)){ + if (StringUtils.isBlank(inAccountStatus)) { return ResponseEntity.ok(R.error("入账状态不能为空")); } - if (StringUtils.isNotBlank(maxTax)){ + if (StringUtils.isNotBlank(maxTax)) { return ResponseEntity.ok(R.error("税额上限不能为空")); } @@ -906,49 +889,22 @@ public class BaseInvoiceController extends AbstractController { String allIn = "88"; - if (map.get("sign") != null && "99".equals((String)map.get("sign"))){ + if (map.get("sign") != null && "99".equals((String) map.get("sign"))) { allIn = "99"; } Map pramsMap = new HashMap<>(16); -// pramsMap.put("bzdh", bzdh); -// pramsMap.put("payment", map.get("payment")); -// pramsMap.put("paymentStatus", map.get("paymentStatus")); -// pramsMap.put("paymentDateStart", map.get("paymentDateStart")); -// pramsMap.put("paymentDateEnd", map.get("paymentDateEnd")); -// pramsMap.put("settlementNo", map.get("settlementNo")); -// pramsMap.put("voucherNumber", map.get("voucherNumber")); -// pramsMap.put("snVoucherNumber", map.get("snVoucherNumber")); -// pramsMap.put("postingTimeEnd", map.get("postingTimeEnd")); -// pramsMap.put("postingTimeStart", map.get("postingTimeStart")); -// pramsMap.put("imageNumber", map.get("imageNumber")); -// if (map.get("accountPeriod") != null && !"".equals(map.get("accountPeriod"))) { -// String accountPeriod = map.get("accountPeriod").toString().substring(0,7); -// pramsMap.put("accountPeriod", accountPeriod); -// log.info("accountPeriod:{}",accountPeriod); -// } -// -// if (sfkrz != null) { -// if (!"99".equals(sfkrz)) { -// pramsMap.put("sfkrz", sfkrz); -// } -// } -// if (invoiceSource != null) { -// if (!"99".equals(invoiceSource)) { -// pramsMap.put("invoiceSource", invoiceSource); -// } -// } pramsMap.put("inAccountStatus", inAccountStatus); pramsMap.put("company", company); pramsMap.put("company", "BIGB"); pramsMap.put("menuId", menuId); pramsMap.put("menuId", "118061"); - pramsMap.put("maxTax",maxTax); - pramsMap.put("sign",allIn); - pramsMap.put("curr",curr); - pramsMap.put("size",size); + pramsMap.put("maxTax", maxTax); + pramsMap.put("sign", allIn); + pramsMap.put("curr", curr); + pramsMap.put("size", size); pramsMap.put("business", getUserInfo().getBusiness()); pramsMap.put("dbName", getUserInfo().getDbName()); List taxList = getUserInfo().getOrg(); @@ -962,98 +918,17 @@ public class BaseInvoiceController extends AbstractController { } - if (ObjectUtils.isNotEmpty(gfshList)){ + if (ObjectUtils.isNotEmpty(gfshList)) { pramsMap.put("gfsh", gfshList); - }else { + } else { return ResponseEntity.ok(R.error("购方税号不能为空")); } - if (StringUtils.isNotBlank(companyCode)){ - pramsMap.put("companyCode",companyCode); + if (StringUtils.isNotBlank(companyCode)) { + pramsMap.put("companyCode", companyCode); } - - -// if (!StringUtils.isBlank(invoiceType)) { -// if (!"99".equals(invoiceType)) { -// pramsMap.put("invoiceType", invoiceType); -// } -// } else { -// return ResponseEntity.ok(R.error("发票类型不能为空！")); -// } -// if (StringUtils.isNotBlank(fpzt)) { -// pramsMap.put("fpzt", fpzt); -// } else { -// return ResponseEntity.ok(R.error("发票状态不能为空")); -// } -// pramsMap.put("businessCode", "99"); -// if (!StringUtils.isBlank(qszt)) { -// if (!"99".equals(qszt)) { -// pramsMap.put("qszt", qszt); -// if ("1".equals(qszt)) { -// if (!StringUtils.isBlank(qsksrq)) { -// pramsMap.put("qsksrq", qsksrq); -// } else { -// return ResponseEntity.ok(R.error("签收开始日期不能为空！")); -// } -// if (!StringUtils.isBlank(qsjsrq)) { -// pramsMap.put("qsjsrq", qsjsrq); -// } else { -// return ResponseEntity.ok(R.error("签收结束日期不能为空！")); -// } -// if (!StringUtils.isBlank(qsfs)) { -// // 表示全部 -// if (!"99".equals(qsfs)) { -// pramsMap.put("qsfs", qsfs); -// } -// } else { -// return ResponseEntity.ok(R.error("签收方式不能为空！")); -// } -// pramsMap.put("businessCode", businessCode); -// } -// } -// } else { -// return ResponseEntity.ok(R.error("签收状态不能为空！")); -// } -// String qsflag = getUserInfo().getQsStatus(); -// if ("1".equals(qsflag)) { -// pramsMap.put("qszt", "1"); -// } -// if (!StringUtils.isBlank(kpksrq)) { -// pramsMap.put("kpksrq", kpksrq); -// } else { -// return ResponseEntity.ok(R.error("开票开始日期不能为空！")); -// } -// if (!StringUtils.isBlank(kpjsrq)) { -// pramsMap.put("kpjsrq", kpjsrq); -// } else { -// return ResponseEntity.ok(R.error("开票结束日期不能为空！")); -// } -// -// if (!StringUtils.isBlank(position)) { -// pramsMap.put("username", getUserName()); -// pramsMap.put("position", position); -// } -// -// //发票号码 -// if (!StringUtils.isBlank(invoiceNo)) { -// if(invoiceNo.length()==8){ -// pramsMap.put("invoiceNo", invoiceNo); -// }else { -// pramsMap.put("eleInvoiceNo", invoiceNo); -// } -// } -// -// -// if (!StringUtils.isBlank(xfmc)) { -// pramsMap.put("xfmc", xfmc); -// } -// if (!StringUtils.isBlank(qsr)) { -// pramsMap.put("qsr", qsr); -// } - - try { return ResponseEntity .ok(R.ok().put("data", baseInvoiceManualCheckService.inTellingCheck(pramsMap))); @@ -1063,6 +938,8 @@ public class BaseInvoiceController extends AbstractController { return ResponseEntity.ok(R.error(CommonConstants.MSG_ERR_DEFAULT)); } + + } /** @@ -1264,7 +1141,7 @@ public class BaseInvoiceController extends AbstractController { try { return ResponseEntity.ok(Objects - .requireNonNull(R.ok().put("data", baseYgxfpqrService.selectByGfshAndKprq(pramsMap, curr, size)))); + .requireNonNull(R.ok().put("data", baseYgxfpqrService.selectByGfshAndKprq(pramsMap, curr, size)))); } catch (Exception e) { e.printStackTrace(); log.error("", e); @@ -1344,7 +1221,7 @@ public class BaseInvoiceController extends AbstractController { try { return ResponseEntity - .ok(R.ok().put("data", baseIRzTDxRecordInvoiceService.identifiByIds(pramsMap, curr, size, count))); + .ok(R.ok().put("data", baseIRzTDxRecordInvoiceService.identifiByIds(pramsMap, curr, size, count))); } catch (Exception e) { e.printStackTrace(); log.error("", e);