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

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

Browse Source
release
wangrangrang 2 years ago
parent d08b8cdbe7 caeeca6eea
commit 3cb363e9d1
2 changed files with 127 additions and 9 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. 49
      dxhy-core/src/main/java/com/dxhy/core/service/frJob/QueryDetailDataServiceImpl.java
  2. 87
      dxhy-core/src/main/java/com/dxhy/core/service/frJob/RecordToQueryServiceImpl.java

49
dxhy-core/src/main/java/com/dxhy/core/service/frJob/QueryDetailDataServiceImpl.java
Unescape View File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dxhy.core.dao.frTask.QueryDetailDataDao; import com.dxhy.core.dao.frTask.QueryDetailDataDao;
import com.dxhy.core.enmu.FplxEnmu; import com.dxhy.core.enmu.FplxEnmu;
import com.dxhy.core.entity.frJob.VoucherRecordQuery;
import com.dxhy.core.entity.frJob.VoucherRecordQueryDetail; import com.dxhy.core.entity.frJob.VoucherRecordQueryDetail;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -39,7 +40,22 @@ public class QueryDetailDataServiceImpl extends ServiceImpl<QueryDetailDataDao,
if (dataFromRecordItems != null && dataFromRecordItems.size() != 0){ if (dataFromRecordItems != null && dataFromRecordItems.size() != 0){
dataFromRecordItems.stream().forEach(e->e.setFplxmc(FplxEnmu.getFplxMap().get(e.getFplx()))); dataFromRecordItems.stream().forEach(e->e.setFplxmc(FplxEnmu.getFplxMap().get(e.getFplx())));
//4.添加入库 //4.添加入库
queryDetailDataDao.saveOrUpdate(dataFromRecordItems);
if (dataFromRecordItems.size()>5000){
int count = dataFromRecordItems.size()%5000==0?dataFromRecordItems.size()/5000:dataFromRecordItems.size()/5000+1;
for (int i = 0; i < count; i++) {
int start = i*5000;
int end = (i+1)*5000;
if (i == count-1){
end = dataFromRecordItems.size();
}
List<VoucherRecordQueryDetail> subList = dataFromRecordItems.subList(start,end);
queryDetailDataDao.saveOrUpdate(subList);
}
}else {
queryDetailDataDao.saveOrUpdate(dataFromRecordItems);
}
} }
} }
@ -53,7 +69,21 @@ public class QueryDetailDataServiceImpl extends ServiceImpl<QueryDetailDataDao,
if (dataFromRecordItems != null && dataFromRecordItems.size() != 0){ if (dataFromRecordItems != null && dataFromRecordItems.size() != 0){
dataFromRecordItems.stream().forEach(e->e.setFplxmc(FplxEnmu.getFplxMap().get(e.getFplx()))); dataFromRecordItems.stream().forEach(e->e.setFplxmc(FplxEnmu.getFplxMap().get(e.getFplx())));
//4.添加入库 //4.添加入库
queryDetailDataDao.saveOrUpdate(dataFromRecordItems);
if (dataFromRecordItems.size()>5000){
int count = dataFromRecordItems.size()%5000==0?dataFromRecordItems.size()/5000:dataFromRecordItems.size()/5000+1;
for (int i = 0; i < count; i++) {
int start = i*5000;
int end = (i+1)*5000;
if (i == count-1){
end = dataFromRecordItems.size();
}
List<VoucherRecordQueryDetail> subList = dataFromRecordItems.subList(start,end);
queryDetailDataDao.saveOrUpdate(subList);
}
}else {
queryDetailDataDao.saveOrUpdate(dataFromRecordItems);
}
} }
} }
@ -67,7 +97,20 @@ public class QueryDetailDataServiceImpl extends ServiceImpl<QueryDetailDataDao,
if (dataFromRecordItems != null && dataFromRecordItems.size() != 0){ if (dataFromRecordItems != null && dataFromRecordItems.size() != 0){
dataFromRecordItems.stream().forEach(e->e.setFplxmc(FplxEnmu.getFplxMap().get(e.getFplx()))); dataFromRecordItems.stream().forEach(e->e.setFplxmc(FplxEnmu.getFplxMap().get(e.getFplx())));
//4.添加入库 //4.添加入库
queryDetailDataDao.saveOrUpdate(dataFromRecordItems); if (dataFromRecordItems.size()>5000){
int count = dataFromRecordItems.size()%5000==0?dataFromRecordItems.size()/5000:dataFromRecordItems.size()/5000+1;
for (int i = 0; i < count; i++) {
int start = i*5000;
int end = (i+1)*5000;
if (i == count-1){
end = dataFromRecordItems.size();
}
List<VoucherRecordQueryDetail> subList = dataFromRecordItems.subList(start,end);
queryDetailDataDao.saveOrUpdate(subList);
}
}else {
queryDetailDataDao.saveOrUpdate(dataFromRecordItems);
}
} }
} }

87
dxhy-core/src/main/java/com/dxhy/core/service/frJob/RecordToQueryServiceImpl.java
Unescape View File

@ -6,6 +6,7 @@ import com.dxhy.core.dao.frTask.RecordToQueryDao;
import com.dxhy.common.enums.KjkmTaxEnmu; import com.dxhy.common.enums.KjkmTaxEnmu;
import com.dxhy.core.entity.frJob.FpTaxAmount; import com.dxhy.core.entity.frJob.FpTaxAmount;
import com.dxhy.core.entity.frJob.VoucherRecordQuery; import com.dxhy.core.entity.frJob.VoucherRecordQuery;
import com.dxhy.core.entity.frJob.VoucherRecordQueryDetail;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -71,9 +72,29 @@ public class RecordToQueryServiceImpl extends ServiceImpl<RecordToQueryDao, Vouc
//更新发票认证状态 //更新发票认证状态
List<String> uuids = queryDetailDataService.getRzztDetail(); List<String> uuids = queryDetailDataService.getRzztDetail();
List<String> rzztList = recordToQueryDao.getRzzt(uuids); if (uuids != null && uuids.size() > 0){
if (uuids.size() > 5000){
int count = uuids.size()%5000==0?uuids.size()/5000:uuids.size()/5000+1;
for (int i = 0; i < count; i++) {
int start = i*5000;
int end = (i+1)*5000;
if (i == count-1){
end = uuids.size();
}
List<String> subList = uuids.subList(start,end);
queryDetailDataService.updateRzzt(subList);
}
}else {
List<String> rzztList = recordToQueryDao.getRzzt(uuids);
if (rzztList != null && rzztList.size() > 0){
queryDetailDataService.updateRzzt(rzztList);
}
}
}
queryDetailDataService.updateRzzt(rzztList);
} }
@ -106,7 +127,21 @@ public class RecordToQueryServiceImpl extends ServiceImpl<RecordToQueryDao, Vouc
voucherRecordQuerys.forEach(v->v.setFpse(amountMap.get(v.getSl()+v.getBzdh())==null?"0":amountMap.get(v.getSl()+v.getBzdh()))); voucherRecordQuerys.forEach(v->v.setFpse(amountMap.get(v.getSl()+v.getBzdh())==null?"0":amountMap.get(v.getSl()+v.getBzdh())));
} }
//8.保存或更新 //8.保存或更新
recordToQueryDao.insertOrUpdate(voucherRecordQuerys);
if (voucherRecordQuerys.size()>5000){
int count = voucherRecordQuerys.size()%5000==0?voucherRecordQuerys.size()/5000:voucherRecordQuerys.size()/5000+1;
for (int i = 0; i < count; i++) {
int start = i*5000;
int end = (i+1)*5000;
if (i == count-1){
end = voucherRecordQuerys.size();
}
List<VoucherRecordQuery> subList = voucherRecordQuerys.subList(start,end);
recordToQueryDao.insertOrUpdate(subList);
}
}else {
recordToQueryDao.insertOrUpdate(voucherRecordQuerys);
}
flag = true; flag = true;
} }
return flag; return flag;
@ -145,7 +180,21 @@ public class RecordToQueryServiceImpl extends ServiceImpl<RecordToQueryDao, Vouc
} }
//8.保存或更新 //8.保存或更新
recordToQueryDao.insertOrUpdate(voucherRecordQuerys);
if (voucherRecordQuerys.size()>5000){
int count = voucherRecordQuerys.size()%5000==0?voucherRecordQuerys.size()/5000:voucherRecordQuerys.size()/5000+1;
for (int i = 0; i < count; i++) {
int start = i*5000;
int end = (i+1)*5000;
if (i == count-1){
end = voucherRecordQuerys.size();
}
List<VoucherRecordQuery> subList = voucherRecordQuerys.subList(start,end);
recordToQueryDao.insertOrUpdate(subList);
}
}else {
recordToQueryDao.insertOrUpdate(voucherRecordQuerys);
}
flag = true; flag = true;
} }
return flag; return flag;
@ -178,7 +227,20 @@ public class RecordToQueryServiceImpl extends ServiceImpl<RecordToQueryDao, Vouc
} }
//6.保存或更新 //6.保存或更新
recordToQueryDao.insertOrUpdate(voucherRecordQuerys); if (voucherRecordQuerys.size()>5000){
int count = voucherRecordQuerys.size()%5000==0?voucherRecordQuerys.size()/5000:voucherRecordQuerys.size()/5000+1;
for (int i = 0; i < count; i++) {
int start = i*5000;
int end = (i+1)*5000;
if (i == count-1){
end = voucherRecordQuerys.size();
}
List<VoucherRecordQuery> subList = voucherRecordQuerys.subList(start,end);
recordToQueryDao.insertOrUpdate(subList);
}
}else {
recordToQueryDao.insertOrUpdate(voucherRecordQuerys);
}
flag = true; flag = true;
} }
return flag; return flag;
@ -193,7 +255,20 @@ public class RecordToQueryServiceImpl extends ServiceImpl<RecordToQueryDao, Vouc
if (dataFromRecordItems != null && dataFromRecordItems.size() != 0){ if (dataFromRecordItems != null && dataFromRecordItems.size() != 0){
recordToQueryDao.insertOrUpdate(dataFromRecordItems); if (dataFromRecordItems.size()>5000){
int count = dataFromRecordItems.size()%5000==0?dataFromRecordItems.size()/5000:dataFromRecordItems.size()/5000+1;
for (int i = 0; i < count; i++) {
int start = i*5000;
int end = (i+1)*5000;
if (i == count-1){
end = dataFromRecordItems.size();
}
List<VoucherRecordQuery> subList = dataFromRecordItems.subList(start,end);
recordToQueryDao.insertOrUpdate(subList);
}
}else {
recordToQueryDao.insertOrUpdate(dataFromRecordItems);
}
} }

Write Preview
Loading…
Cancel
Save