Merge remote-tracking branch 'origin/master'

huangzhen

2023-09-25 1614615fc9319b8626eb028598b894311992c033

 exam-system/src/main/java/com/gkhy/exam/noncoalmine/controller/WorkRegistrationController.java

@@ -9,9 +9,14 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.lang.reflect.Array;
import java.util.List;

/**
@@ -20,6 +25,8 @@
 * @author makejava
 * @since 2023-09-11 16:59:58
 */

@Api(tags = "作业登记接口")
@RestController
@RequestMapping("work/registration")
public class WorkRegistrationController extends BaseController {
@@ -35,6 +42,15 @@
     * @param query 查询实体
     * @return 所有数据
     */
    @ApiOperation(value = "分页查询列表")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "pageNum", dataTypeClass = String.class,value = "页码",required = true),
            @ApiImplicitParam(name = "pageSize", dataTypeClass = String.class,value = "页数",required = true),
            @ApiImplicitParam(name = "dept", dataTypeClass = String.class,value = "部门名"),
            @ApiImplicitParam(name = "name", dataTypeClass = String.class,value = "姓名"),
            @ApiImplicitParam(name = "idCard", dataTypeClass = String.class,value = "身份证号"),
            @ApiImplicitParam(name = "operateTypeId", dataTypeClass = Long.class,value = "作业类型Id"),
    })
    @GetMapping("/list/page")
    public TableDataInfo listByPage(WorkRegistrationQuery query) {
        startPage();
@@ -44,12 +60,16 @@
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @param workId 主键
     * @return 单条数据
     */
    @GetMapping("get/{id}")
    public AjaxResult selectOne(@PathVariable Long id) {
        return success(this.workRegistrationService.getById(id));
    @ApiOperation(value = "根据id查询")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "workId", dataTypeClass = Long.class,value = "作业登记Id"),
    })
    @GetMapping("get/{workId}")
    public AjaxResult selectOne(@PathVariable Long workId) {
        return success(this.workRegistrationService.getById(workId));
    }

    /**
@@ -58,6 +78,7 @@
     * @param addForm 实体对象
     * @return 新增结果
     */
    @ApiOperation(value = "新增")
    @PostMapping("add")
    public AjaxResult add(@Validated @RequestBody WorkRegistrationAddForm addForm) {
        return toAjax(this.workRegistrationService.add(addForm));
@@ -68,6 +89,7 @@
     * @param modForm
     * @return
     */
    @ApiOperation(value = "修改")
    @PostMapping("mod")
    public AjaxResult mod(@Validated @RequestBody WorkRegistrationModForm modForm) {
        return toAjax(this.workRegistrationService.mod(modForm));
@@ -79,9 +101,14 @@
     * @param workIds 主键结合
     * @return 删除结果
     */
    @ApiOperation(value = "批量删除")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "workIds", dataTypeClass = List.class,value = "作业登记Ids"),
    })
    @DeleteMapping("del/batch/{workIds}")
    public AjaxResult delete(@PathVariable List<Long> workIds) {
        return success(this.workRegistrationService.removeByIds(workIds));
    public AjaxResult delBatch(@PathVariable List<Long> workIds) {
        this.workRegistrationService.delBatch(workIds);
        return success();
    }
}