考级管理新增修改

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/DegreeLevelFeeNew.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.ym.mec.biz.dal.enums.degree.EDegreeFeeType;
+import com.ym.mec.biz.dal.enums.DegreeTypeEnum;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import lombok.Data;
 
@@ -43,20 +43,12 @@ public class DegreeLevelFeeNew implements Serializable {
 
     @ApiModelProperty("考级分类, GRADE,THEORY")
     @TableField(value = "degree_type_")
-    private EDegreeFeeType degreeType;
+    private DegreeTypeEnum degreeType;
 
-    @ApiModelProperty("上传证书")
+    @ApiModelProperty("是否上传证书")
     @TableField(value = "credentials_")
     private Boolean credentials;
 
-    @ApiModelProperty("乐器考级费用")
-    @TableField(value = "grade_")
-    private BigDecimal grade;
-
-    @ApiModelProperty("乐理费用")
-    @TableField(value = "theory_")
-    private BigDecimal theory;
-
     @ApiModelProperty("创建时间")
     @TableField(value = "create_time_")
     private Date createTime;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/DegreeNews.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.ym.mec.biz.dal.enums.DegreeNewsTypeEnum;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import lombok.Data;
 
@@ -42,7 +43,7 @@ public class DegreeNews implements Serializable {
 
     @ApiModelProperty("咨询类型")
     @TableField(value = "type_")
-    private String type;
+    private DegreeNewsTypeEnum type;
 
     @ApiModelProperty("状态（1-可见 0-不可见）")
     @TableField(value = "status_")

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/DegreeNewsTypeEnum.java

@@ -0,0 +1,38 @@
+package com.ym.mec.biz.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+/**
+ * 考级资讯类型
+ */
+public enum DegreeNewsTypeEnum implements BaseEnum<String, DegreeNewsTypeEnum> {
+	EXAMINEE_STYLE("EXAMINEE_STYLE", "考生风采"),
+	GRADE_EXAMINATION_BRIEF("GRADE_EXAMINATION_BRIEF", "考级简章"),
+	GRADING_NOTICE("GRADING_NOTICE", "考级须知");
+
+	private String code;
+
+	private String msg;
+
+	DegreeNewsTypeEnum(String code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	@Override
+	public String getCode() {
+		return this.code;
+	}
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/DegreeTypeEnum.java

@@ -0,0 +1,34 @@
+package com.ym.mec.biz.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum DegreeTypeEnum implements BaseEnum<String, ComplaintsStatusEnum> {
+    GRADE("GRADE", "等级"),
+    THEORY("THEORY", "乐理");
+
+    private String code;
+
+    private String msg;
+
+    DegreeTypeEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    @Override
+    public String getCode() {
+        return this.code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/mapper/DegreeLevelFeeMapper.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ym.mec.biz.dal.entity.DegreeLevelFeeNew;
+import com.ym.mec.biz.dal.vo.DegreeLevelFeeNewVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 import com.ym.mec.biz.dal.wrapper.DegreeLevelFeeWrapper;
@@ -22,6 +23,6 @@ public interface DegreeLevelFeeMapper extends BaseMapper<DegreeLevelFeeNew> {
 	 * @param param DegreeLevelFeeWrapper.DegreeLevelFeeQuery
 	 * @return List<DegreeLevelFeeWrapper.DegreeLevelFee>
 	 */
-	List<DegreeLevelFeeNew> selectPage(@Param("page") IPage<DegreeLevelFeeNew> page, @Param("param") DegreeLevelFeeWrapper.DegreeLevelFeeQuery param);
+	List<DegreeLevelFeeNewVo> selectPage(@Param("page") IPage<DegreeLevelFeeNewVo> page, @Param("param") DegreeLevelFeeWrapper.DegreeLevelFeeQuery param);
 	
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/vo/DegreeLevelFeeNewVo.java

@@ -0,0 +1,57 @@
+package com.ym.mec.biz.dal.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ym.mec.biz.dal.enums.DegreeTypeEnum;
+import com.ym.mec.common.tenant.TenantContextHolder;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.Optional;
+
+/**
+ * 考级等级费用配置
+ * 2023-04-10 10:24:25
+ */
+@Data
+public class DegreeLevelFeeNewVo{
+
+    @TableId(value = "id_", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("声部ID")
+    private Integer subjectId;
+
+    @ApiModelProperty("声部")
+    private String subjectName;
+
+    @ApiModelProperty("等级")
+    private Integer level;
+
+    @ApiModelProperty("费用")
+    private BigDecimal fee;
+
+    @ApiModelProperty("考级分类, GRADE,THEORY")
+    private DegreeTypeEnum degreeType;
+
+    @ApiModelProperty("是否上传证书")
+    private Boolean credentials;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
+
+    private Integer tenantId;
+
+    public Integer getTenantId() {
+        return Optional.ofNullable(tenantId).orElse(TenantContextHolder.getTenantId());
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/DegreeLevelFeeWrapper.java

@@ -1,7 +1,9 @@
 package com.ym.mec.biz.dal.wrapper;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.ym.mec.biz.dal.enums.DegreeTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Optional;
@@ -34,6 +36,18 @@ public class DegreeLevelFeeWrapper {
         
         @ApiModelProperty("关键字匹配")
 		private String keyword;
+
+        @ApiModelProperty("声部")
+        private Integer subjectId;
+
+        @ApiModelProperty("级别")
+        private Integer level;
+
+        @ApiModelProperty("考级分类, GRADE,THEORY")
+        private DegreeTypeEnum degreeType;
+
+        @ApiModelProperty("是否上传证件")
+        private Boolean credentials;
         
         public String getKeyword() {
             return Optional.ofNullable(keyword).filter(StringUtils::isNotBlank).orElse(null);

mec-biz/src/main/java/com/ym/mec/biz/service/DegreeLevelFeeService.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ym.mec.biz.dal.entity.DegreeLevelFeeNew;
+import com.ym.mec.biz.dal.vo.DegreeLevelFeeNewVo;
 import com.ym.mec.biz.dal.wrapper.DegreeLevelFeeWrapper;
 import com.ym.mec.biz.dal.entity.DegreeLevelFee;
 
@@ -25,7 +26,7 @@ public interface DegreeLevelFeeService extends IService<DegreeLevelFeeNew>  {
      * @param query DegreeLevelFeeWrapper.DegreeLevelFeeQuery
      * @return IPage<DegreeLevelFee>
      */
-    IPage<DegreeLevelFeeNew> selectPage(IPage<DegreeLevelFeeNew> page, DegreeLevelFeeWrapper.DegreeLevelFeeQuery query);
+    IPage<DegreeLevelFeeNewVo> selectPage(IPage<DegreeLevelFeeNewVo> page, DegreeLevelFeeWrapper.DegreeLevelFeeQuery query);
 	
     /**
      * 添加

mec-biz/src/main/java/com/ym/mec/biz/service/impl/DegreeLevelFeeServiceImpl.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.biz.dal.entity.DegreeLevelFeeNew;
+import com.ym.mec.biz.dal.vo.DegreeLevelFeeNewVo;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 import lombok.extern.slf4j.Slf4j;
 import com.ym.mec.biz.dal.entity.DegreeLevelFee;
@@ -11,6 +13,8 @@ import com.ym.mec.biz.dal.wrapper.DegreeLevelFeeWrapper;
 import com.ym.mec.biz.dal.mapper.DegreeLevelFeeMapper;
 import com.ym.mec.biz.service.DegreeLevelFeeService;
 
+import java.util.List;
+
 /**
  * 考级等级费用配置
  * 2023-04-10 10:24:25
@@ -37,8 +41,7 @@ public class DegreeLevelFeeServiceImpl extends ServiceImpl<DegreeLevelFeeMapper,
      * @return IPage<DegreeLevelFee>
      */
     @Override
-    public IPage<DegreeLevelFeeNew> selectPage(IPage<DegreeLevelFeeNew> page, DegreeLevelFeeWrapper.DegreeLevelFeeQuery query) {
-        
+    public IPage<DegreeLevelFeeNewVo> selectPage(IPage<DegreeLevelFeeNewVo> page, DegreeLevelFeeWrapper.DegreeLevelFeeQuery query) {
         return page.setRecords(baseMapper.selectPage(page, query));
     }
 	

mec-biz/src/main/resources/config/mybatis/DegreeLevelFeeNewMapper.xml

@@ -2,10 +2,24 @@
 <!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.ym.mec.biz.dal.mapper.DegreeLevelFeeMapper">
     
-    <select id="selectPage" resultType="com.ym.mec.biz.dal.entity.DegreeLevelFeeNew">
-		SELECT         
-        	t.*
-		FROM degree_level_fee t
+    <select id="selectPage" resultType="com.ym.mec.biz.dal.vo.DegreeLevelFeeNewVo">
+		select dlf.*,s.name_ subjectName from degree_level_fee dlf
+		left join subject s ON dlf.subject_id_ = s.id_
+		<where>
+			<if test="param.subjectId != null">
+				dlf.subject_id_ = #{param.subjectId}
+			</if>
+			<if test="param.level != null">
+				AND dlf.level_ = #{param.level}
+			</if>
+			<if test="param.credentials != null">
+				AND dlf.credentials_ = #{param.credentials}
+			</if>
+			<if test="param.degreeType != null">
+				AND dlf.degree_type_ = #{param.degreeType}
+			</if>
+		</where>
+		ORDER BY dlf.level_
 	</select>
     
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/degree/DegreeLevelFeeController.java

@@ -5,6 +5,7 @@ import com.microsvc.toolkit.common.response.paging.QueryInfo;
 
 import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.biz.dal.entity.DegreeLevelFeeNew;
+import com.ym.mec.biz.dal.vo.DegreeLevelFeeNewVo;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
@@ -25,6 +26,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ym.mec.biz.service.DegreeLevelFeeService;
 import com.ym.mec.biz.dal.wrapper.DegreeLevelFeeWrapper;
 
+import java.util.List;
+
 @Slf4j
 @Validated
 @RestController
@@ -36,7 +39,6 @@ public class DegreeLevelFeeController extends BaseController {
     private DegreeLevelFeeService degreeLevelFeeService;
 
 	@ApiOperation(value = "详情", notes = "考级等级费用配置-根据详情ID查询单条, 传入id")
-    //@PreAuthorize("@pcs.hasPermissions('degreeLevelFee/detail')")
     @GetMapping("/detail/{id}")
     public HttpResponseResult<DegreeLevelFeeNew> detail(@PathVariable("id") Long id) {
 
@@ -48,32 +50,24 @@ public class DegreeLevelFeeController extends BaseController {
     @ApiOperation(value = "查询分页", notes = "考级等级费用配置- 传入 DegreeLevelFeeWrapper.DegreeLevelFeeQuery") 
     @PreAuthorize("@pcs.hasPermissions('degreeLevelFee/page')")
     @PostMapping("/page")
-    public HttpResponseResult<PageInfo<DegreeLevelFeeNew>> page(@RequestBody DegreeLevelFeeWrapper.DegreeLevelFeeQuery query) {
-        
-        IPage<DegreeLevelFeeNew> pages = degreeLevelFeeService.selectPage(QueryInfo.getPage(query), query);
+    public HttpResponseResult<PageInfo<DegreeLevelFeeNewVo>> page(@RequestBody DegreeLevelFeeWrapper.DegreeLevelFeeQuery query) {
         
-        return succeed(QueryInfo.pageInfo(pages));
+        return succeed(QueryInfo.pageInfo(degreeLevelFeeService.selectPage(QueryInfo.getPage(query), query)));
 	}
     
     @ApiOperation(value = "新增", notes = "考级等级费用配置- 传入 DegreeLevelFeeWrapper.DegreeLevelFee")
     @PreAuthorize("@pcs.hasPermissions('degreeLevelFee/save')")
 	@PostMapping("/save")
-	public HttpResponseResult<JSONObject> add(@Validated @RequestBody DegreeLevelFeeNew degreeLevelFee) {
-        
-        // 新增数据
-        degreeLevelFeeService.save(degreeLevelFee);
-        
+	public HttpResponseResult<JSONObject> add(@RequestBody List<DegreeLevelFeeNew> degreeLevelFees) {
+        degreeLevelFeeService.saveBatch(degreeLevelFees);
         return succeed();
 	}
     
     @ApiOperation(value = "修改", notes = "考级等级费用配置- 传入 DegreeLevelFeeWrapper.DegreeLevelFee")
     @PreAuthorize("@pcs.hasPermissions('degreeLevelFee/update')")
 	@PostMapping("/update")
-	public HttpResponseResult<JSONObject> update(@Validated @RequestBody DegreeLevelFeeNew degreeLevelFee) {
-        
-        // 更新数据
+	public HttpResponseResult<JSONObject> update(@RequestBody DegreeLevelFeeNew degreeLevelFee) {
         degreeLevelFeeService.updateById(degreeLevelFee);
-        
         return succeed();
 	}
 
@@ -81,7 +75,6 @@ public class DegreeLevelFeeController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('degreeLevelFee/remove')")
 	@PostMapping("/remove")    
 	public HttpResponseResult<Boolean> remove(@RequestParam Long id) {
-    
 		return succeed(degreeLevelFeeService.removeById(id));
 	}
 }