ariesy 修改认证查询界面查询条件问题

release
yefei 2 years ago
parent 428e495a62
commit 43e27d87aa
  1. 5
      dxhy-common/src/main/java/com/dxhy/common/util/InvoiceUtil.java
  2. 38
      dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

@ -179,8 +179,9 @@ public class InvoiceUtil {
*/
public boolean fpdmValid() {
boolean valid = false;
if (!StringHelper.isBlank(fpdm)
&& (FPDM10_PATTERN.matcher(fpdm).matches() || FPDM12_PATTERN.matcher(fpdm).matches())) {
if (!StringHelper.isBlank(fpdm) && (FPDM10_PATTERN.matcher(fpdm).matches() || FPDM12_PATTERN.matcher(fpdm).matches())) {
valid = true;
}else if(fpdm == null || StringHelper.isBlank(fpdm)){
valid = true;
}
return valid;

@ -74,14 +74,14 @@ public class SDNYMainProcessController extends AbstractController {
@SysLog("发票查验")
public ResponseEntity<String> singleInvoiceCheck(@RequestBody Map<String, String> pramsMap) throws ParseException {
log.info("传入的参数为:{}", pramsMap);
// String userid = "101833";
// String dbName = "business";
// String company = "BIGB";
String userid = "101833";
String dbName = "business";
String company = "BIGB";
// 入参统一在入口处理
String userid = getLoginName();
String dbName = getUserInfo().getDbName();
String company = getUserInfo().getCompany();
// String userid = getLoginName();
// String dbName = getUserInfo().getDbName();
// String company = getUserInfo().getCompany();
JSONObject checkInvoiceResult = null;
InvoiceUtil iu = new InvoiceUtil(pramsMap.get("invoiceCode"));
String fplxdm = iu.getFplxdm();
@ -352,20 +352,20 @@ public class SDNYMainProcessController extends AbstractController {
log.info("影像系统同步数据:{}", JSONObject.toJSONString(snRequestObject));
// String userid = "101833";
// String dbName = "business";
// String company = "BIGB";
// String taxNo = "9111112222333344DD";
String userid = "101833";
String dbName = "business";
String company = "BIGB";
String taxNo = "9111112222333344DD";
// // 入参统一在入口处理
String userid = getLoginName();
String dbName = getUserInfo().getDbName();
String company = getUserInfo().getCompany();
List<String> gfshAll = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
String gfsh = "";
if (gfshAll.size() > 0) {
gfsh = gfshAll.get(0);
}
// String userid = getLoginName();
// String dbName = getUserInfo().getDbName();
// String company = getUserInfo().getCompany();
// List<String> gfshAll = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
// String gfsh = "";
// if (gfshAll.size() > 0) {
// gfsh = gfshAll.get(0);
// }
String result = "";
@ -396,7 +396,7 @@ public class SDNYMainProcessController extends AbstractController {
for (SNInvoice invoice : invoiceInfoList) {
String fplxdm = "";
String snFplx = "";
result = snPushCheckRecordService.updateInvoicePoll(company, gfsh, reimburse, invoice, fplxdm, imageId, compCode);
result = snPushCheckRecordService.updateInvoicePoll(company, taxNo, reimburse, invoice, fplxdm, imageId, compCode);
//价税分离判断
if (!"ok".equals(result) && !"0000".equals(result)) {

Loading…
Cancel
Save