feat: 国标拆分状态数据刷新
This commit is contained in:
+9
@@ -217,4 +217,13 @@ public class OldSystemController {
|
|||||||
return Result.OK(oldSystemDeptRelationService.fbAuthDeptDataFix());
|
return Result.OK(oldSystemDeptRelationService.fbAuthDeptDataFix());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/gbSplitStatusDataFix")
|
||||||
|
@AutoLog(value = "老法规系统-国标拆分状态")
|
||||||
|
@ApiOperation(value="老法规系统-国标拆分状态", notes="老法规系统-国标拆分状态")
|
||||||
|
@ApiOperationSupport(order = 100)
|
||||||
|
public Result<?> gbSplitStatusDataFix() {
|
||||||
|
return Result.OK(oldSystemDeptRelationService.gbSplitStatusDataFix());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-2
@@ -1,11 +1,10 @@
|
|||||||
package com.jero.modules.laws.oldSystem.service;
|
package com.jero.modules.laws.oldSystem.service;
|
||||||
|
|
||||||
import com.jero.modules.laws.oldSystem.entity.OldSystemDepartRelation;
|
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
import com.jero.modules.laws.oldSystem.entity.OldSystemDepartRelation;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author ThinkBook
|
* @author ThinkBook
|
||||||
@@ -25,4 +24,6 @@ public interface OldSystemDepartRelationService extends IService<OldSystemDepart
|
|||||||
String esAuthDeptDataFix();
|
String esAuthDeptDataFix();
|
||||||
|
|
||||||
String fbAuthDeptDataFix();
|
String fbAuthDeptDataFix();
|
||||||
|
|
||||||
|
String gbSplitStatusDataFix();
|
||||||
}
|
}
|
||||||
|
|||||||
+58
-15
@@ -1,6 +1,8 @@
|
|||||||
package com.jero.modules.laws.oldSystem.service.impl;
|
package com.jero.modules.laws.oldSystem.service.impl;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||||
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.jero.common.api.vo.ResultCommon;
|
import com.jero.common.api.vo.ResultCommon;
|
||||||
@@ -8,28 +10,24 @@ import com.jero.common.constant.CommonConstant;
|
|||||||
import com.jero.common.constant.enums.YesOrNoEnum;
|
import com.jero.common.constant.enums.YesOrNoEnum;
|
||||||
import com.jero.common.exception.JeroBootException;
|
import com.jero.common.exception.JeroBootException;
|
||||||
import com.jero.common.system.vo.SysDepartTreeModel;
|
import com.jero.common.system.vo.SysDepartTreeModel;
|
||||||
import com.jero.common.system.vo.SysDictItemCore;
|
|
||||||
import com.jero.common.util.MessageUtils;
|
import com.jero.common.util.MessageUtils;
|
||||||
import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualInit;
|
import com.jero.modules.laws.documenttool.entity.DocumentSplitInfo;
|
||||||
import com.jero.modules.activiti.util.ExcelUtils;
|
import com.jero.modules.laws.documenttool.service.IDocumentSplitService;
|
||||||
import com.jero.modules.laws.oldSystem.entity.ESAuthDept;
|
|
||||||
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept;
|
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept;
|
||||||
import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardAuthDeptMapper;
|
import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardAuthDeptMapper;
|
||||||
import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService;
|
import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService;
|
||||||
import com.jero.modules.laws.oldSystem.entity.OldSystemDepartRelation;
|
import com.jero.modules.laws.oldSystem.entity.OldSystemDepartRelation;
|
||||||
import com.jero.modules.laws.oldSystem.service.OldSystemDepartRelationService;
|
|
||||||
import com.jero.modules.laws.oldSystem.mapper.OldSystemDepartRelationMapper;
|
import com.jero.modules.laws.oldSystem.mapper.OldSystemDepartRelationMapper;
|
||||||
|
import com.jero.modules.laws.oldSystem.service.OldSystemDepartRelationService;
|
||||||
|
import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
|
||||||
|
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
|
||||||
import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
|
import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
|
||||||
|
import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
|
||||||
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
|
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
|
||||||
import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
|
import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
|
||||||
import com.jero.modules.system.entity.SysDepart;
|
import com.jero.modules.system.entity.SysDepart;
|
||||||
import com.jero.modules.system.service.ISysDepartService;
|
import com.jero.modules.system.service.ISysDepartService;
|
||||||
import lombok.Cleanup;
|
import lombok.Cleanup;
|
||||||
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
|
|
||||||
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
|
|
||||||
import com.jero.modules.laws.standard.service.ILawsTreeNodeService;
|
|
||||||
import com.jero.modules.system.entity.SysDepart;
|
|
||||||
import com.jero.modules.system.service.ISysDepartService;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.poi.ss.usermodel.Workbook;
|
import org.apache.poi.ss.usermodel.Workbook;
|
||||||
import org.jeecgframework.poi.excel.ExcelExportUtil;
|
import org.jeecgframework.poi.excel.ExcelExportUtil;
|
||||||
@@ -43,14 +41,9 @@ import org.springframework.web.multipart.MultipartFile;
|
|||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import javax.annotation.Resource;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.*;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
import java.util.stream.Stream;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author ThinkBook
|
* @author ThinkBook
|
||||||
@@ -84,6 +77,12 @@ public class OldSystemDepartRelationServiceImpl extends ServiceImpl<OldSystemDep
|
|||||||
@Resource
|
@Resource
|
||||||
private ILawsOverseasStandardService fbService;
|
private ILawsOverseasStandardService fbService;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private IDocumentSplitService documentSplitService;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private ILawsDomesticStandardService gbService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void importDepartRelationData(MultipartFile file, HttpServletResponse response) {
|
public void importDepartRelationData(MultipartFile file, HttpServletResponse response) {
|
||||||
List<OldSystemDepartRelation> errImportList = new ArrayList<>();
|
List<OldSystemDepartRelation> errImportList = new ArrayList<>();
|
||||||
@@ -370,6 +369,50 @@ public class OldSystemDepartRelationServiceImpl extends ServiceImpl<OldSystemDep
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String gbSplitStatusDataFix() {
|
||||||
|
IPage<DocumentSplitInfo> documentSplitInfoIPage = documentSplitService.queryByPage(null, 1, Integer.MAX_VALUE);
|
||||||
|
List<DocumentSplitInfo> documentSplitInfoList = documentSplitInfoIPage.getRecords();
|
||||||
|
if (documentSplitInfoList.isEmpty()) {
|
||||||
|
return "没有需要修复的数据";
|
||||||
|
}
|
||||||
|
List<String> splitStandardIdList = documentSplitInfoList.stream().map(DocumentSplitInfo::getStandardId).collect(Collectors.toList());
|
||||||
|
List<LawsDomesticStandard> gbList = gbService.list();
|
||||||
|
List<LawsEnterpriseStandard> esList = esService.list();
|
||||||
|
// 遍历所有拆分的标准
|
||||||
|
LambdaUpdateWrapper<LawsDomesticStandard> gbUpdateWrapper = new LambdaUpdateWrapper<>();
|
||||||
|
LambdaUpdateWrapper<LawsEnterpriseStandard> esUpdateWrapper = new LambdaUpdateWrapper<>();
|
||||||
|
|
||||||
|
// 遍历所有国标
|
||||||
|
for (LawsDomesticStandard gb : gbList) {
|
||||||
|
if (!splitStandardIdList.contains(gb.getId())) {
|
||||||
|
log.info("国标标准编号{}没有拆分数据", gb.getStandardNumber());
|
||||||
|
gbUpdateWrapper.eq(LawsDomesticStandard::getId, gb.getId())
|
||||||
|
.set(LawsDomesticStandard::getStandardSplitStatus, 2);
|
||||||
|
gbService.update(gbUpdateWrapper);
|
||||||
|
gbUpdateWrapper.clear();
|
||||||
|
} else {
|
||||||
|
gbUpdateWrapper.eq(LawsDomesticStandard::getId, gb.getId())
|
||||||
|
.set(LawsDomesticStandard::getStandardSplitStatus, 1);
|
||||||
|
gbService.update(gbUpdateWrapper);
|
||||||
|
gbUpdateWrapper.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
// 遍历所有企标
|
||||||
|
for (LawsEnterpriseStandard es : esList) {
|
||||||
|
if (!splitStandardIdList.contains(es.getId())) {
|
||||||
|
log.info("企标标准编号{}没有拆分数据", es.getStandardNumber());
|
||||||
|
} else {
|
||||||
|
esUpdateWrapper.eq(LawsEnterpriseStandard::getId, es.getId())
|
||||||
|
.set(LawsEnterpriseStandard::getStandardSplitStatus, 1);
|
||||||
|
esService.update(esUpdateWrapper);
|
||||||
|
esUpdateWrapper.clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "处理完成";
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user