feat: 企标授权部门导入

2023-12-04 20:36:36 +08:00
parent e7695e480d
commit 057775d634
4 changed files with 108 additions and 49 deletions
@@ -107,4 +107,13 @@ public class OldSystemController {
        enterpriseStandardService.importFileRelationExcel(file, response);
    }

+    @PostMapping("/findDuplicateStandardNoData")
+    @AutoLog(value = "老法规系统-找到标准号重复的数据")
+    @ApiOperation(value="老法规系统-找到标准号重复的数据", notes="老法规系统-找到标准号重复的数据", produces = "application/octet-stream")
+    @ApiOperationSupport(order = 8)
+    public void findDuplicateStandardNoData(@RequestParam("file") MultipartFile file,
+                                        HttpServletResponse response) throws IOException {
+        enterpriseStandardService.findDuplicateStandardNoData(file, response);
+    }
+    
 }
@@ -78,6 +78,26 @@ public class OldSystemDepartRelationServiceImpl extends ServiceImpl<OldSystemDep
            log.info("导入数据条数：{}", list.size());
            // 过滤掉新部门为空的数据
            list = list.stream().filter(dr -> dr.getCurOrgName() != null && !dr.getCurOrgName().isEmpty()).collect(Collectors.toList());
+            // 将所获取到的所有数据去除前后空格
+            list = list.stream().peek(dr -> {
+                // 判断是否为空
+                if (dr.getOldOrgSuperior() == null) {
+                    dr.setOldOrgSuperior("");
+                }
+                if (dr.getOldOrgName() == null) {
+                    dr.setOldOrgName("");
+                }
+                if (dr.getCurOrgSuperior() == null) {
+                    dr.setCurOrgSuperior("");
+                }
+                if (dr.getCurOrgName() == null) {
+                    dr.setCurOrgName("");
+                }
+                dr.setOldOrgSuperior(dr.getOldOrgSuperior().trim());
+                dr.setOldOrgName(dr.getOldOrgName().trim());
+                dr.setCurOrgSuperior(dr.getCurOrgSuperior().trim());
+                dr.setCurOrgName(dr.getCurOrgName().trim());
+            }).collect(Collectors.toList());
            log.info("过滤掉新部门为空的数据后数据条数：{}", list.size());
            // 获取所有有关联的新部门
            LambdaQueryWrapper<SysDepart> sysDeptWrapper = new LambdaQueryWrapper<>();