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

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

Browse Source 
# Conflicts:
#	dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
release
wangrangrang 2 years ago
parent 9e659be35c 1b77523c92
commit 1267520606
5 changed files with 53 additions and 17 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. 11
      dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
  2. 5
      dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
  3. 24
      dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java
  4. 16
      dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java
  5. 14
      dxhy-core/src/main/resources/mapper/FpZhMapper.xml

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

@ -173,6 +173,17 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
}
}
String authStatus = pageList.get(i).getAuthStatus();
if ("0".equals(authStatus) || "6".equals(authStatus)){
vo.setRzzt("未认证");
}
if ("1".equals(authStatus) || "2".equals(authStatus) || "3".equals(authStatus)){
vo.setRzzt("认证中");
}
if ("5".equals(authStatus)){
vo.setRzzt("认证失败");
}
String businessCode = pageList.get(i).getDeptId();
String businessName = this.getBusinessName(businessCode, businessList);

5
dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
Unescape View File

@ -36,6 +36,7 @@
<result column="suspend_date" property="suspendDate"/>
<result column="bzr" property="bzr"/>
<result column="uuid" property="uuid"/>
<result column="auth_status" property="authStatus"/>
</resultMap>
<resultMap id="hjResultMap"
type="com.dxhy.base.entity.BaseTDxRecordInvoice">
@ -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}
</if>
<if test="rzzt == '0'.toString()">
and t.auth_status in ('1','6')
and t.auth_status in ('0','6')
</if>
<if test="rzzt == '1'.toString()">
and (t.auth_status = '2' or t.auth_status = '3')

24
dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java
Unescape View File

@ -72,7 +72,7 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl<FpxxZhDao, FpRzRespVO>
List<String[]> 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<FpxxZhDao, FpRzRespVO>
}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();

16
dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java
Unescape View File

@ -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<String> 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("-", ""));

14
dxhy-core/src/main/resources/mapper/FpZhMapper.xml
Unescape View File

@ -540,6 +540,7 @@
<result column="suspend_date" property="suspendDate"/>
<result column="comp_code" property="compCode"/>
<result column="tax_rate" property="taxRate"/>
<result column="auth_status" property="authStatus"/>
</resultMap>
<select id="selectByparams" parameterType="java.util.Map"
resultMap="SggxcxResultMap" databaseId="mysql">
@ -549,14 +550,14 @@
,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.bzr,t.suspend_status,t.suspend_date,t.tax_rate,
else 2 end authStatus,t.bzdh,t.bzr,t.suspend_status,t.suspend_date,t.tax_rate,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
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
WHERE t.invoice_date between #{kpksrq} and #{kpjsrq}
and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08'))
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}
@ -611,6 +612,15 @@
<if test="bzr != null and bzr != '' and bzr != 'null'">
and t.bzr like concat('%',#{bzr},'%')
</if>
<if test="rzzt == '0'.toString()">
and t.auth_status in ('0','6')
</if>
<if test="rzzt == '1'.toString()">
and (t.auth_status = '2' or t.auth_status = '3')
</if>
<if test="rzzt == '2'.toString()">
and t.auth_status = '5'
</if>
<if test="suspendStatus != null and suspendStatus != '' and suspendStatus != 'null' and suspendStatus != '99' and suspendStatus == '1'.toString()">
and t.suspend_status = '1'
</if>

Write Preview
Loading…
Cancel
Save