From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/controller/PlacePractitionerController.java | 27 +++------------------------
1 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/controller/PlacePractitionerController.java b/src/main/java/org/springblade/modules/place/controller/PlacePractitionerController.java
index de84090..69ad213 100644
--- a/src/main/java/org/springblade/modules/place/controller/PlacePractitionerController.java
+++ b/src/main/java/org/springblade/modules/place/controller/PlacePractitionerController.java
@@ -95,13 +95,6 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入placePractitioner")
public R save(@Valid @RequestBody PlacePractitionerEntity placePractitioner) {
- if (StringUtils.isNotBlank(placePractitioner.getIdCard())) {
- // 从身份证号获取出生日期
- String birthDateStr = placePractitioner.getIdCard().substring(6, 14);
- // 解析出生日期字符串为日期对象
- Date birthDate = DateUtil.parse(birthDateStr, "yyyyMMdd");
- placePractitioner.setBirthday(birthDate);
- }
return R.status(placePractitionerService.save(placePractitioner));
}
@@ -112,13 +105,6 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入placePractitioner")
public R update(@Valid @RequestBody PlacePractitionerEntity placePractitioner) {
- if (StringUtils.isNotBlank(placePractitioner.getIdCard())) {
- // 从身份证号获取出生日期
- String birthDateStr = placePractitioner.getIdCard().substring(6, 14);
- // 解析出生日期字符串为日期对象
- Date birthDate = DateUtil.parse(birthDateStr, "yyyyMMdd");
- placePractitioner.setBirthday(birthDate);
- }
return R.status(placePractitionerService.updateById(placePractitioner));
}
@@ -129,13 +115,6 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入placePractitioner")
public R submit(@Valid @RequestBody PlacePractitionerEntity placePractitioner) {
- if (StringUtils.isNotBlank(placePractitioner.getIdCard())) {
- // 从身份证号获取出生日期
- String birthDateStr = placePractitioner.getIdCard().substring(6, 14);
- // 解析出生日期字符串为日期对象
- Date birthDate = DateUtil.parse(birthDateStr, "yyyyMMdd");
- placePractitioner.setBirthday(birthDate);
- }
return R.status(placePractitionerService.saveOrUpdate(placePractitioner));
}
@@ -152,11 +131,11 @@
/**
* 统计少数民族和未成年数量
*/
- @PostMapping("/countByType")
+ @GetMapping("/countByType")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "统计少数民族和未成年数量", notes = "")
- public R countByType() {
- return R.data(placePractitionerService.countByType());
+ public R countByType(PlacePractitionerVO placePractitioner) {
+ return R.data(placePractitionerService.countByType(placePractitioner));
}
--
Gitblit v1.9.3