Commit c1ffc8d4 authored by suhuiguang's avatar suhuiguang

fix(jg):行政审批局

1.后续业务刷库时去掉状态过滤,有3个业务查询逻辑(流程中时没实时查询))有问题适配
parent ae6f0518
...@@ -46,7 +46,7 @@ public class ReceiveOrgFixService { ...@@ -46,7 +46,7 @@ public class ReceiveOrgFixService {
AtomicReference<Integer> dealNum = new AtomicReference<>(0); AtomicReference<Integer> dealNum = new AtomicReference<>(0);
Map<String, JgUseRegistrationManage> certSeqEnteyMap = new HashMap<>(); Map<String, JgUseRegistrationManage> certSeqEnteyMap = new HashMap<>();
// 注销报废 // 注销报废
List<JgScrapCancel> scrapCancels = jgScrapCancelService.list(new LambdaQueryWrapper<JgScrapCancel>().in(JgScrapCancel::getAuditStatus, Arrays.asList("已完成", "已作废")).select(BaseEntity::getSequenceNbr, JgScrapCancel::getApplyNo)); List<JgScrapCancel> scrapCancels = jgScrapCancelService.list(new LambdaQueryWrapper<JgScrapCancel>().select(BaseEntity::getSequenceNbr, JgScrapCancel::getApplyNo));
scrapCancels.forEach(scrapCancel -> { scrapCancels.forEach(scrapCancel -> {
JSONObject jsonObject = commonService.queryHistoryData(scrapCancel.getSequenceNbr()); JSONObject jsonObject = commonService.queryHistoryData(scrapCancel.getSequenceNbr());
String certKey = ""; String certKey = "";
...@@ -99,7 +99,7 @@ public class ReceiveOrgFixService { ...@@ -99,7 +99,7 @@ public class ReceiveOrgFixService {
watch.stop(); watch.stop();
watch.start("单位变更登记由移装变更登记到行政审批"); watch.start("单位变更登记由移装变更登记到行政审批");
// 单位变更登记 // 单位变更登记
List<JgChangeRegistrationUnit> registrationUnits = changeRegistrationUnitService.lambdaQuery().in(JgChangeRegistrationUnit::getStatus, Arrays.asList("已完成", "已作废")).select(BaseEntity::getSequenceNbr, JgChangeRegistrationUnit::getApplyNo, JgChangeRegistrationUnit::getEquCategoryCode).list(); List<JgChangeRegistrationUnit> registrationUnits = changeRegistrationUnitService.lambdaQuery().select(BaseEntity::getSequenceNbr, JgChangeRegistrationUnit::getApplyNo, JgChangeRegistrationUnit::getEquCategoryCode).list();
registrationUnits.forEach(registrationUnit -> { registrationUnits.forEach(registrationUnit -> {
JSONArray registrationList = commonService.queryHistoryDataObj(registrationUnit.getApplyNo()); JSONArray registrationList = commonService.queryHistoryDataObj(registrationUnit.getApplyNo());
if (!CylinderTypeEnum.CYLINDER.getCode().equals(registrationUnit.getEquCategoryCode())) { if (!CylinderTypeEnum.CYLINDER.getCode().equals(registrationUnit.getEquCategoryCode())) {
...@@ -119,7 +119,7 @@ public class ReceiveOrgFixService { ...@@ -119,7 +119,7 @@ public class ReceiveOrgFixService {
watch.stop(); watch.stop();
watch.start("更名变更登记由移装变更登记到行政审批"); watch.start("更名变更登记由移装变更登记到行政审批");
// 更名变更登记 // 更名变更登记
List<JgChangeRegistrationName> registrationNames = changeRegistrationNameService.lambdaQuery().in(JgChangeRegistrationName::getAuditStatus, Arrays.asList("已完成", "已作废")).select(BaseEntity::getSequenceNbr, JgChangeRegistrationName::getApplyNo).list(); List<JgChangeRegistrationName> registrationNames = changeRegistrationNameService.lambdaQuery().select(BaseEntity::getSequenceNbr, JgChangeRegistrationName::getApplyNo).list();
registrationNames.forEach(registrationName -> { registrationNames.forEach(registrationName -> {
JSONObject historyData = commonService.queryHistoryData(registrationName.getSequenceNbr()); JSONObject historyData = commonService.queryHistoryData(registrationName.getSequenceNbr());
if (historyData != null) { if (historyData != null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment