diff --git a/parent/pom.xml b/parent/pom.xml index 6a2b941..f8d377b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -17,7 +17,7 @@ pom - 黑石咀水库系统 - 父级POM + 双石水库系统 - 父级POM diff --git a/src/main/java/com/gunshi/project/ss/controller/DocCategoryController.java b/src/main/java/com/gunshi/project/ss/controller/DocCategoryController.java index 6244aff..28865a9 100644 --- a/src/main/java/com/gunshi/project/ss/controller/DocCategoryController.java +++ b/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 edit(@PathVariable("id") Long id){ Boolean flg = docCategoryService.del(id); diff --git a/src/main/java/com/gunshi/project/ss/controller/FundBudgetController.java b/src/main/java/com/gunshi/project/ss/controller/FundBudgetController.java index e62334e..75eed12 100644 --- a/src/main/java/com/gunshi/project/ss/controller/FundBudgetController.java +++ b/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 get(@PathVariable("year") Integer year){ + public R get(@PathVariable("year") String year){ FundBudget res = fundBudgetService.getByYear(year); if(res!=null){ List files = fileService.getFiles(getGroupId(), res.getId().toString()); @@ -51,7 +51,7 @@ public class FundBudgetController extends AbstractCommonFileController { @Operation(description = "统计") @GetMapping("stat") - public R stat(@RequestParam(value = "year",required = false) @Parameter(description = "年份") Integer year){ + public R stat(@RequestParam(value = "year",required = false) @Parameter(description = "年份") String year){ FundBudget res = fundBudgetService.stat(year); return R.ok(res); } diff --git a/src/main/java/com/gunshi/project/ss/service/DocCategoryService.java b/src/main/java/com/gunshi/project/ss/service/DocCategoryService.java index 83ee04f..50f6546 100644 --- a/src/main/java/com/gunshi/project/ss/service/DocCategoryService.java +++ b/src/main/java/com/gunshi/project/ss/service/DocCategoryService.java @@ -118,15 +118,34 @@ public class DocCategoryService extends ServiceImpl 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 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 permissions = docCategory.getPermissions(); - permissions.stream().forEach(item -> {item.setCategoryId(docCategory.getId());}); + permissions.stream().forEach(item -> {item.setCategoryId(id);}); docPermissionConfigService.saveBatch(permissions); } - //TODO 同步更新所有关联档案的档案号(这里不用该，我到时候直接递归查上来然后进行拼接即可） - return true; } diff --git a/src/main/java/com/gunshi/project/ss/service/DocCenterService.java b/src/main/java/com/gunshi/project/ss/service/DocCenterService.java index fd8dfdf..ba2538a 100644 --- a/src/main/java/com/gunshi/project/ss/service/DocCenterService.java +++ b/src/main/java/com/gunshi/project/ss/service/DocCenterService.java @@ -204,6 +204,11 @@ public class DocCenterService extends ServiceImpl { //设置废止时间（为替换档案的新增时间） 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); diff --git a/src/main/java/com/gunshi/project/ss/service/FundBudgetService.java b/src/main/java/com/gunshi/project/ss/service/FundBudgetService.java index 8c2a942..a7f49dd 100644 --- a/src/main/java/com/gunshi/project/ss/service/FundBudgetService.java +++ b/src/main/java/com/gunshi/project/ss/service/FundBudgetService.java @@ -64,14 +64,14 @@ public class FundBudgetService extends ServiceImpl 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 queryWrapper = new LambdaQueryWrapper<>(); if(year != null){ diff --git a/src/main/java/com/gunshi/project/ss/service/RainBasinDivisionService.java b/src/main/java/com/gunshi/project/ss/service/RainBasinDivisionService.java index 21d2753..60ec681 100644 --- a/src/main/java/com/gunshi/project/ss/service/RainBasinDivisionService.java +++ b/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); }