Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

 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,14 +105,17 @@
   @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));
   }

   /**
    * 场所从业人员 修改
    */
   @PostMapping("/auditing")
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "修改", notes = "传入placePractitioner")
   public R auditing(@Valid @RequestBody PlacePractitionerEntity placePractitioner) {
      return R.status(placePractitionerService.auditing(placePractitioner));
   }

   /**
@@ -129,13 +125,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));
   }

@@ -155,8 +144,8 @@
   @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));
   }