edi

blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/controller/AccountsController.java

@@ -100,8 +100,10 @@ public class AccountsController extends BladeController {
 		}
 		IPage<Accounts> pages = accountsService.page(Condition.getPage(query), lambdaQueryWrapper);
 		for (Accounts item : pages.getRecords()) {
-			item.setCount(finVouchersItemsService.count(new LambdaQueryWrapper<FinVouchersItems>()
-				.eq(FinVouchersItems::getAccountId, item.getId())) + "");
+			int count = finVouchersItemsService.count(new LambdaQueryWrapper<FinVouchersItems>()
+				.eq(FinVouchersItems::getAccountId, item.getId()));
+			count = count > 1 ? 1 : 0;
+			item.setCount(count + "");
 		}
 		return R.data(pages);
 	}

blade-service/blade-los/src/main/java/org/springblade/los/finance/genleg/controller/FinPeriodController.java

@@ -122,5 +122,43 @@ public class FinPeriodController extends BladeController {
 		return R.status(finPeriodService.removeByIds(Func.toLongList(ids)));
 	}
 
+	@PostMapping("/init")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "初始化期间", notes = "传入periodType， periodSubtype")
+	public R init(@Valid @RequestBody FinPeriod finPeriod) {
 
+		return R.status(true);
+	}
+
+	@PostMapping("/open")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "期间开账", notes = "传入periodType， periodSubtype， periodYear， periodMonth")
+	public R open(@Valid @RequestBody FinPeriod finPeriod) {
+		// query.
+
+		return R.status(true);
+	}
+	@GetMapping("/current_period")
+	@ApiOperationSupport(order = 10)
+	@ApiOperation(value = "查询当前活动期间", notes = "传入periodType， periodSubtype")
+	public R current_period(FinPeriod finPeriod, Query query) {
+
+		return R.status(true);
+	}
+
+	@PostMapping("/close")
+	@ApiOperationSupport(order = 10)
+	@ApiOperation(value = "结转当前活动期间，同时开启下一期间", notes = "传入periodType，periodSubtype， 可选 periodYear， periodMonth")
+	public R close(@Valid @RequestBody FinPeriod finPeriod) {
+
+		return R.status(true);
+	}
+
+	@PostMapping("/unclose")
+	@ApiOperationSupport(order = 10)
+	@ApiOperation(value = "反结转当前活动期间", notes = "传入periodType，periodSubtype， 可选 periodYear， periodMonth")
+	public R unclose(@Valid @RequestBody FinPeriod finPeriod) {
+
+		return R.status(true);
+	}
 }