fix 模考

zhongzheng-api/src/main/java/com/zhongzheng/controller/mock/MockApplyController.java

@@ -0,0 +1,119 @@
+package com.zhongzheng.controller.mock;
+
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.modules.mock.bo.MockApplyAddBo;
+import com.zhongzheng.modules.mock.bo.MockApplyEditBo;
+import com.zhongzheng.modules.mock.bo.MockApplyQueryBo;
+import com.zhongzheng.modules.mock.service.IMockApplyService;
+import com.zhongzheng.modules.mock.vo.MockApplyVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 模考安排Controller
+ * 
+ * @author ruoyi
+ * @date 2022-05-24
+ */
+@Api(value = "模考安排控制器", tags = {"模考安排管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/mock/apply")
+public class MockApplyController extends BaseController {
+
+    private final IMockApplyService iMockApplyService;
+
+    /**
+     * 查询模考安排列表
+     */
+    @ApiOperation("查询模考安排列表")
+    @PreAuthorize("@ss.hasPermi('system:apply:list')")
+    @GetMapping("/list")
+    public TableDataInfo<MockApplyVo> list(MockApplyQueryBo bo) {
+        startPage();
+        List<MockApplyVo> list = iMockApplyService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出模考安排列表
+     */
+    @ApiOperation("导出模考安排列表")
+    @PreAuthorize("@ss.hasPermi('system:apply:export')")
+    @Log(title = "模考安排", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<MockApplyVo> export(MockApplyQueryBo bo) {
+        List<MockApplyVo> list = iMockApplyService.queryList(bo);
+        ExcelUtil<MockApplyVo> util = new ExcelUtil<MockApplyVo>(MockApplyVo.class);
+        return util.exportExcel(list, "模考安排");
+    }
+
+    /**
+     * 获取模考安排详细信息
+     */
+    @ApiOperation("获取模考安排详细信息")
+    @PreAuthorize("@ss.hasPermi('system:apply:query')")
+    @GetMapping("/{applyId}")
+    public AjaxResult<MockApplyVo> getInfo(@PathVariable("applyId" ) Long applyId) {
+        return AjaxResult.success(iMockApplyService.queryById(applyId));
+    }
+
+    /**
+     * 新增模考安排
+     */
+    @ApiOperation("新增模考安排")
+    @PreAuthorize("@ss.hasPermi('system:apply:add')")
+    @Log(title = "模考安排", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody MockApplyAddBo bo) {
+        return toAjax(iMockApplyService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改模考安排
+     */
+    @ApiOperation("修改模考安排")
+    @PreAuthorize("@ss.hasPermi('system:apply:edit')")
+    @Log(title = "模考安排", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody MockApplyEditBo bo) {
+        return toAjax(iMockApplyService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除模考安排
+     */
+    @ApiOperation("删除模考安排")
+    @PreAuthorize("@ss.hasPermi('system:apply:remove')")
+    @Log(title = "模考安排" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{applyIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] applyIds) {
+        return toAjax(iMockApplyService.deleteWithValidByIds(Arrays.asList(applyIds), true) ? 1 : 0);
+    }
+
+    /**
+     * 查询模考安排列表
+     */
+    @ApiOperation("查询模考安排列表")
+    @PreAuthorize("@ss.hasPermi('system:apply:list')")
+    @GetMapping("/listApply")
+    public TableDataInfo<MockApplyVo> listApply(MockApplyQueryBo bo) {
+        startPage();
+        List<MockApplyVo> list = iMockApplyService.listApply(bo);
+        return getDataTable(list);
+    }
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/bo/MockApplyAddBo.java

@@ -48,6 +48,9 @@ public class MockApplyAddBo {
     /** 业务层次id */
     @ApiModelProperty("业务层次id")
     private Long businessId;
+    /** 项目id */
+    @ApiModelProperty("项目id")
+    private Long projectId;
     /** 编码 */
     @ApiModelProperty("编码")
     private String code;

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/bo/MockApplyEditBo.java

@@ -58,6 +58,10 @@ public class MockApplyEditBo {
     @ApiModelProperty("业务层次id")
     private Long businessId;
 
+    /** 项目id */
+    @ApiModelProperty("项目id")
+    private Long projectId;
+
     /** 编码 */
     @ApiModelProperty("编码")
     private String code;

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/bo/MockApplyQueryBo.java

@@ -60,6 +60,9 @@ public class MockApplyQueryBo extends BaseEntity {
 	/** 业务层次id */
 	@ApiModelProperty("业务层次id")
 	private Long businessId;
+	/** 项目id */
+	@ApiModelProperty("项目id")
+	private Long projectId;
 	/** 编码 */
 	@ApiModelProperty("编码")
 	private String code;

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/domain/MockApply.java

@@ -48,6 +48,8 @@ private static final long serialVersionUID=1L;
     private Long educationTypeId;
     /** 业务层次id */
     private Long businessId;
+    /** 项目id */
+    private Long projectId;
     /** 编码 */
     private String code;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/vo/MockApplyVo.java

@@ -64,6 +64,14 @@ public class MockApplyVo {
 	@Excel(name = "业务层次名称")
 	@ApiModelProperty("业务层次名称")
 	private String businessName;
+	/** 项目id */
+	@Excel(name = "项目id")
+	@ApiModelProperty("项目id")
+	private Long projectId;
+	/** 项目名称 */
+	@Excel(name = "项目名称")
+	@ApiModelProperty("项目名称")
+	private Long projectName;
 	/** 编码 */
 	@Excel(name = "编码")
 	@ApiModelProperty("编码")

zhongzheng-system/src/main/resources/mapper/modules/mock/MockApplyMapper.xml

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
         <result property="educationTypeId" column="education_type_id"/>
         <result property="businessId" column="business_id"/>
+        <result property="projectId" column="project_id"/>
         <result property="code" column="code"/>
     </resultMap>
 
@@ -31,6 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="educationName" column="education_name"/>
         <result property="businessId" column="business_id"/>
         <result property="businessName" column="business_name"/>
+        <result property="projectId" column="project_id"/>
+        <result property="projectName" column="project_name"/>
         <result property="code" column="code"/>
         <result property="mockMajorId" column="mock_major_id"/>
         <result property="mockMajorSubjectId" column="mock_major_subject_id"/>
@@ -58,10 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="listApply" resultType="com.zhongzheng.modules.mock.vo.MockApplyVo">
         SELECT 	ma.*,
                 cet.education_name,
-                cb.business_name
+                cb.business_name,
+
         FROM mock_apply ma
                  LEFT JOIN course_education_type cet ON ma.education_type_id = cet.id
                  LEFT JOIN course_business cb ON ma.business_id = cb.id
+                LEFT
     </select>