luminghui
/
sdny-jxpt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release' into release

Browse Source
release
wangzhikun 2 years ago
parent bf5e556c33 8dbfe9877e
commit a7226609ce
19 changed files with 166 additions and 89 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 9
      dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
  2. 16
      dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
  3. 4
      dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java
  4. 2
      dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java
  5. 20
      dxhy-core/src/main/resources/bootstrap-dev.yaml
  6. 8
      dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java
  7. 14
      dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java
  8. 43
      dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
  9. 2
      dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java
  10. 4
      dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java
  11. 8
      dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java
  12. 6
      dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java
  13. 9
      dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java
  14. 53
      dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java
  15. 26
      dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
  16. 8
      dxhy-extend/src/main/resources/mapper/TicketMapper.xml
  17. 20
      dxhy-operation-flow/src/main/resources/bootstrap-dev.yaml
  18. 1
      dxhy-sign/src/main/java/com/dxhy/sign/controller/SignElecInvoiceController.java
  19. 2
      dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java

9
dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
Unescape View File

@ -182,8 +182,13 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
// }
// }
// }
pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,
pageList.get(i).getInAccountStatus()));
// pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,
// pageList.get(i).getInAccountStatus()));
if ("1".equals(pageList.get(i).getInAccountStatus())){
pageList.get(i).setInAccountStatus("已入账");
}else if ("0".equals(pageList.get(i).getInAccountStatus())){
pageList.get(i).setInAccountStatus("未入账");
}
pageList.get(i).setRzsj(pageList.get(i).getRzsj());
pageList.get(i).setSkssq(pageList.get(i).getSkssq());
}

16
dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
Unescape View File

@ -201,20 +201,20 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
if (pageList.get(i).getQsStatus() != null) {
vo.setQszt(dictdetaServcice.queryDictName(DictConstant.QS_STATUS,pageList.get(i).getQsStatus()));
}
// if ("1".equals(pageList.get(i).getPaymentStatus())) {
// vo.setPaymentStatus("已付款");
// } else if ("0".equals(pageList.get(i).getPaymentStatus())) {
// vo.setPaymentStatus("未付款");
// }
if ("1".equals(pageList.get(i).getInAccountStatus())) {
vo.setInAccountStatus("已入账");
} else if ("0".equals(pageList.get(i).getInAccountStatus())) {
vo.setInAccountStatus("未入账");
}
vo.setPaymentStatus(dictdetaServcice.queryDictName(DictConstant.FK_STATUS,pageList.get(i).getPaymentStatus()));
vo.setPaymentDate(pageList.get(i).getPaymentDate());
vo.setGfmc(pageList.get(i).getGfName());
vo.setXfmc(pageList.get(i).getXfName());
vo.setBusinessName(businessName);
vo.setEleInvoiceNo(pageList.get(i).getEleInvoiceNo());
String dkzt= dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,pageList.get(i).getInAccountStatus());
pageList.get(i).setInAccountStatus(dkzt);
vo.setInAccountStatus(dkzt);
// String dkzt= dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,pageList.get(i).getInAccountStatus());
// pageList.get(i).setInAccountStatus(dkzt);
// vo.setInAccountStatus(dkzt);
vo.setSelect(true);
if (!"1".equals(pageList.get(i).getAuthStatus())) {
vo.setSelect(false);

4
dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java
Unescape View File

@ -27,9 +27,9 @@ public class MailGatherLogVo extends CommonDTO {
private String ocrType;
private String errorMsg;
private String fileName;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private String cjsj;
public String deptId;

2
dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/MailGatherLogServiceImpl.java
Unescape View File

@ -7,6 +7,7 @@ import com.dxhy.common.constant.DbConstant;
import com.dxhy.common.datasource.config.DynamicContextHolder;
import com.dxhy.common.util.UUIDUtils;
import com.dxhy.common.utils.Base64Encoding;
import com.dxhy.common.utils.DateUtils;
import com.dxhy.core.dao.mailGather.MailGatherLogDao;
import com.dxhy.core.model.mailGather.EmailMaintainVo;
import com.dxhy.core.model.mailGather.MailGatherLogVo;
@ -58,6 +59,7 @@ public class MailGatherLogServiceImpl implements MailGatherLogService {
if(emailMaintainVos !=null && emailMaintainVos.size() > 0) {
for (int i = 0; i < emailMaintainVos.size(); i++) {
MailGatherLogVo mailGatherLogVo = emailMaintainVos.get(i);
mailGatherLogVo.setCjsj(DateUtils.dateToStr(mailGatherLogVo.getCreateTime()));
mailGatherLogVo.setXh(i + 1 + "");
}
}

20
dxhy-core/src/main/resources/bootstrap-dev.yaml
Unescape View File

@ -4,22 +4,24 @@ spring:
nacos:
config:
# Nacos config 地址
server-addr: 10.1.2.202:8848
server-addr: 172.31.36.147:33000
# Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace）
namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6
# Nacos config 分组
group: dxhy-core-group
# Nacos config 登录用户名
username: dxhy-jxpt
username: nacos
# Nacos config 登录密码
password: dxhy-jxpt
password: Invoice.nacos.!1
# Nacos config 配置文件前缀
prefix: dxhy-core
prefix: dxhy-erp
# Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension}
file-extension: yaml
# Nacos discovery 配置
discovery:
server-addr: 10.1.2.202:8848
username: dxhy-jxpt
password: dxhy-jxpt
namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
server-addr: 172.31.36.147:33000
# Nacos config 登录用户名
username: nacos
# Nacos config 登录密码
password: Invoice.nacos.!1
namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6

8
dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java
Unescape View File

@ -117,8 +117,12 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl<CustomsJ
// 字典值转换
String inaccountStatus = pageList.get(i).getInaccountStatus();
pageList.get(i).setInaccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,inaccountStatus));
String auditStatus = pageList.get(i).getAuditStatus();
if ("1".equals(inaccountStatus)){
pageList.get(i).setInaccountStatus("已入账");
}else if ("0".equals(inaccountStatus)) {
pageList.get(i).setInaccountStatus("未入账");
}
String auditStatus = pageList.get(i).getAuditStatus();
pageList.get(i)
.setAuditStatus(dictdetaServcice.queryDictName(DictConstant.AUDIT_STATUS, auditStatus));
String applyCheck = pageList.get(i).getApplyCheck();

14
dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java
Unescape View File

@ -132,7 +132,11 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl<CustomsRecor
map.put("qsStatus", dictdetaServcice.queryDictName(DictConstant.QS_STATUS, qsStatus));
String qsType = (String)map.get("qsType");
map.put("qsType", dictdetaServcice.queryDictName(DictConstant.QS_TYPE, qsType));
map.put("inAccountStatus",dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,(String)map.get("inAccountStatus")));
if ("1".equals(map.get("inAccountStatus"))){
map.put("inAccountStatus","已入账");
}else if ("0".equals(map.get("inAccountStatus"))){
map.put("inAccountStatus","未入账");
}
if (map.get("qsDate") != null) {
map.put("qsDate", map.get("qsDate"));
@ -1225,8 +1229,12 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl<CustomsRecor
map.put("bdkStatus", dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, bdkStatus));
map.put("cxrzStatus", dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, cxrzStatus));
//入账状态
String inAccountStatus = (String) map.get("inAccountStatus");
map.put("inAccountStatus",dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,inAccountStatus));
if ("1".equals(map.get("inAccountStatus"))){
map.put("inAccountStatus","已入账");
}else if ("0".equals(map.get("inAccountStatus"))) {
map.put("inAccountStatus","未入账");
}
if (map.get("qsDate") != null) {
map.put("qsDate", map.get("qsDate"));
}

43
dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
View File

File diff suppressed because one or more lines are too long

2
dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java
Unescape View File

@ -2,6 +2,7 @@ package com.dxhy.extend.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
/**
@ -135,6 +136,7 @@ public class ExtAddTaxInvoice implements Serializable {
private String snVoucherNumber;
private String postingTime;
@TableField("image_id")
private String imageNumber;
private String accountPeriod;
private String compCode;

4
dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java
Unescape View File

@ -2,6 +2,7 @@ package com.dxhy.extend.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
/**
@ -64,7 +65,8 @@ public class ExtOtherInvoice implements Serializable {
private String taxAmount;
private String voucherNo;
private String postingTime;
private String imageId;
@TableField("image_id")
private String imageNumber;
private String accountPeriod;
private String inAccountStatus;
private String bzdh;

8
dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java
Unescape View File

@ -123,8 +123,12 @@ public class ExtFpzhcxServiceImpl extends MpBaseServiceImpl<ExtBbfpzhDao, ExtBbf
String bdkStatus = resultList.get(i).getBdkStatus();
resultList.get(i).setBdkStatus(dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, bdkStatus));
String inAccountStatus = resultList.get(i).getInAccountStatus();
resultList.get(i)
.setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS, inAccountStatus));
if ("1".equals(inAccountStatus)){
resultList.get(i).setInAccountStatus("已入账");
}else if ("0".equals(inAccountStatus)){
resultList.get(i).setInAccountStatus("未入账");
}
}
}

6
dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtYcfpcxServiceImpl.java
Unescape View File

@ -106,7 +106,11 @@ public class ExtYcfpcxServiceImpl extends MpBaseServiceImpl<ExtBbycfpcxDao, ExtB
String rzlx = pageList.get(i).getRzlx();
pageList.get(i).setRzlx(dictdetaServcice.queryDictName(DictConstant.INVOICE_RZLX, rzlx));
String inAccountStatus = pageList.get(i).getInAccountStatus();
pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,inAccountStatus));
if ("1".equals(inAccountStatus)){
pageList.get(i).setInAccountStatus("已入账");
}else if ("0".equals(inAccountStatus)) {
pageList.get(i).setInAccountStatus("未入账");
}
// if (rzlxModels!=null){
// for (DictdetaModel model : rzlxModels){

9
dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java
Unescape View File

@ -142,9 +142,14 @@ public class TicketServiceImpl extends MpBaseServiceImpl<ExtTicketDao, ExtTicket
pageList.get(i).setCreateDate(pageList.get(i).getCreateDate().substring(0, 10));
}
//报账单号字典值转换
if ("1".equals(pageList.get(i).getInAccountStatus())){
pageList.get(i).setInAccountStatus("已入账");
}else if ("0".equals(pageList.get(i).getInAccountStatus())){
pageList.get(i).setInAccountStatus("未入账");
}
log.info("入账状态====>{}",pageList.get(i).getInAccountStatus());
pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,pageList.get(i).getInAccountStatus()));
log.info("入账状态====>{}",pageList.get(i).getInAccountStatus());
// pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,pageList.get(i).getInAccountStatus()));
// log.info("入账状态====>{}",pageList.get(i).getInAccountStatus());
}
}

53
dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java
Unescape View File

@ -49,12 +49,12 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
try {
String[] titlelist = {"序号", "发票类型", "发票代码", "发票号码", "发票状态", "开票日期", "销方名称", "销方税号", "金额", "税额", "有效税额",
"价税合计", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", "采集来源", "签收方式", "签收状态", "签收日期", "签收人",
"入账月份", "入账状态","凭证号", "过账时间", "影像号", "账期","是否末次摊销", "摊销金额", "剩余金额", "业务单号", "入池时间","报账单号","入账状态"};
"入账月份", "凭证号", "过账时间", "影像号", "账期","是否末次摊销", "摊销金额", "剩余金额", "业务单号", "入池时间","报账单号","入账状态"};
String[] titleprop = {"xh", "invoiceType", "invoiceCode", "invoiceNo", "invoiceStatus", "invoiceDate",
"xfmc", "xfsh", "invoiceAmount", "taxAmount", "yxse", "totalAmount", "rzzt", "rzlx", "rzrq", "rzfs",
"rzr", "collectStatus", "collectDate", "collectFrom", "qsfs", "qszt", "qsrq", "qsr", "inAccountMonth",
"inAccountStatus", "voucherNo","postingTime","imageId","accountPeriod", "amortizeStatus", "amortizeAmount", "remainAmortizeAmount",
"snVoucherNumber","postingTime","imageNumber","accountPeriod", "amortizeStatus", "amortizeAmount", "remainAmortizeAmount",
"documentNumber", "createDate","bzdh","inAccountStatus"};
// 需要设置返回列表标题时调用
json = super.setTitleList(titlelist, titleprop);
@ -158,11 +158,12 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
} else {
pageList.get(i).setRzlx("");
}
// if ("0".equals(pageList.get(i).getInAccountStatus())) {
// pageList.get(i).setInAccountStatus("未入账");
// } else if ("1".equals(pageList.get(i).getInAccountStatus())) {
// pageList.get(i).setInAccountStatus("已入账");
// } else {
if ("0".equals(pageList.get(i).getInAccountStatus())) {
pageList.get(i).setInAccountStatus("未入账");
} else if ("1".equals(pageList.get(i).getInAccountStatus())) {
pageList.get(i).setInAccountStatus("已入账");
}
// else {
// pageList.get(i).setInAccountStatus("未入账");
// }
@ -172,7 +173,7 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
pageList.get(i).setCollectFrom("票据采集");
}
//报账单号字典值转换
pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,pageList.get(i).getInAccountStatus()));
// pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,pageList.get(i).getInAccountStatus()));
log.info("入账状态====>{}",pageList.get(i).getInAccountStatus());
pageList.get(i).setInvoiceType(InvoiceTypeUtils.invoiceTypeName(pageList.get(i).getInvoiceType()));
pageList.get(i).setQsrq(pageList.get(i).getQsrq() == null ? "" : pageList.get(i).getQsrq());
@ -218,8 +219,8 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
{"序号", "发票类型", "发票代码", "发票号码", "开票日期", "金额", "签收状态", "签收日期", "签收方式", "签收人", "业务单号"
, "入池时间","凭证号", "过账时间", "影像号", "账期","报账单号","入账状态"};
String[] titleprop = {"xh", "invoiceTypeString", "invoiceCode", "invoiceNo", "invoiceDate", "invoiceAmount",
"qszt", "qsrq", "qsfs", "qsr", "businessDocumentNumber", "createDate","voucherNo", "postingTime",
"imageId","accountPeriod","bzdh","inAccountStatus"};
"qszt", "qsrq", "qsfs", "qsr", "businessDocumentNumber", "createDate","snVoucherNumber", "postingTime",
"imageNumber","accountPeriod","bzdh","inAccountStatus"};
// 需要设置返回列表标题时调用
json = super.setTitleList(titlelist, titleprop);
PageHelper.startPage(curr, size);
@ -274,9 +275,17 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
pageList.get(i).setScanId(pageList.get(i).getScanId() == null ? "" : pageList.get(i).getScanId());
pageList.get(i)
.setInvoiceTypeString(InvoiceTypeUtils.invoiceTypeName(pageList.get(i).getInvoiceType()));
log.info("inAccountStatus=====>{}",pageList.get(i).getInAccountStatus());
pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,
pageList.get(i).getInAccountStatus()));
if (pageList.get(i).getInAccountStatus()!= null){
if ("1".equals(pageList.get(i).getInAccountStatus())){
pageList.get(i).setInAccountStatus("已入账");
}
if ("0".equals(pageList.get(i).getInAccountStatus())) {
pageList.get(i).setInAccountStatus("未入账");
}
}
// log.info("inAccountStatus=====>{}",pageList.get(i).getInAccountStatus());
// pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,
// pageList.get(i).getInAccountStatus()));
}
@ -387,13 +396,13 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
} else {
pageList.get(i).setRzlx("");
}
// if ("0".equals(pageList.get(i).getInAccountStatus())) {
// pageList.get(i).setInAccountStatus("未入账");
// } else if ("1".equals(pageList.get(i).getInAccountStatus())) {
// pageList.get(i).setInAccountStatus("已入账");
// } else {
// pageList.get(i).setInAccountStatus("");
// }
if ("0".equals(pageList.get(i).getInAccountStatus())) {
pageList.get(i).setInAccountStatus("未入账");
} else if ("1".equals(pageList.get(i).getInAccountStatus())) {
pageList.get(i).setInAccountStatus("已入账");
} else {
pageList.get(i).setInAccountStatus("");
}
if ("0".equals(pageList.get(i).getListStatus())) {
pageList.get(i).setListStatus("否");
} else if ("1".equals(pageList.get(i).getListStatus())) {
@ -412,8 +421,8 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl<ExtInvoicePoolD
pageList.get(i).getInAccountMonth() == null ? "" : pageList.get(i).getInAccountMonth());
pageList.get(i).setScanId(pageList.get(i).getScanId() == null ? "" : pageList.get(i).getScanId());
pageList.get(i).setInvoiceType(InvoiceTypeUtils.invoiceTypeName(pageList.get(i).getInvoiceType()));
pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,
pageList.get(i).getInAccountStatus()));
// pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,
// pageList.get(i).getInAccountStatus()));
}
}

26
dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml
Unescape View File

@ -73,12 +73,10 @@
<foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
<if
test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
<if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType != '99' ">
and t.invoice_type = #{invoiceType}
</if>
<if
test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' and invoiceStatus != '99'">
<if test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' and invoiceStatus != '99'">
and t.invoice_status = #{invoiceStatus}
</if>
<if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
@ -126,8 +124,7 @@
<if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
and t.sn_voucher_number = #{snVoucherNumber}
</if>
<if
test="inAccountMonth != null and inAccountMonth != null and inAccountMonth != '' and inAccountMonth != ''">
<if test="inAccountMonth != null and inAccountMonth != null and inAccountMonth != '' and inAccountMonth != ''">
and DATE_FORMAT(t.payment_date,'%Y-%m') = #{inAccountMonth}
</if>
<if test="invoiceSource!=null and invoiceSource!='' and invoiceSource!='99'">
@ -163,7 +160,6 @@
t.qs_name qsr,
DATE_FORMAT(t.payment_date,'%Y-%m') inAccountMonth,
t.payment_status paymentStatus,
t.inaccount_status inAccountStatus,
t.voucher_number voucherNo,
t.sn_voucher_number snVoucherNumber,
t.posting_time postingTime,
@ -180,6 +176,7 @@
t.account_period accountPeriod,
t.inaccount_status inAccountStatus,
t.bzdh bzdh,
t.posting_time postingTime,
DATE_FORMAT(t.collect_date,'%Y-%m-%d') collectDate,
t.collect_from collectFrom
from t_dx_record_invoice t
@ -301,22 +298,22 @@
AND qs_type = #{qsfs}
</if>
<if test="postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null' and postingTimeEnd != '99' and postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null' and postingTimeStart != '99'">
and t.posting_time between #{postingTimeStart} and #{postingTimeEnd}
and posting_time between #{postingTimeStart} and #{postingTimeEnd}
</if>
<if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' and imageNumber != '99'">
and t.image_id = #{imageNumber}
and image_id = #{imageNumber}
</if>
<if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
and t.account_period = #{accountPeriod}
and account_period = #{accountPeriod}
</if>
<if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null' and inAccountStatus != '99'">
and t.inaccount_status = #{inAccountStatus}
and inaccount_status = #{inAccountStatus}
</if>
<if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
and t.bzdh = #{bzdh}
and bzdh = #{bzdh}
</if>
<if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
and t.sn_voucher_number = #{snVoucherNumber}
and sn_voucher_number = #{snVoucherNumber}
</if>
GROUP BY uuid having min(create_date) ) t
</select>
@ -339,9 +336,8 @@
scan_id scanId,
business_document_number businessDocumentNumber,
account_period accountPeriod,
image_id imageId,
image_id imageNumber,
posting_time postingTime,
sn_voucher_number voucherNo,
inaccount_status inAccountStatus,
bzdh bzdh,
sn_voucher_number snVoucherNumber

8
dxhy-extend/src/main/resources/mapper/TicketMapper.xml
Unescape View File

@ -67,10 +67,10 @@
and t.inaccount_status = #{inAccountStatus}
</if>
<if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
t.bzdh = #{bzdh}
and t.bzdh = #{bzdh}
</if>
<if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
t.sn_voucher_number = #{snVoucherNumber}
and t.sn_voucher_number = #{snVoucherNumber}
</if>
</select>
@ -131,10 +131,10 @@
and t.inaccount_status = #{inAccountStatus}
</if>
<if test="bzdh != null and bzdh != '' and bzdh != 'null' and badh != '99'">
t.bzdh = #{bzdh}
and t.bzdh = #{bzdh}
</if>
<if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
t.sn_voucher_number = #{snVoucherNumber}
and t.sn_voucher_number = #{snVoucherNumber}
</if>
</select>
</mapper>

20
dxhy-operation-flow/src/main/resources/bootstrap-dev.yaml
Unescape View File

@ -4,22 +4,24 @@ spring:
nacos:
config:
# Nacos config 地址
server-addr: 10.1.2.202:8848
server-addr: 172.31.36.147:33000
# Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace）
namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6
# Nacos config 分组
group: dxhy-flow-group
# Nacos config 登录用户名
username: dxhy-jxpt
username: nacos
# Nacos config 登录密码
password: dxhy-jxpt
password: Invoice.nacos.!1
# Nacos config 配置文件前缀
prefix: dxhy-flow
prefix: dxhy-erp
# Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension}
file-extension: yaml
# Nacos discovery 配置
discovery:
server-addr: 10.1.2.202:8848
username: dxhy-jxpt
password: dxhy-jxpt
namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
server-addr: 172.31.36.147:33000
# Nacos config 登录用户名
username: nacos
# Nacos config 登录密码
password: Invoice.nacos.!1
namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6

1
dxhy-sign/src/main/java/com/dxhy/sign/controller/SignElecInvoiceController.java
Unescape View File

@ -355,6 +355,7 @@ public class SignElecInvoiceController extends AbstractController {
@RequestMapping("/deleteElec")
@SysLog("删除签收失败发票")
public ResponseEntity<R> deleteElec(@RequestBody Map<String, String> pramsMap) {
log.info("删除签收失败发票参数{}",pramsMap);
try {
// 删除 扫描表信息
boolean deleteElec = signElecInvoiceService.deleteElec(pramsMap.get("scanId"), getUserInfo().getDbName());

2
dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java
Unescape View File

@ -657,7 +657,7 @@ public class SignFpqsController extends AbstractController {
int size = (int)pramsMap.get("size");
try {
log.info("签收列表查询参数 {}",data);
log.info("返回结果为 {}",signFpqsService.selectQsfpList(data,curr,size));
// log.info("返回结果为 {}",signFpqsService.selectQsfpList(data,curr,size));
return ResponseEntity.ok(R.ok().put("data", signFpqsService.selectQsfpList(data, curr, size)));
} catch (Exception e) {
e.printStackTrace();

Write Preview
Loading…
Cancel
Save