Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

 src/main/java/org/springblade/modules/place/controller/PlacePractitionerController.java

@@ -21,12 +21,15 @@
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;

import javax.validation.Valid;

import org.apache.commons.lang3.StringUtils;
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.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -35,6 +38,8 @@
import org.springblade.modules.place.wrapper.PlacePractitionerWrapper;
import org.springblade.modules.place.service.IPlacePractitionerService;
import org.springblade.core.boot.ctrl.BladeController;

import java.util.Date;

/**
 * 场所从业人员 控制器
@@ -46,7 +51,7 @@
@AllArgsConstructor
@RequestMapping("blade-placePractitioner/placePractitioner")
@Api(value = "场所从业人员", tags = "场所从业人员接口")
public class PlacePractitionerController{
public class PlacePractitionerController {

   private final IPlacePractitionerService placePractitionerService;

@@ -60,6 +65,7 @@
      PlacePractitionerEntity detail = placePractitionerService.getOne(Condition.getQueryWrapper(placePractitioner));
      return R.data(PlacePractitionerWrapper.build().entityVO(detail));
   }

   /**
    * 场所从业人员 分页
    */
@@ -122,5 +128,15 @@
      return R.status(placePractitionerService.removeByIds(Func.toLongList(ids)));
   }

   /**
    * 统计少数民族和未成年数量
    */
   @GetMapping("/countByType")
   @ApiOperationSupport(order = 8)
   @ApiOperation(value = "统计少数民族和未成年数量", notes = "")
   public R countByType(PlacePractitionerVO placePractitioner) {
      return R.data(placePractitionerService.countByType(placePractitioner));
   }


}