相关bug修改

parent/pom.xml

@@ -17,7 +17,7 @@
     <packaging>pom</packaging>
 
     <description>
-        黑石咀水库系统 - 父级POM
+        双石水库系统 - 父级POM
     </description>
 
     <modules>

src/main/java/com/gunshi/project/ss/controller/DocCategoryController.java

@@ -33,7 +33,7 @@ public class DocCategoryController {
         return R.ok(flg);
     }
 
-    @Operation(summary = "更新分类")
+    @Operation(summary = "删除分类")
     @GetMapping("/del/{id}")
     public R<Boolean> edit(@PathVariable("id") Long id){
         Boolean flg = docCategoryService.del(id);

src/main/java/com/gunshi/project/ss/controller/FundBudgetController.java

@@ -30,7 +30,7 @@ public class FundBudgetController extends AbstractCommonFileController {
 
     @Operation(description = "根据年份查询")
     @GetMapping("/get/{year}")
-    public R<FundBudget> get(@PathVariable("year") Integer year){
+    public R<FundBudget> get(@PathVariable("year") String year){
         FundBudget res = fundBudgetService.getByYear(year);
         if(res!=null){
             List<FileAssociations> files = fileService.getFiles(getGroupId(), res.getId().toString());
@@ -51,7 +51,7 @@ public class FundBudgetController extends AbstractCommonFileController {
 
     @Operation(description = "统计")
     @GetMapping("stat")
-    public R<FundBudget> stat(@RequestParam(value = "year",required = false) @Parameter(description = "年份") Integer year){
+    public R<FundBudget> stat(@RequestParam(value = "year",required = false) @Parameter(description = "年份") String year){
         FundBudget res = fundBudgetService.stat(year);
         return R.ok(res);
     }

src/main/java/com/gunshi/project/ss/service/DocCategoryService.java

@@ -118,15 +118,34 @@ public class DocCategoryService extends ServiceImpl<DocCategoryMapper, DocCatego
     }
 
     public Boolean edit(DocCategory docCategory) {
+        Long id = docCategory.getId();
+        DocCategory oldCat = this.getById(id);
+        Integer level = docCategory.getLevel();
+        //如果三级类目下有档案，则不能修改成二级类目
+        if(oldCat.getLevel() == 3 && level == 2){
+            LambdaQueryWrapper<DocCenter> lambdaQueryWrapper= new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(DocCenter::getDocCategoryId, id);
+            Long count = docCenterMapper.selectCount(lambdaQueryWrapper);
+            if(count > 0){
+                throw new IllegalArgumentException("对不起，该类目下关联有档案，无法修改为二级类目");
+            }
+        }
+        //如果该二级类目下有三级类目则不能改成三级类目
+        if(oldCat.getLevel() == 2 && level == 3){
+            LambdaQueryWrapper<DocCategory> query= new LambdaQueryWrapper<>();
+            query.eq(DocCategory::getParentId, id);
+            Long cnt = baseMapper.selectCount(query);
+            if(cnt > 0){
+                throw new IllegalArgumentException("对不起，该类目下有三级类目，无法修改为三级类目");
+            }
+        }
         updateById(docCategory);
-        docPermissionConfigService.deleteByDocCategoryId(docCategory.getId());
+        docPermissionConfigService.deleteByDocCategoryId(id);
         if(docCategory.getPermissions() != null){
             List<DocPermissionConfig> permissions = docCategory.getPermissions();
-            permissions.stream().forEach(item -> {item.setCategoryId(docCategory.getId());});
+            permissions.stream().forEach(item -> {item.setCategoryId(id);});
             docPermissionConfigService.saveBatch(permissions);
         }
-        //TODO 同步更新所有关联档案的档案号(这里不用该，我到时候直接递归查上来然后进行拼接即可）
-
         return true;
     }
 

src/main/java/com/gunshi/project/ss/service/DocCenterService.java

@@ -204,6 +204,11 @@ public class DocCenterService  extends ServiceImpl<DocCenterMapper, DocCenter> {
             //设置废止时间（为替换档案的新增时间）
             replaceOne.setAbolishTime(now);
             updateById(replaceOne);
+
+            //老的替换档案的废止时间置空
+            DocCenter old = lambdaQuery().eq(DocCenter::getId, oldReplaceId).one();
+            old.setAbolishTime(null);
+            updateById(old);
         }
         boolean flag = updateById(docCenter);
         docOperateLogService.saveLog(docCenter,2);

src/main/java/com/gunshi/project/ss/service/FundBudgetService.java

@@ -64,14 +64,14 @@ public class FundBudgetService  extends ServiceImpl<FundBudgetMapper, FundBudget
         return update;
     }
 
-    public FundBudget getByYear(Integer year) {
+    public FundBudget getByYear(String year) {
         LambdaQueryWrapper<FundBudget> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(FundBudget::getBudgetYear, year);
         FundBudget one = baseMapper.selectOne(queryWrapper);
         return one;
     }
 
-    public FundBudget stat(Integer year) {
+    public FundBudget stat(String year) {
         FundBudget fundBudget = new FundBudget();
         LambdaQueryWrapper<FundBudget> queryWrapper = new LambdaQueryWrapper<>();
         if(year != null){

src/main/java/com/gunshi/project/ss/service/RainBasinDivisionService.java

@@ -412,7 +412,7 @@ public class RainBasinDivisionService {
                 //接口不知道是好的还是坏的，反正这个接口坏了别影响其它的接口
                 e.printStackTrace();
             }
-
+            stPptnDetailsVo.setStnm(stStatusVo.getStnm());
             res.add(stPptnDetailsVo);
         }