报表修改

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgServiceImpl.java

@@ -40,6 +40,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.PostConstruct;
+import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -155,11 +156,13 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
             orgPhysicalDefenseConstructionExport.setOrgName(s.getShortName());
 
             //年度完成
-            Integer s1 = baseMapper.rectificationStatus(s.getPath(), "2023");
+            LocalDate currentDate = LocalDate.now();
+            String year = String.valueOf(currentDate.getYear());
+            Integer s1 = baseMapper.rectificationStatus(s.getPath(), year);
             //2015改造
-            Integer s2 = baseMapper.oldRectificationStatus(s.getPath(), "2023");
+            Integer s2 = baseMapper.oldRectificationStatus(s.getPath(), year);
             //未完成改造
-            Integer s3 = baseMapper.noRectificationStatus(s.getPath(), "2023");
+            Integer s3 = baseMapper.noRectificationStatus(s.getPath(), year);
             orgPhysicalDefenseConstructionExport.setNewYearReachNumber(s1);
             orgPhysicalDefenseConstructionExport.setNewYeaTransformOldReachNumber(s2);
             orgPhysicalDefenseConstructionExport.setNewYeaTransformInconformityNumber(s3);
@@ -626,44 +629,39 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     }
 
     // 获取机构所属行社、地区的名称
-    private List<String> getHsAndDqOrgName(String path)
-    {
-        List<String> list=new ArrayList<>();
-        final List<Long> orgIdList =  Arrays.stream(path.split("-")).map(Arrays::asList)
-            .flatMap(Collection::stream)
-            .map(Long::valueOf)
-            .distinct().
-            collect(Collectors.toList());
+    private List<String> getHsAndDqOrgName(String path) {
+        List<String> list = new ArrayList<>();
+        final List<Long> orgIdList = Arrays.stream(path.split("-")).map(Arrays::asList)
+                .flatMap(Collection::stream)
+                .map(Long::valueOf)
+                .distinct().
+                collect(Collectors.toList());
 
         final List<SysOrg> sysOrgs = sysOrgMapper.selectList(new LambdaQueryWrapper<SysOrg>()
                 .in(SysOrg::getId, orgIdList));
 
-        if(sysOrgs.size()<=0)
-        {
-            list.add( StringUtil.EMPTY_STRING);
-            list.add( StringUtil.EMPTY_STRING);
+        if (sysOrgs.size() <= 0) {
+            list.add(StringUtil.EMPTY_STRING);
+            list.add(StringUtil.EMPTY_STRING);
             return list;
         }
 
-        final Optional<SysOrg> hsOrg = sysOrgs.stream().filter(x -> ObjectUtil.equal(x.getType(),3)).findFirst();
+        final Optional<SysOrg> hsOrg = sysOrgs.stream().filter(x -> ObjectUtil.equal(x.getType(), 3)).findFirst();
 
 
         // 行社名称
-        if(hsOrg.isPresent()){
+        if (hsOrg.isPresent()) {
             list.add(hsOrg.get().getShortName());
 
             final Optional<SysOrg> dqOrg = sysOrgs.stream().filter(x -> x.getId().equals(hsOrg.get().getParentId())).findFirst();
-            if(dqOrg.isPresent())
-            {
-                list.add(dqOrg.get().getShortName().replace("地区行社",""));
-            }
-            else {
-                list.add( StringUtil.EMPTY_STRING);
+            if (dqOrg.isPresent()) {
+                list.add(dqOrg.get().getShortName().replace("地区行社", ""));
+            } else {
+                list.add(StringUtil.EMPTY_STRING);
             }
-        }
-        else {
-            list.add( StringUtil.EMPTY_STRING);
-            list.add( StringUtil.EMPTY_STRING);
+        } else {
+            list.add(StringUtil.EMPTY_STRING);
+            list.add(StringUtil.EMPTY_STRING);
         }
         // 地区名称
 
@@ -826,7 +824,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         if (ObjectUtil.hasEmpty(org, org.getType())) {
             throw new ServiceException(ErrorMsgConstants.CUR_USER_ORT_TYPE_ERROR);
         }
-        List<SysOrg> sysOrgList =baseMapper.selectList(new LambdaQueryWrapper<>());
+        List<SysOrg> sysOrgList = baseMapper.selectList(new LambdaQueryWrapper<>());
         sysOrgList.forEach(sysOrg -> {
             if (ObjectUtil.isNull(sysOrg.getSort())) {
                 sysOrg.setSort(0);
@@ -843,7 +841,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
                 result = sysOrgList.stream()
                         .filter(sysOrg -> ObjectUtil.equal(sysOrg.getType(), OrgTypeEnum.DIQU_HANG_SHE.getCode()))
                         .filter(sysOrg -> sysOrg.getName().contains("地区行社"))
-                        .filter(sysOrg -> ObjectUtil.equal(sysOrg.getIsLock(),0) && ObjectUtil.equal(sysOrg.getDeleted(),0))
+                        .filter(sysOrg -> ObjectUtil.equal(sysOrg.getIsLock(), 0) && ObjectUtil.equal(sysOrg.getDeleted(), 0))
                         .sorted(Comparator.comparing(SysOrg::getSort))
                         .collect(Collectors.toList());
                 break;
@@ -851,7 +849,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
                 result = sysOrgList.stream()
                         .filter(sysOrg -> sysOrg.getPath().startsWith(org.getPath()))
                         .filter(sysOrg -> ObjectUtil.equal(sysOrg.getType(), OrgTypeEnum.HANG_SHE.getCode()))
-                        .filter(sysOrg -> ObjectUtil.equal(sysOrg.getIsLock(),0) && ObjectUtil.equal(sysOrg.getDeleted(),0))
+                        .filter(sysOrg -> ObjectUtil.equal(sysOrg.getIsLock(), 0) && ObjectUtil.equal(sysOrg.getDeleted(), 0))
                         .sorted(Comparator.comparing(SysOrg::getSort))
                         .collect(Collectors.toList());
                 break;
@@ -861,14 +859,14 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
                             .filter(sysOrg -> sysOrg.getPath().startsWith(org.getPath()))
                             .filter(sysOrg -> ObjectUtil.equal(sysOrg.getType(), OrgTypeEnum.HANG_SHE.getCode()))
                             .sorted(Comparator.comparing(SysOrg::getSort))
-                            .filter(sysOrg -> ObjectUtil.equal(sysOrg.getIsLock(),0) && ObjectUtil.equal(sysOrg.getDeleted(),0))
+                            .filter(sysOrg -> ObjectUtil.equal(sysOrg.getIsLock(), 0) && ObjectUtil.equal(sysOrg.getDeleted(), 0))
                             .collect(Collectors.toList());
                 } else {
                     result = sysOrgList.stream()
                             .filter(sysOrg -> ObjectUtil.equal(sysOrg.getParentId(), org.getId()))
                             //.filter(sysOrg -> sysOrg.getPath().startsWith(org.getPath()))
                             .sorted(Comparator.comparing(SysOrg::getSort))
-                            .filter(sysOrg -> ObjectUtil.equal(sysOrg.getIsLock(),0) && ObjectUtil.equal(sysOrg.getDeleted(),0))
+                            .filter(sysOrg -> ObjectUtil.equal(sysOrg.getIsLock(), 0) && ObjectUtil.equal(sysOrg.getDeleted(), 0))
                             .collect(Collectors.toList());
                 }
         }
@@ -891,7 +889,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         OrgTypeEnum orgTypeEnum = OrgTypeEnum.getOrgTypeEnum(org.getType());
         LambdaQueryWrapper<SysOrg> wrapper = new LambdaQueryWrapper<SysOrg>();
         wrapper.notLike(SysOrg::getName, "各部门").notLike(SysOrg::getShortName, "各部门").isNotNull(SysOrg::getPath);
-        wrapper.eq(SysOrg::getIsLock, 0).eq(SysOrg::getDeleted,0);
+        wrapper.eq(SysOrg::getIsLock, 0).eq(SysOrg::getDeleted, 0);
 
         switch (orgTypeEnum) {
             case SHEGN_LIAN_SHE:
@@ -966,13 +964,13 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     }
 
     @Override
-    public List<SysOrg> selectDqAndHs(){
+    public List<SysOrg> selectDqAndHs() {
         LambdaQueryWrapper<SysOrg> wrapper = new LambdaQueryWrapper<>();
-        wrapper.and(w->w.eq(SysOrg::getType,OrgTypeEnum.HANG_SHE.getCode()).or().likeRight(SysOrg::getShortName,"地区行社"))
-                .eq(SysOrg::getDeleted,0)
-                .eq(SysOrg::getIsLock,0)
-                .select(SysOrg::getType,SysOrg::getShortName,SysOrg::getId);
+        wrapper.and(w -> w.eq(SysOrg::getType, OrgTypeEnum.HANG_SHE.getCode()).or().likeRight(SysOrg::getShortName, "地区行社"))
+                .eq(SysOrg::getDeleted, 0)
+                .eq(SysOrg::getIsLock, 0)
+                .select(SysOrg::getType, SysOrg::getShortName, SysOrg::getId);
 
-        return  sysOrgMapper.selectList(wrapper);
+        return sysOrgMapper.selectList(wrapper);
     }
 }