diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java index d7e1c690..0937b7b7 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java @@ -160,8 +160,10 @@ public class SysUserServiceImpl extends ServiceImpl i // 保存客户信息,更新企业税号 user.getUserOrgEntities().stream().forEach(userOrg -> { if(StringUtils.isEmpty(userOrg.getTaxno())){ - if(StringUtils.isNotEmpty(taxnos.get(userOrg.getDeptId()))) { - userOrg.setTaxno(taxnos.get(userOrg.getDeptId())); + String taxno = taxnos.get(String.valueOf(userOrg.getDeptId())); + log.info("销项同步税号为:taxno={}",taxno); + if(StringUtils.isNotEmpty(taxno)){ + userOrg.setTaxno(taxno); } } }); 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 78acc49a..3fb07ab0 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 @@ -51,7 +51,6 @@ import java.util.stream.Collectors; public class BaseInvoiceController extends AbstractController { /** * 认证发票查询service - * */ @Resource private BaseRzFpxxService baseRzFpxxService; @@ -107,7 +106,7 @@ public class BaseInvoiceController extends AbstractController { private static final Pattern PATTERN_DATE = Pattern.compile( - "^(?:(?!0000)[0-9]{4}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[0-9]{2}(?:0[48]|[2468][048]|[13579][26])|(?:0[48]|[2468][048]|[13579][26])00)-02-29)$"); + "^(?:(?!0000)[0-9]{4}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[0-9]{2}(?:0[48]|[2468][048]|[13579][26])|(?:0[48]|[2468][048]|[13579][26])00)-02-29)$"); private static final Pattern PATTERN_AMOUNT = Pattern.compile("^(([1-9]{1}\\d*)|([0]{1}))(\\.(\\d){0,2})?$"); /** @@ -119,45 +118,45 @@ public class BaseInvoiceController extends AbstractController { @ResponseBody @SysLog("调用发票认证综合查询入口接口") public Object listRzFpxx(@RequestBody Map map) { - String gfsh = (String)map.get("gfsh"); + String gfsh = (String) map.get("gfsh"); String companyCode = (String) map.get("companyCode"); - if (StringUtils.isBlank(gfsh)||StringUtils.isBlank(companyCode)){ + if (StringUtils.isBlank(gfsh) || StringUtils.isBlank(companyCode)) { return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS)); } - 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 rzzt = (String)map.get("rzzt"); - String rzclzt = (String)map.get("rzclzt"); - String rzlx = (String)map.get("rzlx"); - String skssq = (String)map.get("skssq"); - String qsfs = (String)map.get("qsfs"); - String invoiceStatus = (String)map.get("invoiceStatus"); - String qsksrq = (String)map.get("qsksrq"); - String qsjsrq = (String)map.get("qsjsrq"); - String rzksrq = (String)map.get("rzksrq"); - String rzjsrq = (String)map.get("rzjsrq"); - String invoiceNo = (String)map.get("invoiceNo"); - String xfmc = (String)map.get("xfmc"); - String businessCode = (String)map.get("businessCode"); - String qsr = (String)map.get("qsr"); - String rzhr = (String)map.get("rzhr"); + 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 rzzt = (String) map.get("rzzt"); + String rzclzt = (String) map.get("rzclzt"); + String rzlx = (String) map.get("rzlx"); + String skssq = (String) map.get("skssq"); + String qsfs = (String) map.get("qsfs"); + String invoiceStatus = (String) map.get("invoiceStatus"); + String qsksrq = (String) map.get("qsksrq"); + String qsjsrq = (String) map.get("qsjsrq"); + String rzksrq = (String) map.get("rzksrq"); + String rzjsrq = (String) map.get("rzjsrq"); + String invoiceNo = (String) map.get("invoiceNo"); + String xfmc = (String) map.get("xfmc"); + String businessCode = (String) map.get("businessCode"); + String qsr = (String) map.get("qsr"); + String rzhr = (String) map.get("rzhr"); // String sortPzbh = String.valueOf(map.get("sortPzbh")); // String sortBzdh = String.valueOf(map.get("sortBzdh")); // String sortKprq = String.valueOf(map.get("sortKprq")); String taxRate = String.valueOf(map.get("taxRate")); - log.info("taxRate={}",taxRate); - String inAccountStatus = (String)map.get("inAccountStatus"); - int curr = (int)map.get("curr"); - int size = (int)map.get("size"); + log.info("taxRate={}", taxRate); + String inAccountStatus = (String) map.get("inAccountStatus"); + int curr = (int) map.get("curr"); + int size = (int) map.get("size"); String bzdh = (String) map.get("bzdh"); String bzr = (String) map.get("bzr"); Map pramsMap = new HashMap<>(25); pramsMap.put("bzdh", bzdh); - pramsMap.put("bzr",bzr); + pramsMap.put("bzr", bzr); pramsMap.put("inAccountStatus", inAccountStatus); pramsMap.put("qszt", map.get("qszt")); pramsMap.put("wrzfpStart", map.get("wrzfpStart")); @@ -166,9 +165,9 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("postingTimeStart", map.get("postingTimeStart")); pramsMap.put("postingTimeEnd", map.get("postingTimeEnd")); if (map.get("accountPeriod") != null && !"".equals(map.get("accountPeriod"))) { - String accountPeriod = map.get("accountPeriod").toString().substring(0,7); + String accountPeriod = map.get("accountPeriod").toString().substring(0, 7); pramsMap.put("accountPeriod", accountPeriod); - log.info("accountPeriod:{}",accountPeriod); + log.info("accountPeriod:{}", accountPeriod); } // pramsMap.put("accountPeriodStart", map.get("accountPeriodStart")); // pramsMap.put("accountPeriodEnd", map.get("accountPeriodEnd")); @@ -195,9 +194,9 @@ public class BaseInvoiceController extends AbstractController { } if (!StringUtils.isBlank(invoiceNo)) { - if(invoiceNo.length()==8){ + if (invoiceNo.length() == 8) { pramsMap.put("invoiceNo", invoiceNo); - }else { + } else { pramsMap.put("eleInvoiceNo", invoiceNo); } } @@ -206,13 +205,13 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("payment", map.get("payment")); pramsMap.put("paymentStatus", map.get("paymentStatus")); - if(map.get("paymentDateStart") != null) { + if (map.get("paymentDateStart") != null) { if (StringUtils.isNotEmpty(map.get("paymentDateStart").toString())) { String paymentDateStart = DateUtils.getMorning(DateUtils.strToDate(map.get("paymentDateStart").toString())); pramsMap.put("paymentDateStart", paymentDateStart); } } - if(map.get("paymentEnd") != null) { + if (map.get("paymentEnd") != null) { if (StringUtils.isNotEmpty(map.get("paymentEnd").toString())) { String paymentDateEnd = DateUtils.getNight(DateUtils.strToDate(map.get("paymentEnd").toString())); pramsMap.put("paymentDateEnd", paymentDateEnd); @@ -225,13 +224,13 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("gfsh", gfsh); - pramsMap.put("companyCode",companyCode); + pramsMap.put("companyCode", companyCode); - if (StringUtils.isNotBlank(taxRate) && !"99".equals(taxRate)){ + if (StringUtils.isNotBlank(taxRate) && !"99".equals(taxRate)) { // List rates = new ArrayList<>(); // rates = convertRates(taxRate,rates); - pramsMap.put("taxRate",taxRate); + pramsMap.put("taxRate", taxRate); } if (!StringHelper.isBlank(invoiceType)) { @@ -289,22 +288,22 @@ public class BaseInvoiceController extends AbstractController { // 已认证传 认证起止日期和税款所属期做判断 if (!"99".equals(rzzt)) { pramsMap.put("rzzt", rzzt); - if (!"0".equals(rzzt)) { - if (!StringHelper.isBlank(rzksrq)) { - rzksrq = DateUtils.getMorning(DateUtils.strToDate(rzksrq)); - pramsMap.put("rzksrq", rzksrq); - } else { - return ResponseEntity.ok(R.error("认证开始日期不能为空！")); - } - if (!StringHelper.isBlank(rzjsrq)) { - rzjsrq = DateUtils.getNight(DateUtils.strToDate(rzjsrq)); - pramsMap.put("rzjsrq", rzjsrq); - } else { - return ResponseEntity.ok(R.error("认证结束日期不能为空！")); - } - if (!StringHelper.isBlank(skssq)) { - pramsMap.put("skssq", skssq); - } + } + if (!"0".equals(rzzt)) { + if (!StringHelper.isBlank(rzksrq)) { + rzksrq = DateUtils.getMorning(DateUtils.strToDate(rzksrq)); + pramsMap.put("rzksrq", rzksrq); + } else { + return ResponseEntity.ok(R.error("认证开始日期不能为空！")); + } + if (!StringHelper.isBlank(rzjsrq)) { + rzjsrq = DateUtils.getNight(DateUtils.strToDate(rzjsrq)); + pramsMap.put("rzjsrq", rzjsrq); + } else { + return ResponseEntity.ok(R.error("认证结束日期不能为空！")); + } + if (!StringHelper.isBlank(skssq)) { + pramsMap.put("skssq", skssq); } } } else { @@ -343,19 +342,19 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("inAccountStatus", inAccountStatus); } - if(pramsMap.get("imageNumber") != null){ - pramsMap.put("imageNumber",pramsMap.get("imageNumber")); + if (pramsMap.get("imageNumber") != null) { + pramsMap.put("imageNumber", pramsMap.get("imageNumber")); } - if(pramsMap.get("snVoucherNumber") != null){ - pramsMap.put("snVoucherNumber",pramsMap.get("snVoucherNumber")); + if (pramsMap.get("snVoucherNumber") != null) { + pramsMap.put("snVoucherNumber", pramsMap.get("snVoucherNumber")); } - if(pramsMap.get("accountPeriod") != null ){ - if(pramsMap.get("accountPeriod").toString().length() > 7) { + if (pramsMap.get("accountPeriod") != null) { + if (pramsMap.get("accountPeriod").toString().length() > 7) { String accountPeriod = pramsMap.get("accountPeriod").toString().substring(0, 7); pramsMap.put("accountPeriod", accountPeriod); - }else{ + } else { pramsMap.put("accountPeriod", pramsMap.get("accountPeriod")); } } @@ -369,7 +368,7 @@ public class BaseInvoiceController extends AbstractController { DateUtils.getNight(DateUtils.strToDate(pramsMap.get("postingTimeEnd").toString()))); } - log.info("请求列表的参数为:{}",pramsMap); + log.info("请求列表的参数为:{}", pramsMap); try { return ResponseEntity.ok(R.ok().put("data", baseRzFpxxService.selectByPramsMap(pramsMap, curr, size))); @@ -384,14 +383,13 @@ public class BaseInvoiceController extends AbstractController { /** * 撤销认证 * - * @param map - * 请求参数 id逗号分隔 + * @param map 请求参数 id逗号分隔 * @return 返回结果 */ @PostMapping("/rzzhcx/cxrz") @SysLog("调用撤销认证接口") public Object cxrz(@RequestBody Map map) { - String cxids = (String)map.get("cxids"); + String cxids = (String) map.get("cxids"); Map pramsMap = new HashMap<>(16); pramsMap.put("dbName", getUserInfo().getDbName()); @@ -412,7 +410,6 @@ public class BaseInvoiceController extends AbstractController { } /** - * * 扫码勾选录入查询 */ @PostMapping("/smgx/smgxcx") @@ -483,55 +480,54 @@ public class BaseInvoiceController extends AbstractController { @ResponseBody public Object sggxcx(@RequestBody Map map) { - if(map.get("gfsh") == null || "".equals(map.get("gfsh"))){ + if (map.get("gfsh") == null || "".equals(map.get("gfsh"))) { return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS)); } - if (map.get("companyCode") == null || "".equals(map.get("companyCode"))){ + if (map.get("companyCode") == null || "".equals(map.get("companyCode"))) { return ResponseEntity.ok(R.error("组织编码不能为空")); } String gfsh = (String) map.get("gfsh"); String companyCode = (String) map.get("companyCode"); - 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 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 rzzt = (String) map.get("rzzt"); + 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 sortPzbh = String.valueOf(map.get("sortPzbh")); String sortBzdh = String.valueOf(map.get("sortBzdh")); String sortKprq = String.valueOf(map.get("sortKprq")); - String position = (String)map.get("position"); - String fpzt = (String)map.get("invoiceStatus"); - String sfkrz = (String)map.get("sfkrz"); - int curr = (int)map.get("curr"); - int size = (int)map.get("size"); - String qsr = (String)map.get("qsr"); - String company = (String)map.get("company"); - String menuId = (String)map.get("menuId"); + String position = (String) map.get("position"); + String fpzt = (String) map.get("invoiceStatus"); + String sfkrz = (String) map.get("sfkrz"); + int curr = (int) map.get("curr"); + int size = (int) map.get("size"); + String qsr = (String) map.get("qsr"); + String company = (String) map.get("company"); + String menuId = (String) map.get("menuId"); String bzdh = (String) map.get("bzdh"); String inAccountStatus = (String) map.get("inAccountStatus"); String suspendStatus = (String) map.get("suspendStastus"); String suspendDate = (String) map.get("suspendDate"); String bzr = (String) map.get("bzr"); String taxRate = String.valueOf(map.get("taxRate")); - if (StringUtils.isNotEmpty(suspendDate) && suspendDate.length() >7){ - suspendDate = suspendDate.substring(0,7); + if (StringUtils.isNotEmpty(suspendDate) && suspendDate.length() > 7) { + suspendDate = suspendDate.substring(0, 7); } - - Map pramsMap = new HashMap<>(32); - pramsMap.put("companyCode",companyCode); + pramsMap.put("companyCode", companyCode); pramsMap.put("gfsh", gfsh); pramsMap.put("bzdh", bzdh); pramsMap.put("inAccountStatus", inAccountStatus); @@ -552,26 +548,26 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("postingTimeEnd", map.get("postingTimeEnd")); pramsMap.put("postingTimeStart", map.get("postingTimeStart")); pramsMap.put("imageNumber", map.get("imageNumber")); - pramsMap.put("suspendStatus",suspendStatus); - pramsMap.put("suspendDate",suspendDate); - pramsMap.put("sortPzbh",sortPzbh); - pramsMap.put("sortBzdh",sortBzdh); - pramsMap.put("sortKprq",sortKprq); - pramsMap.put("bzr",bzr); - if(StringUtils.isNotEmpty(sortPzbh)) { + pramsMap.put("suspendStatus", suspendStatus); + pramsMap.put("suspendDate", suspendDate); + pramsMap.put("sortPzbh", sortPzbh); + pramsMap.put("sortBzdh", sortBzdh); + pramsMap.put("sortKprq", sortKprq); + pramsMap.put("bzr", bzr); + if (StringUtils.isNotEmpty(sortPzbh)) { pramsMap.put("sortPzbh", sortPzbh); } - if(StringUtils.isNotEmpty(sortBzdh)) { + if (StringUtils.isNotEmpty(sortBzdh)) { pramsMap.put("sortBzdh", sortBzdh); } - if(StringUtils.isNotEmpty(sortKprq)) { + if (StringUtils.isNotEmpty(sortKprq)) { pramsMap.put("sortKprq", sortKprq); } if (map.get("accountPeriod") != null && !"".equals(map.get("accountPeriod"))) { - String accountPeriod = map.get("accountPeriod").toString().substring(0,7); + String accountPeriod = map.get("accountPeriod").toString().substring(0, 7); pramsMap.put("accountPeriod", accountPeriod); - log.info("accountPeriod:{}",accountPeriod); + log.info("accountPeriod:{}", accountPeriod); } if (sfkrz != null) { @@ -584,16 +580,19 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("invoiceSource", invoiceSource); } } - if (!StringUtils.isNotBlank(gfsh)){ - pramsMap.put("sign","88"); + if (!StringUtils.isNotBlank(gfsh)) { + pramsMap.put("sign", "88"); } - if (StringUtils.isNotBlank(taxRate) && !"99".equals(taxRate)){ + if (StringUtils.isNotBlank(taxRate) && !"99".equals(taxRate)) { // List rates = new ArrayList<>(); // rates = convertRates(taxRate,rates); - pramsMap.put("taxRate",taxRate); + pramsMap.put("taxRate", taxRate); } + if (StringUtils.isNotBlank(rzzt) && !"99".equals(rzzt)) { + pramsMap.put("rzzt", rzzt); + } if (!StringUtils.isBlank(invoiceType)) { if (!"99".equals(invoiceType)) { @@ -661,9 +660,9 @@ public class BaseInvoiceController extends AbstractController { //发票号码 if (!StringUtils.isBlank(invoiceNo)) { - if(invoiceNo.length()==8){ + if (invoiceNo.length() == 8) { pramsMap.put("invoiceNo", invoiceNo); - }else { + } else { pramsMap.put("eleInvoiceNo", invoiceNo); } } @@ -680,7 +679,7 @@ public class BaseInvoiceController extends AbstractController { // } try { return ResponseEntity - .ok(R.ok().put("data", baseInvoiceManualCheckService.selectByManualCheck(pramsMap, curr, size))); + .ok(R.ok().put("data", baseInvoiceManualCheckService.selectByManualCheck(pramsMap, curr, size))); } catch (Exception e) { e.printStackTrace(); log.error("", e); @@ -690,11 +689,11 @@ public class BaseInvoiceController extends AbstractController { } private List getGfshList(List gfshList, List companyCodes) { - gfshList = baseInvoiceManualCheckService.getGfshList(gfshList,companyCodes); + gfshList = baseInvoiceManualCheckService.getGfshList(gfshList, companyCodes); return gfshList; } - private List convertRates(String taxRate,List rates) { + private List convertRates(String taxRate, List rates) { switch (taxRate) { case "0": rates.add("0"); @@ -745,17 +744,17 @@ public class BaseInvoiceController extends AbstractController { } public boolean checkList(List list) { - boolean flag =false; - if (list == null || list.isEmpty()){ + boolean flag = false; + if (list == null || list.isEmpty()) { flag = true; - }else { - String s = list.toString().replace("[","").replace("]",""); - if (StringHelper.isBlank(s)){ + } else { + String s = list.toString().replace("[", "").replace("]", ""); + if (StringHelper.isBlank(s)) { flag = true; } - if (StringHelper.isNotBlank(s) && s.contains(",")){ + if (StringHelper.isNotBlank(s) && s.contains(",")) { String replace = s.replace(",", ""); - if (StringHelper.isBlank(replace)){ + if (StringHelper.isBlank(replace)) { flag = true; } } @@ -772,22 +771,22 @@ public class BaseInvoiceController extends AbstractController { @SysLog("调用智能勾选查询接口") @ResponseBody public Object zngxcx(@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 qsksrq = (String)map.get("qsksrq"); - String qsjsrq = (String)map.get("qsjsrq"); - String xfmc = (String)map.get("xfmc"); - String maxTax = (String)map.get("maxTax"); - String floatTax = (String)map.get("floatTax"); - String yxsxfs = (String)map.get("yxsxfs"); - String qsr = (String)map.get("qsr"); - String invoiceNo = (String)map.get("invoiceNo"); + 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 qsksrq = (String) map.get("qsksrq"); + String qsjsrq = (String) map.get("qsjsrq"); + String xfmc = (String) map.get("xfmc"); + String maxTax = (String) map.get("maxTax"); + String floatTax = (String) map.get("floatTax"); + String yxsxfs = (String) map.get("yxsxfs"); + String qsr = (String) map.get("qsr"); + String invoiceNo = (String) map.get("invoiceNo"); Map pramsMap = new HashMap<>(18); pramsMap.put("business", getUserInfo().getBusiness()); @@ -878,9 +877,9 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("xfmc", xfmc); } if (!StringUtils.isBlank(invoiceNo)) { - if(invoiceNo.length()==8){ + if (invoiceNo.length() == 8) { pramsMap.put("invoiceNo", invoiceNo); - }else { + } else { pramsMap.put("eleInvoiceNo", invoiceNo); } } @@ -907,38 +906,38 @@ public class BaseInvoiceController extends AbstractController { 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"); String isChooseAll = (String) map.get("isChooseAll"); - if (org.apache.commons.lang3.StringUtils.isBlank(isChooseAll)){ + if (org.apache.commons.lang3.StringUtils.isBlank(isChooseAll)) { isChooseAll = "N"; } int curr = 0; int size = 0; - if ("N".equalsIgnoreCase(isChooseAll)){ + if ("N".equalsIgnoreCase(isChooseAll)) { - if (map.get("curr") != null){ + if (map.get("curr") != null) { curr = (int) map.get("curr"); - }else { + } else { ResponseEntity.ok(R.error("分页数据不能为空")); } - if (map.get("size")!= null){ + if (map.get("size") != null) { size = (int) map.get("size"); - }else { + } else { ResponseEntity.ok(R.error("分页大小不能为空")); } } - if (StringUtils.isBlank(inAccountStatus)){ + if (StringUtils.isBlank(inAccountStatus)) { return ResponseEntity.ok(R.error("入账状态不能为空")); } - if (StringUtils.isBlank(maxTax)){ + if (StringUtils.isBlank(maxTax)) { return ResponseEntity.ok(R.error("税额上限不能为空")); } @@ -954,10 +953,10 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("inAccountStatus", inAccountStatus); pramsMap.put("company", company); pramsMap.put("menuId", menuId); - pramsMap.put("maxTax",maxTax); - pramsMap.put("curr",curr); - pramsMap.put("size",size); - pramsMap.put("isChooseAll",isChooseAll); + pramsMap.put("maxTax", maxTax); + pramsMap.put("curr", curr); + pramsMap.put("size", size); + pramsMap.put("isChooseAll", isChooseAll); pramsMap.put("business", getUserInfo().getBusiness()); pramsMap.put("dbName", getUserInfo().getDbName()); List taxList = getUserInfo().getOrg(); @@ -972,21 +971,20 @@ public class BaseInvoiceController extends AbstractController { //TODO 合并分支后把checkList加上可以让用户不使用上级权限就可以进行认证 - pramsMap.put("gfsh",gfshList); + pramsMap.put("gfsh", gfshList); - pramsMap.put("sign","99"); + pramsMap.put("sign", "99"); - if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){ - pramsMap.put("companyCodes",getUserInfo().getCompanyCodes()); - log.info("组织机构====>{}",pramsMap.get("companyCodes")); + if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)) { + pramsMap.put("companyCodes", getUserInfo().getCompanyCodes()); + log.info("组织机构====>{}", pramsMap.get("companyCodes")); } - if (StringUtils.isNotBlank(companyCode)){ - pramsMap.put("companyCode",companyCode); + if (StringUtils.isNotBlank(companyCode)) { + pramsMap.put("companyCode", companyCode); } - try { return ResponseEntity .ok(R.ok().put("data", baseInvoiceManualCheckService.inTellingCheck(pramsMap))); @@ -1009,7 +1007,7 @@ public class BaseInvoiceController extends AbstractController { // isChooseAll = "Y"; // } - map.put("isChooseAll","Y"); + map.put("isChooseAll", "Y"); int curr = 1; int size = 10; int count = 0; @@ -1017,16 +1015,16 @@ public class BaseInvoiceController extends AbstractController { Map pramsMap = new HashMap<>(16); String companyCode = (String) map.get("companyCode"); - String gfsh = (String)map.get("gfsh"); + String gfsh = (String) map.get("gfsh"); List gfshList = new ArrayList<>(); - if(StringUtils.isNotBlank(gfsh) && "99".equals(gfsh)){ - gfshList=UserInfoUtil.getGfshAll(getUserInfo().getOrg()); - }else { + if (StringUtils.isNotBlank(gfsh) && "99".equals(gfsh)) { + gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); + } else { gfshList.add(gfsh); } String gxType = (String) map.get("gxType"); - if (StringUtils.isBlank(gxType)){ + if (StringUtils.isBlank(gxType)) { return ResponseEntity.ok(R.error("所选发票勾选类型不能为空")); } @@ -1034,7 +1032,7 @@ public class BaseInvoiceController extends AbstractController { map.put("dbName", getUserInfo().getDbName()); List taxList = getUserInfo().getOrg(); map.put("taxList", taxList); - map.put("gfsh",gfshList); + map.put("gfsh", gfshList); map.put("qsflag", getUserInfo().getQsStatus()); // List gfshList = new ArrayList<>(); // if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) { @@ -1047,41 +1045,41 @@ public class BaseInvoiceController extends AbstractController { // // map.put("gfsh",gfshList); // - map.put("sign","99"); + map.put("sign", "99"); - if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){ - map.put("companyCodes",getUserInfo().getCompanyCodes()); - log.info("组织机构====>{}",map.get("companyCodes")); + if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)) { + map.put("companyCodes", getUserInfo().getCompanyCodes()); + log.info("组织机构====>{}", map.get("companyCodes")); } - if (StringUtils.isNotBlank(companyCode)){ - map.put("companyCode",companyCode); + if (StringUtils.isNotBlank(companyCode)) { + map.put("companyCode", companyCode); } String sgrzzngxcx = baseInvoiceManualCheckService.inTellingCheck(map); - log.info("sgrzzngxcx======={}",sgrzzngxcx); + log.info("sgrzzngxcx======={}", sgrzzngxcx); String decodeStr = Base64.decodeStr(sgrzzngxcx); BaseReturnEntity baseReturnEntity = JSON.parseObject(decodeStr, BaseReturnEntity.class); List dataList = baseReturnEntity.getDataList(); StringBuilder uuids = new StringBuilder(); StringBuilder dkses = new StringBuilder(); - if (dataList != null && dataList.size() > 0){ + if (dataList != null && dataList.size() > 0) { for (int i = 0; i < dataList.size(); i++) { uuids.append(dataList.get(i).getUuid()); dkses.append(dataList.get(i).getTaxAmount()); - if (i{}",uuids); - log.info("dkses====>{}",dkses); - }else { + log.info("uuids====>{}", uuids); + log.info("dkses====>{}", dkses); + } else { return ResponseEntity.ok(R.error("没有可操作的数据")); } - pramsMap.put("uuids",uuids); - pramsMap.put("dkses",dkses); + pramsMap.put("uuids", uuids); + pramsMap.put("dkses", dkses); pramsMap.put("name", getUserName()); pramsMap.put("dbName", getUserInfo().getDbName()); pramsMap.put("loginName", getLoginName()); @@ -1109,12 +1107,12 @@ public class BaseInvoiceController extends AbstractController { @SysLog("智能勾选发票入库接口") @ResponseBody public Object insertZngx(@RequestBody Map map) { - List idlist = (List)map.get("ids"); + List idlist = (List) map.get("ids"); Map pramsMap = new HashMap<>(16); pramsMap.put("business", getUserInfo().getBusiness()); pramsMap.put("dbName", getUserInfo().getDbName()); pramsMap.put("userName", getUserName()); - pramsMap.put("userAccount",getUserInfo().getLoginname()); + pramsMap.put("userAccount", getUserInfo().getLoginname()); pramsMap.put("company", map.get("company")); pramsMap.put("menuId", map.get("menuId")); pramsMap.put("gxType", map.get("gxType")); @@ -1173,7 +1171,7 @@ public class BaseInvoiceController extends AbstractController { /** * 扫码，手工，导入勾选操做入口 - * + *

* 0-手工勾选 1-扫码勾选 2-导入勾选 3- 智能勾选 4-手工认证 5-扫码认证 6-导入认证 * * @return 返回结果 @@ -1181,9 +1179,9 @@ public class BaseInvoiceController extends AbstractController { @PostMapping("/gx/invoiceCheck") @SysLog("调用扫码，手工，导入勾选操做入口接口") public Object invoiceCheck(@RequestBody Map map) { - String ids = (String)map.get("ids"); - String gxType = String.valueOf((int)map.get("gxType")); - String ses = (String)map.get("ses"); + String ids = (String) map.get("ids"); + String gxType = String.valueOf((int) map.get("gxType")); + String ses = (String) map.get("ses"); Map pramsMap = new HashMap<>(16); pramsMap.put("dbName", getUserInfo().getDbName()); @@ -1217,23 +1215,22 @@ public class BaseInvoiceController extends AbstractController { /** * 已勾选发票待确认列表 * - * @param map - * 请求参数 + * @param map 请求参数 * @return 返回结果 */ @PostMapping("/ygxfp/jgxfpcx") @SysLog("调用已勾选发票待确认列表接口") public Object jgxfpcx(@RequestBody Map map) { - String gfsh = (String)map.get("gfsh"); - String invoiceType = (String)map.get("invoiceType"); - String invoiceSource = (String)map.get("invoiceSource"); - String gxksrq = (String)map.get("gxksrq"); - String gxjsrq = (String)map.get("gxjsrq"); - String businessCode = (String)map.get("businessCode"); - String invoiceNo = (String)map.get("invoiceNo"); - String xfmc = (String)map.get("xfmc"); - int curr = (int)map.get("curr"); - int size = (int)map.get("size"); + String gfsh = (String) map.get("gfsh"); + String invoiceType = (String) map.get("invoiceType"); + String invoiceSource = (String) map.get("invoiceSource"); + String gxksrq = (String) map.get("gxksrq"); + String gxjsrq = (String) map.get("gxjsrq"); + String businessCode = (String) map.get("businessCode"); + String invoiceNo = (String) map.get("invoiceNo"); + String xfmc = (String) map.get("xfmc"); + int curr = (int) map.get("curr"); + int size = (int) map.get("size"); Map pramsMap = new HashMap<>(16); pramsMap.put("dbName", getUserInfo().getDbName()); List taxList = getUserInfo().getOrg(); @@ -1290,16 +1287,16 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("xfmc", xfmc); } if (!StringUtils.isBlank(invoiceNo)) { - if(invoiceNo.length()==8){ + if (invoiceNo.length() == 8) { pramsMap.put("invoiceNo", invoiceNo); - }else { + } else { pramsMap.put("eleInvoiceNo", invoiceNo); } } 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); @@ -1310,14 +1307,13 @@ public class BaseInvoiceController extends AbstractController { /** * 撤销已经勾选的发票 * - * @param map - * 请求参数 + * @param map 请求参数 * @return 返回结果 */ @PostMapping("/gxfp/cxgx") @SysLog("调用撤销已经勾选的发票接口") public Object cxgx(@RequestBody Map map) { - String cxids = (String)map.get("cxids"); + String cxids = (String) map.get("cxids"); Map pramsMap = new HashMap<>(16); pramsMap.put("dbName", getUserInfo().getDbName()); @@ -1340,17 +1336,16 @@ public class BaseInvoiceController extends AbstractController { /** * 一键提交 * - * @param map - * 请求参数 + * @param map 请求参数 * @return 返回结果 */ @PostMapping("/gxfp/tjrz") @SysLog("调用一键提交接口") public Object fprz(@RequestBody Map map) { - String uuids = (String)map.get("uuids"); - String dkses = (String)map.get("dkses"); - String gxType = (String)map.get("gxType"); + String uuids = (String) map.get("uuids"); + String dkses = (String) map.get("dkses"); + String gxType = (String) map.get("gxType"); int curr = 0; int size = 50; int count = 0; @@ -1379,7 +1374,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); @@ -1390,49 +1385,49 @@ public class BaseInvoiceController extends AbstractController { @PostMapping("/sgrz/changeSuspend") @SysLog("修改暂挂状态") @ResponseBody - public Object changeSuspend(@RequestBody Map map){ + public Object changeSuspend(@RequestBody Map map) { - if (map == null){ + 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()){ + if (gfshAll == null || gfshAll.isEmpty()) { return ResponseEntity.ok(R.error("购方信息不能为空")); } JSONObject jsonObject = new JSONObject(map); String uuids = jsonObject.getString("uuids"); - if (StringUtils.isEmpty(uuids) ||(uuids.length() == 1 && uuids.contains(","))){ + if (StringUtils.isEmpty(uuids) || (uuids.length() == 1 && uuids.contains(","))) { return ResponseEntity.ok(R.error("请先选择要暂挂的数据")); } String suspendType = jsonObject.getString("suspendType"); - if (StringUtils.isEmpty(suspendType)){ + if (StringUtils.isEmpty(suspendType)) { return ResponseEntity.ok(R.error("暂挂状态不能为空")); } String[] uuidArray = uuids.split(","); List uuidList = Arrays.asList(uuidArray); //查询库中是否包含对应数据 - DynamicContextHolder.push(getUserInfo().getDbName()+ DbConstant.BUSINESS_READ); + DynamicContextHolder.push(getUserInfo().getDbName() + DbConstant.BUSINESS_READ); List list = baseIRzTDxRecordInvoiceService.findSuspendStatus(uuidList); - if (list == null || list.isEmpty()){ + if (list == null || list.isEmpty()) { return ResponseEntity.ok(R.error("没有可操作的数据")); } - if (list.contains("1")&& (list.contains("0")||list.contains(null) || list.contains(""))){ + if (list.contains("1") && (list.contains("0") || list.contains(null) || list.contains(""))) { return ResponseEntity.ok(R.error("同时存在暂挂状态为是和否的数据，请重新选择！")); } - Map pramsMap = new HashMap<>(); - pramsMap.put("suspendType",suspendType); - pramsMap.put("uuids",uuidList); - pramsMap.put("dbName",getUserInfo().getDbName()); + Map pramsMap = new HashMap<>(); + pramsMap.put("suspendType", suspendType); + pramsMap.put("uuids", uuidList); + pramsMap.put("dbName", getUserInfo().getDbName()); // pramsMap.put("dbName","business"); try { return ResponseEntity - .ok(R.ok().put("data",baseIRzTDxRecordInvoiceService.updateSuspendType(pramsMap))); + .ok(R.ok().put("data", baseIRzTDxRecordInvoiceService.updateSuspendType(pramsMap))); } catch (Exception e) { e.printStackTrace(); log.error("", e); diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java index 8b9ef21c..8a615309 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java +++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java @@ -74,6 +74,10 @@ public class BaseSggxCxRespVO { * 签收方式 */ private String qsfs; + /** + * 认证状态 + */ + private String rzzt; /** * 签收人 */ diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index cb95acee..053d5258 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -77,7 +77,7 @@ and t.invoice_type in('01','03','08','14','31','283','161','183','185') and t.bdk_status in ('1','2') and t.export_mark = '0' - and t.auth_status in ('2','3','4') + and t.auth_status in ('0','2','3','4','5','6') and t.company = #{company} and t.gf_tax_no = #{gfsh} and t.comp_code = #{companyCode} @@ -124,9 +124,12 @@ and t.image_id = #{imageId} - + and t.auth_status = #{rzclzt} + + and (t.auth_status = '2' or t.auth_status = '3') + and t.bdk_status = #{rzlx} @@ -152,7 +155,7 @@ and t.qs_name = #{qsr} - + and t.confirm_user in #{item} @@ -354,7 +357,7 @@ and t.gf_tax_no = #{gfsh} and t.comp_code = #{companyCode} and t.invoice_type in('01','03','08','14','31','283','161','183','185') - and t.auth_status in ('2','3','4') + and t.auth_status in ('0','2','3','4','5','6') and t.bdk_status in ('1','2') and t.export_mark = '0' and t.company =#{company} @@ -402,9 +405,12 @@ and t.rzh_yesorno = #{rzzt} - + and t.auth_status = #{rzclzt} + + and (t.auth_status = '2' or t.auth_status = '3') + and t.bdk_status = #{rzlx} @@ -427,7 +433,7 @@ and t.qs_name = #{qsr} - + and t.confirm_user in #{item} diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index a8ec9d0c..69523f6d 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -86,7 +86,7 @@ WHERE t.invoice_date between #{kpksrq} and #{kpjsrq} and t.invoice_type in('01','03','08','14','31','283','161','183','185') and t.rzh_yesorno = '0' - and t.auth_status in('0','5','6') + and t.auth_status in('0','2','3','5','6') and t.export_mark = '0' and t.inaccount_status = '1' and t.company = #{company} @@ -129,6 +129,15 @@ and t.qs_status = #{qszt} + + and t.auth_status = #{rzzt} + + + and (t.auth_status = '2' or t.auth_status = '3') + + + and t.auth_status = '5' + and t.inaccount_status = #{inAccountStatus} @@ -417,7 +426,7 @@ WHERE t.invoice_date between #{kpksrq} and #{kpjsrq} and t.invoice_type in('01','03','08','14','31','283','161','183','185') and t.rzh_yesorno = '0' - and t.auth_status in('0','5','6') + and t.auth_status in('0','2','3','5','6') and t.inaccount_status = '1' and t.export_mark = '0' and t.company = #{company} @@ -442,6 +451,16 @@ and t.qs_status = #{qszt} + + and t.auth_status = #{rzzt} + + + and (t.auth_status = '2' or t.auth_status = '3') + + + and t.auth_status = '5' + + and t.suspend_status = '1' @@ -1255,6 +1274,7 @@ and t.rzh_yesorno = '0' and t.invoice_status in ('0','7') and t.auth_status in('0','5','6') + and t.inaccount_status = '1' and t.export_mark = '0' and t.invoice_amount>0 and t.tax_amount>=0 diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java index 76a0b2d7..e9aba68e 100644 --- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java +++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java @@ -148,6 +148,11 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl 0) { + checkInvoiceResult.put("invoiceNo", checkInvoiceResult.getString("invoiceNumber")); + signSaveInvoiceInfoService.saveQueryInvoiceResult(checkInvoiceResult, userid, "1", dbName); + } + } else if (checkInvoiceResult.containsKey("cyjg") && !"0001".equals(checkInvoiceResult.getString("cyjg"))) { + data = errorInfo(checkInvoiceResult, data); + + try { + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); + requestRecordService.saveFailedRequestRecord(singleInvoiceCheckRecord, 0, JSONObject.toJSONString(data), + (String) checkInvoiceResult.get("cyjgxx")); + } catch (Exception e) { + log.error("发票查验接口记录保存失败，errormsg:{}", e); + } + + return ResponseEntity.ok(JSONObject.toJSONString(data)); + + } + } + + DynamicContextHolder.push("business" + DbConstant.BUSINESS_READ); + checkInvoiceByUuid = baseTDxRecordInvoiceDao.selectOne(recordWrapper); + } + String invoiceNo = checkInvoiceByUuid.getInvoiceNo(); QueryWrapper detailWrapper = new QueryWrapper<>(); detailWrapper.eq("uuid", uuid); @@ -807,7 +843,7 @@ public class SDNYMainProcessController extends AbstractController { checkInvoice.put("taxAuthorityNo", vehicleList.getString("taxBureauCode")); checkInvoice.put("taxAuthorityName", vehicleList.getString("taxBureauName")); checkInvoice.put("idcardNo", vehicleList.getString("buyerIdNum")); - checkInvoice.put("amountTax", vehicleList.getString("carPrice")); +// checkInvoice.put("amountTax", vehicleList.getString("carPrice")); } //二手车 if ("15".equals(invoiceType)) { diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticCustomsExportCountServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticCustomsExportCountServiceImpl.java index 96065fbd..61f2a811 100644 --- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticCustomsExportCountServiceImpl.java +++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/count/impl/DomesticCustomsExportCountServiceImpl.java @@ -92,6 +92,11 @@ public class DomesticCustomsExportCountServiceImpl extends MpBaseServiceImpl