Sfoglia il codice sorgente

案卷侧面名字

qianxb 2 anni fa
parent
commit
99bb28a54e

+ 5 - 0
blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/vo/ArchivesAutoVO.java

@@ -143,6 +143,11 @@ public class ArchivesAutoVO extends ArchivesAuto {
 	 */
 	private Integer cabinetNumber;
 
+	/**
+	 * 柜子内案卷侧面名称
+	 */
+	private String sideNumber;
+
 	/**
 	 * 案卷在柜子里的状态
 	 */

+ 1 - 1
blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -252,7 +252,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 				//柜子里面侧面编号
 				if (aa.getFileNumber() != null && aa.getFileNumber() != "") {
 					String[] split = aa.getFileNumber().split("_");
-					aa.setFileNumber(split[split.length - 1]);
+					aa.setSideNumber(split[split.length - 1]);
 				}
 				if (StringUtils.isNotBlank(aa.getStorageTime())) {
 					aa.setStorageTimeValue("3".equals(aa.getStorageTime()) ? "永久" : ("2".equals(aa.getStorageTime()) ? "30年" : "10年"));

+ 1 - 1
blade-service/blade-control/src/main/java/org/springblade/control/controller/AnnualBudgetController.java

@@ -241,7 +241,7 @@ public class AnnualBudgetController {
      * 预算与实际统计-部门支出统计
      */
     @GetMapping("/budgetAndPracticalByDept")
-    @ApiOperationSupport(order = 16)
+    @ApiOperationSupport(order = 17)
     @ApiOperation(value = "预算与实际统计-部门支出统计",notes = "传入年:2023年")
     public R<List<BudgetAndPracticalByDeptVO>> budgetAndPracticalByDept(String year) {
         return R.data(budgetService.budgetAndPracticalByDept(year));

+ 1 - 0
blade-service/blade-control/src/main/java/org/springblade/control/service/impl/AnnualBudgetServiceImpl.java

@@ -1069,6 +1069,7 @@ public class AnnualBudgetServiceImpl extends BaseServiceImpl<AnnualBudgetMapper,
      */
     @Override
     public List<BudgetAndPracticalByDeptVO> budgetAndPracticalByDept(String year) {
+        //
         return null;
     }