release
路明慧 2 years ago
parent b363730004
commit e322866b62
  1. 6
      dxhy-core/src/main/java/com/dxhy/core/service/frJob/QueryDetailDataServiceImpl.java
  2. 6
      dxhy-core/src/main/java/com/dxhy/core/service/frJob/RecordToQueryServiceImpl.java
  3. 3
      dxhy-core/src/main/java/com/dxhy/core/service/frJob/VoucherRecordItemServiceImpl.java
  4. 3
      dxhy-core/src/main/resources/mapper/frJob/QueryDetailDataDao.xml
  5. 2
      dxhy-core/src/main/resources/mapper/frJob/RecordToQueryDao.xml

@ -3,6 +3,8 @@ package com.dxhy.core.service.frJob;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dxhy.common.constant.DbConstant;
import com.dxhy.common.datasource.config.DynamicContextHolder;
import com.dxhy.core.dao.frTask.QueryDetailDataDao;
import com.dxhy.core.enmu.FplxEnmu;
import com.dxhy.core.entity.frJob.VoucherRecordQueryDetail;
@ -33,6 +35,7 @@ public class QueryDetailDataServiceImpl extends ServiceImpl<QueryDetailDataDao,
@Override
public void insertJxDataToQueryDetail(){
//1.查询时间
DynamicContextHolder.push("business"+ DbConstant.BUSINESS_READ);
String[] time = getTime(JXZZS);
//2.按照时间查询增量数据
List<VoucherRecordQueryDetail> dataFromRecordItems = queryDetailDataDao.getDataFromRecord(time[0], time[1],JXZZS);
@ -47,6 +50,7 @@ public class QueryDetailDataServiceImpl extends ServiceImpl<QueryDetailDataDao,
@Override
public void insertXxDataToQueryDetail(){
//1.查询时间
DynamicContextHolder.push("business"+DbConstant.BUSINESS_READ);
String[] time = getTime(XXZZS);
//2.按照时间查询增量数据
List<VoucherRecordQueryDetail> dataFromRecordItems = queryDetailDataDao.getDataFromRecordXx(time[0], time[1],XXZZS);
@ -61,6 +65,7 @@ public class QueryDetailDataServiceImpl extends ServiceImpl<QueryDetailDataDao,
@Override
public void insertZyDataToQueryDetail(){
//1.查询时间
DynamicContextHolder.push("business"+DbConstant.BUSINESS_READ);
String[] time = getTime(ZYYWSR);
//2.按照时间查询增量数据
List<VoucherRecordQueryDetail> dataFromRecordItems = queryDetailDataDao.getDataFromRecordJe(time[0], time[1],ZYYWSR);
@ -75,6 +80,7 @@ public class QueryDetailDataServiceImpl extends ServiceImpl<QueryDetailDataDao,
@Override
public String[] getTime(String km){
//1.获取增量数据开始时间
DynamicContextHolder.push("business"+DbConstant.BUSINESS_READ);
Date beginTime = queryDetailDataDao.getBeginTime(km);
//2.第一次取原表时间
if (beginTime == null){

@ -2,6 +2,8 @@ package com.dxhy.core.service.frJob;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dxhy.common.constant.DbConstant;
import com.dxhy.common.datasource.config.DynamicContextHolder;
import com.dxhy.core.dao.frTask.RecordToQueryDao;
import com.dxhy.core.enmu.KjkmTaxEnmu;
import com.dxhy.core.entity.frJob.FpTaxAmount;
@ -66,6 +68,7 @@ public class RecordToQueryServiceImpl extends ServiceImpl<RecordToQueryDao, Vouc
boolean flag = false;
//1.获取时间
DynamicContextHolder.push("business"+ DbConstant.BUSINESS_READ);
String[] time = getTime(JXZZS);
//2.查询数据
@ -101,6 +104,7 @@ public class RecordToQueryServiceImpl extends ServiceImpl<RecordToQueryDao, Vouc
public boolean insertXxDataToQuery() {
boolean flag = false;
//1.获取时间
DynamicContextHolder.push("business"+DbConstant.BUSINESS_READ);
String[] time = getTime(XXZZS);
//2.查询数据
@ -139,6 +143,7 @@ public class RecordToQueryServiceImpl extends ServiceImpl<RecordToQueryDao, Vouc
public boolean insertZyDataToQuery() {
boolean flag = false;
//1.获取时间
DynamicContextHolder.push("business"+DbConstant.BUSINESS_READ);
String[] time = getTime(ZYYWSR);
//2.查询数据
@ -170,6 +175,7 @@ public class RecordToQueryServiceImpl extends ServiceImpl<RecordToQueryDao, Vouc
public void insertOutDataToQuery() {
//获取时间
DynamicContextHolder.push("business"+DbConstant.BUSINESS_READ);
String[] time = this.getTime(JXSZC);
//查询数据
List<VoucherRecordQuery> dataFromRecordItems = recordToQueryDao.getDataFromRecordItems(time[0], time[1], JXSZC);

@ -1,6 +1,8 @@
package com.dxhy.core.service.frJob;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dxhy.common.constant.DbConstant;
import com.dxhy.common.datasource.config.DynamicContextHolder;
import com.dxhy.core.dao.frTask.VoucherRecordItemDao;
import com.dxhy.core.enmu.KjkmTaxEnmu;
import com.dxhy.core.entity.frJob.VoucherRecordItemEntity;
@ -30,6 +32,7 @@ public class VoucherRecordItemServiceImpl extends ServiceImpl<VoucherRecordItemD
@Override
public boolean refreshTax(){
try {
DynamicContextHolder.push("business"+DbConstant.BUSINESS_READ);
String[] jxTime = queryDetailDataService.getTime(JXZZS);
//查询进项数据
List<VoucherRecordItemEntity> jxVoucherRecordItems = voucherRecordItemDao.getByTime(jxTime[0], jxTime[1], JXZZS);

@ -60,6 +60,7 @@
on i.relation_id = r.id
where i.racct like CONCAT(#{kjkmbh},'%')
and r.create_time between #{beginTime} and #{endTime}
and r.zbzdh != ''
group by r.zbzdh,i.racct
) v on t.bzdh = v.zbzdh
where d.tax_rate = v.sl
@ -130,6 +131,7 @@
on i.relation_id = r.id
where i.racct like CONCAT(#{kjkmbh},'%')
and r.create_time between #{beginTime} and #{endTime}
and r.zbzdh != ''
group by r.zbzdh,i.racct
) v on t.bzdh = v.zbzdh
where d.tax_rate = v.sl
@ -176,6 +178,7 @@
on i.relation_id = r.id
where i.racct like CONCAT(#{kjkmbh},'%')
and r.create_time between #{beginTime} and #{endTime}
and r.zbzdh != ''
group by r.zbzdh,i.racct
) v on t.bzdh = v.zbzdh
where d.tax_rate = v.sl

@ -37,6 +37,7 @@
ON v.id = i.relation_id
where i.racct like CONCAT(#{kjkmbh},'%')
and DATE_FORMAT(v.create_time,'%Y-%m-%d %H:%i:%s') between #{start} and #{end}
and v.zbzdh != ''
group by v.zbzdh,i.racct
</select>
@ -96,6 +97,7 @@
ON v.id = i.relation_id
where i.racct like CONCAT(#{kjkmbh},'%')
and DATE_FORMAT(v.create_time,'%Y-%m-%d %H:%i:%s') between #{start} and #{end}
and v.zbzdh != ''
group by v.zbzdh,i.racct
</select>

Loading…
Cancel
Save