志愿表新增两个字段

wisenergy-mapper/src/main/resources/mapper/VolunteerMapper.xml

@@ -4,6 +4,7 @@
 <mapper namespace="cn.wisenergy.mapper.VolunteerMapper">
     <resultMap id="userMap" type="cn.wisenergy.model.app.Volunteer">
         <id column="id" property="id"/>
+        <result column="type" property="type"/>
         <result column="major_name" property="majorName"/>
         <result column="academy" property="academy"/>
         <result column="course_demand" property="courseDemand"/>
@@ -14,6 +15,7 @@
         <result column="launch_num" property="launchNum"/>
         <result column="lowest_mark" property="lowestMark"/>
         <result column="lowest_rank" property="lowestRank"/>
+        <result column="is_delete" property="isDelete"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
     </resultMap>
@@ -28,16 +30,18 @@
     </sql>
 
     <sql id="cols_exclude_id">
-        major_name,academy, course_demand,nature,year_limit,plan_num, castArchives_num,launch_num,lowest_mark,
-        lowest_rank,create_time,update_time
+        type,major_name,academy, course_demand,nature,year_limit,plan_num, castArchives_num,launch_num,lowest_mark,
+        lowest_rank,is_delete,create_time,update_time
     </sql>
 
     <sql id="vals">
-        #{majorName},#{academy},#{courseDemand},#{nature},#{yearLimit},#{planNum},#{castArchivesNum}, #{launchNum},
-        #{lowestMark}, #{lowestRank},now(),now()
+        #{type},#{majorName},#{academy},#{courseDemand},#{nature},#{yearLimit},#{planNum},#{castArchivesNum},
+        #{launchNum},
+        #{lowestMark}, #{lowestRank},#{isDelete},now(),now()
     </sql>
 
     <sql id="updateCondition">
+        <if test="type != null">type = #{type},</if>
         <if test="majorName != null">major_name = #{majorName},</if>
         <if test="academy != null">academy =#{academy},</if>
         <if test="courseDemand != null">course_demand =#{courseDemand},</if>
@@ -48,11 +52,13 @@
         <if test="launchNum != null">launch_num = #{launchNum},</if>
         <if test="lowestMark != null">lowest_mark = #{lowestMark},</if>
         <if test="lowestRank != null">lowestMark = #{lowestRank},</if>
+        <if test="isDelete != null">is_delete = #{isDelete},</if>
         update_time =now()
     </sql>
 
     <sql id="criteria">
         <if test="id != null">id = #{id}</if>
+        <if test="type != null">and type = #{type}</if>
         <if test="majorName != null">and major_name = #{majorName}</if>
         <if test="academy != null">and academy =#{academy}</if>
         <if test="courseDemand != null">and course_demand =#{courseDemand}</if>
@@ -63,6 +69,7 @@
         <if test="launchNum != null">and launch_num = #{launchNum}</if>
         <if test="lowestMark != null">and lowest_mark = #{lowestMark}</if>
         <if test="lowestRank != null">and lowestMark = #{lowestRank}</if>
+        <if test="isDelete != null">and is_delete = #{isDelete}</if>
         <if test="createTime != null">and create_time &gt;= #{createTime}</if>
         <if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
     </sql>

wisenergy-model/src/main/java/cn/wisenergy/model/app/Volunteer.java

 package cn.wisenergy.model.app;
 
+import cn.wisenergy.model.common.BaseEntity;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.annotations.ApiModel;
@@ -23,7 +24,7 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 @ExcelIgnoreUnannotated
-public class Volunteer implements Serializable {
+public class Volunteer extends BaseEntity implements Serializable {
     private static final long serialVersionUID = -7880251929353475087L;
 
     /**
@@ -32,85 +33,81 @@ public class Volunteer implements Serializable {
     @ApiModelProperty(value = "志愿主键id", name = "id")
     private Integer id;
 
+    /**
+     * 方案类型：1：本科文化一批 2：本科美术一批 3：艺术本科批文学编导 4：本科体育  5：专科专业分类6：专科美术一批 7：专科文学编导一批 8：专科体育一批
+     */
+    @ApiModelProperty(value = "方案类型：1：本科文化一批 2：本科美术一批 3：艺术本科批文学编导 4：本科体育  " +
+            "5：专科专业分类6：专科美术一批 7：专科文学编导一批 8：专科体育一批", name = "type")
+    private Integer type;
+
     /**
      * 专业名称
      */
     @ApiModelProperty(value = "专业名称", name = "majorName")
-    @ExcelProperty(value = "姓名")
+    @ExcelProperty(value = "专业名称")
     private String majorName;
 
     /**
      * 院校
      */
     @ApiModelProperty(value = "院校", name = "academy")
-    @ExcelProperty(value = "姓名")
+    @ExcelProperty(value = "院校")
     private String academy;
 
     /**
      * 选考科目要求
      */
     @ApiModelProperty(value = "选考科目要求", name = "courseDemand")
-    @ExcelProperty(value = "姓名")
+    @ExcelProperty(value = "选考科目要求")
     private String courseDemand;
 
     /**
      * 学校性质
      */
     @ApiModelProperty(value = "学校性质", name = "nature")
-    @ExcelProperty(value = "姓名")
+    @ExcelProperty(value = "学校性质")
     private String nature;
 
     /**
      * 学年制（年）
      */
     @ApiModelProperty(value = "学年制（年）", name = "yearLimit")
-    @ExcelProperty(value = "姓名")
+    @ExcelProperty(value = "学年制（年）")
     private Integer yearLimit;
 
     /**
      * 计划数
      */
     @ApiModelProperty(value = "计划数", name = "planNum")
-    @ExcelProperty(value = "姓名")
+    @ExcelProperty(value = "计划数")
     private Integer planNum;
 
     /**
      * 计划投档数
      */
     @ApiModelProperty(value = "计划投档数", name = "castArchivesNum")
-    @ExcelProperty(value = "姓名")
+    @ExcelProperty(value = "计划投档数")
     private Integer castArchivesNum;
 
     /**
      * 投出数
      */
     @ApiModelProperty(value = "投出数", name = "launchNum")
-    @ExcelProperty(value = "姓名")
+    @ExcelProperty(value = "投出数")
     private Integer launchNum;
 
     /**
      * 最低分
      */
     @ApiModelProperty(value = "最低分", name = "lowestMark")
-    @ExcelProperty(value = "姓名")
+    @ExcelProperty(value = "最低分")
     private String lowestMark;
 
     /**
      * 最低位次
      */
     @ApiModelProperty(value = "最低位次", name = "lowestRank")
-    @ExcelProperty(value = "姓名")
+    @ExcelProperty(value = "最低位次")
     private String lowestRank;
 
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间", name = "createTime")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @ApiModelProperty(value = "更新时间", name = "updateTime")
-    private Date updateTime;
 }

wisenergy-model/src/main/java/cn/wisenergy/model/dto/BannerDto.java

@@ -6,6 +6,9 @@ import lombok.Data;
 
 import java.util.Date;
 
+/**
+ * @author 86187
+ */
 @Data
 @ApiModel(value = "BannerDto")
 public class BannerDto {

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/BannerServiceImpl.java

@@ -77,7 +77,6 @@ public class BannerServiceImpl extends ServiceImpl<BannerMapper, Banner> impleme
             return R.error("传入参数无效");
         }
         Banner banner = bannerMapper.getById(id);
-
         if (null == banner) {
             return R.error("数据获取失败");
         }
@@ -127,13 +126,7 @@ public class BannerServiceImpl extends ServiceImpl<BannerMapper, Banner> impleme
     public R<Boolean> putIn(Integer id, Integer status) {
         log.info("BannerServiceImpl[].putIn[].input.param,status:{},id" + status, id);
         //判断数据是否正确
-        if (null == id) {
-            return R.error("缺少重要数据");
-        }
-        if (status == null) {
-            return R.error("缺少重要数据");
-        }
-        if (status < 0 || status > 1) {
+        if (null == id || status == null) {
             return R.error("缺少重要数据");
         }
 

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/RefillCardServiceImpl.java

@@ -33,6 +33,8 @@ public class RefillCardServiceImpl implements RefillCardService {
 
     @Autowired
     private CardMapper cardMapper;
+
+
     @Override
     @Transactional
     public R add(RefillCard refillCard) {