zhongrj
2024-04-02 566e7986291e73051d30ee252b0ebf852b1577a7
src/main/java/org/springblade/modules/place/controller/PlacePractitionerController.java
@@ -25,10 +25,13 @@
import javax.validation.Valid;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.log.logger.BladeLogger;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
@@ -54,6 +57,7 @@
public class PlacePractitionerController {
   private final IPlacePractitionerService placePractitionerService;
   private final BladeLogger bladeLogger;
   /**
    * 场所从业人员 详情
@@ -81,9 +85,11 @@
    * 场所从业人员 自定义分页
    */
   @GetMapping("/page")
   @ApiLog("场所从业人员 自定义分页")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入placePractitioner")
   public R<IPage<PlacePractitionerVO>> page(PlacePractitionerVO placePractitioner, Query query) {
      bladeLogger.info("场所从业人员 自定义分页", JsonUtil.toJson(placePractitioner));
      IPage<PlacePractitionerVO> pages = placePractitionerService.selectPlacePractitionerPage(Condition.getPage(query), placePractitioner);
      return R.data(pages);
   }
@@ -95,13 +101,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 +111,19 @@
   @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)
   @ApiLog("场所从业人员 修改")
   @ApiOperation(value = "修改", notes = "传入placePractitioner")
   public R auditing(@Valid @RequestBody PlacePractitionerEntity placePractitioner) {
      bladeLogger.info("场所从业人员 修改", JsonUtil.toJson(placePractitioner));
      return R.status(placePractitionerService.auditing(placePractitioner));
   }
   /**
@@ -129,13 +133,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));
   }
@@ -144,8 +141,10 @@
    */
   @PostMapping("/remove")
   @ApiOperationSupport(order = 7)
   @ApiLog("场所从业人员 删除")
   @ApiOperation(value = "逻辑删除", notes = "传入ids")
   public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
      bladeLogger.info("场所从业人员 删除", JsonUtil.toJson(ids));
      return R.status(placePractitionerService.removeByIds(Func.toLongList(ids)));
   }
@@ -154,9 +153,11 @@
    */
   @GetMapping("/countByType")
   @ApiOperationSupport(order = 8)
   @ApiLog("统计少数民族和未成年数量")
   @ApiOperation(value = "统计少数民族和未成年数量", notes = "")
   public R countByType() {
      return R.data(placePractitionerService.countByType());
   public R countByType(PlacePractitionerVO placePractitioner) {
      bladeLogger.info("统计少数民族和未成年数量", JsonUtil.toJson(placePractitioner));
      return R.data(placePractitionerService.countByType(placePractitioner));
   }