diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
index 91a797c7..b7a03ff0 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
@@ -173,6 +173,17 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl
+
@@ -79,7 +80,7 @@
,t.qs_type,t.qs_status,t.dk_tax_amount,t.qs_name,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period,
case date_format(t.invoice_date,'%Y%m%d') between c.select_start_date and c.select_end_date when
true then 1
- else 2 end authStatus,t.bzdh,t.suspend_status,t.suspend_date,
+ else 2 end authStatus,t.bzdh,t.suspend_status,t.suspend_date,t.auth_status,
t.inaccount_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.settlement_no,t.ele_invoice_no,t.tax_rate
from t_dx_record_invoice t left join t_dx_tax_current c on t.gf_tax_no = c.taxno
left join t_dx_dk_count d on c.taxno = d.taxno and c.current_tax_period = d.skssq
@@ -130,7 +131,7 @@
and t.qs_status = #{qszt}
- and t.auth_status in ('1','6')
+ and t.auth_status in ('0','6')
and (t.auth_status = '2' or t.auth_status = '3')
diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java
index e90e8518..0ed8d721 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java
@@ -72,7 +72,7 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl
List returnList = new ArrayList<>();
if (resultList != null && resultList.size() > 0) {
for (int i = 0; i < pageList.size(); i++) {
- String[] dataArray = new String[26];
+ String[] dataArray = new String[27];
dataArray[0] = String.valueOf((curr - 1) * size + i + 1);
dataArray[1] = pageList.get(i).getInvoiceCode();
dataArray[2] = pageList.get(i).getInvoiceNo();
@@ -108,16 +108,26 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl
}else {
dataArray[21] = "未入账";
}
+ String authStatus = pageList.get(i).getAuthStatus();
+ if ("0".equals(authStatus) || "6".equals(authStatus)){
+ dataArray[22] = "未认证";
+ }
+ if ("1".equals(authStatus) || "2".equals(authStatus) || "3".equals(authStatus)){
+ dataArray[22] = "认证中";
+ }
+ if ("5".equals(authStatus)){
+ dataArray[22] = "认证失败";
+ }
- dataArray[22] = pageList.get(i).getCompCode();
+ dataArray[23] = pageList.get(i).getCompCode();
if ("1".equals(pageList.get(i).getSuspendStatus())){
- dataArray[23] = "是";
- dataArray[24] = pageList.get(i).getSuspendDate();
+ dataArray[24] = "是";
+ dataArray[25] = pageList.get(i).getSuspendDate();
}else {
- dataArray[23] = "否";
- dataArray[24] = "";
+ dataArray[24] = "否";
+ dataArray[25] = "";
}
- dataArray[25] = pageList.get(i).getTaxRate();
+ dataArray[26] = pageList.get(i).getTaxRate();
diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java
index a9af7e2f..6065edef 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java
@@ -13,6 +13,7 @@ import com.dxhy.common.util.CustomCellWriteHandler;
import com.dxhy.common.util.ExceptionUtil;
import com.dxhy.common.util.StringHelper;
import com.dxhy.common.utils.DateUtils;
+import com.dxhy.common.utils.R;
import com.dxhy.core.entity.TDxExcelExportlog;
import com.dxhy.core.feign.IFeginWebsocket;
import com.dxhy.core.rabbitmq.Sender;
@@ -22,7 +23,8 @@ import com.dxhy.core.service.singletable.IExcelExportlogService;
import com.dxhy.core.util.JsonResponseUtils;
import com.dxhy.oss.service.FileService;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.ResponseEntity;
import java.io.File;
import java.io.FileOutputStream;
@@ -67,7 +69,7 @@ public class ManualAthensThread extends BaseThread {
* 导出excel的列名
*/
private final String[] titleColumns = {"序号", "发票代码", "发票号码", "发票类型","发票状态", "开票日期","购方名称", "销方名称", "金额", "税额",
- "抵扣税额", "签收状态", "签收日期", "签收方式", "签收人","凭证号", "过账时间", "影像号", "账期", "报账单号", "报账人","入账状态","所属组织"
+ "抵扣税额", "签收状态", "签收日期", "签收方式", "签收人","凭证号", "过账时间", "影像号", "账期", "报账单号", "报账人","入账状态","认证状态","所属组织"
,"暂挂状态","暂挂区间","税率"};
@@ -161,6 +163,8 @@ public class ManualAthensThread extends BaseThread {
String imageNumber = prams.getString("imageNumber");
String postingTimeEnd = prams.getString("postingTimeEnd");
String postingTimeStart = prams.getString("postingTimeStart");
+ String kpksrq = prams.getString("kpksrq");
+ String kpjsrq = prams.getString("kpjsrq");
List companyCodes = companyCodeArray.toJavaList(String.class);
// 参数转换为需要的形式
@@ -192,11 +196,11 @@ public class ManualAthensThread extends BaseThread {
if (cjjsyf != null && !"".equals(cjjsyf)) {
pramsMap.put("cjjsyf", DateUtils.getNight(DateUtils.strToDate(cjjsyf)));
}
- if (prams.get("kpksrq") != null && !"".equals(prams.get("kpksrq"))) {
- pramsMap.put("kpksrq",prams.getString("kpksrq"));
+ if (!StringUtils.isBlank(kpksrq)) {
+ pramsMap.put("kpksrq", DateUtils.getMorning(DateUtils.strToDate(kpksrq)));
}
- if (prams.get("kpjsrq") != null && !"".equals(prams.get("kpjsrq"))) {
- pramsMap.put("kpjsrq",prams.getString("kpjsrq"));
+ if (!StringUtils.isBlank(kpjsrq)) {
+ pramsMap.put("kpjsrq", DateUtils.getNight(DateUtils.strToDate(kpjsrq)));
}
if (prams.get("skssq") != null && !"".equals(prams.get("skssq")) && "1".equals(prams.get("rzzt"))) {
pramsMap.put("skssq", prams.get("skssq").toString().replace("-", ""));
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 70019182..5096e391 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -540,6 +540,7 @@
+