Merge branch 'feature/0406-degree' into master_saas

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

@@ -11,6 +11,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.joda.time.Days;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -18,6 +20,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 /**
@@ -28,20 +31,20 @@ import java.util.Optional;
 public class DegreeWrapper {
 
     @Data
-	@Builder
+    @Builder
     @NoArgsConstructor
     @AllArgsConstructor
     @ApiModel(" DegreeQuery-考级信息")
     public static class DegreeQuery implements QueryInfo {
-    
-    	@ApiModelProperty("当前页")
+
+        @ApiModelProperty("当前页")
         private Integer page;
         
         @ApiModelProperty("分页行数")
         private Integer rows;
         
         @ApiModelProperty("考级名称/编号")
-		private String keyword;
+        private String keyword;
 
 
         @ApiModelProperty("开始时间")
@@ -101,7 +104,7 @@ public class DegreeWrapper {
     }
 
     @Data
-	@ApiModel(" Degree-考级信息")
+    @ApiModel(" Degree-考级信息")
     public static class Degree {
 
 
@@ -146,6 +149,8 @@ public class DegreeWrapper {
         @ApiModelProperty("报名状态 NOT_START:未开始,START:报名中,END:报名结束")
         private EDegreeStatus status;
 
+        @ApiModelProperty("倒计时开始天数")
+        private Integer startDays;
 
         public String jsonString() {
             return JSON.toJSONString(this);
@@ -154,7 +159,17 @@ public class DegreeWrapper {
         public static Degree from(String json) {
             return JSON.parseObject(json, Degree.class);
         }
-	}
+
+        public Integer getStartDays() {
+            if (Objects.nonNull(getStartTime()) && EDegreeStatus.NOT_START == getStatus()) {
+
+                DateTime now = DateTime.now().withHourOfDay(0).withMinuteOfHour(0).withSecondOfMinute(0).withMillisOfSecond(0);
+                // 计算与当前时间相差天数
+                return Days.daysBetween(now, new DateTime(getStartTime())).getDays();
+            }
+            return Optional.ofNullable(startDays).orElse(0);
+        }
+    }
 
     @Data
     @ApiModel(" DegreeStatistical-考级信息统计")

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

@@ -143,22 +143,19 @@
         insert into degree_registration (user_id_,degree_id_,organ_id_,order_no_, name_, gender_,
         idcard_, city_, school_,
         subject_id_,level_, theory_cert_,mobile_,
-        money_, memo_, create_time_,
-        update_time_, status_,certificate_type_,tenant_id_,type_)
+        money_, memo_,status_,certificate_type_,tenant_id_,type_)
         values (#{userId},#{degreeId},#{organId,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{gender,jdbcType=VARCHAR},
         #{idcard,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{school,jdbcType=VARCHAR},
         #{subjectId},#{level,jdbcType=VARCHAR},
         #{theoryCert,jdbcType=VARCHAR},#{mobile,jdbcType=VARCHAR},#{money,jdbcType=DECIMAL}, #{memo,jdbcType=VARCHAR},
-        #{createTime}, #{updateTime}, #{status,jdbcType=TINYINT},
-                #{certificateType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+        #{status,jdbcType=TINYINT},#{certificateType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
                 #{tenantId},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
     </insert>
     <insert id="batchInsert">
         INSERT INTO degree_registration (user_id_,degree_id_,organ_id_,order_no_, name_, gender_,
         idcard_, city_, school_,
         subject_id_,level_, theory_cert_,mobile_,
-        money_, memo_, create_time_,
-        update_time_, status_,certificate_type_,tenant_id_,type_)
+        money_, memo_,status_,certificate_type_,tenant_id_,type_)
         VALUE
         <foreach collection="degreeRegistrationList" separator="," item="degreeRegistration">
             (#{degreeRegistration.userId},#{degreeRegistration.degreeId,jdbcType=INTEGER},#{degreeRegistration.organId,jdbcType=INTEGER},
@@ -166,7 +163,7 @@
             #{degreeRegistration.idcard,jdbcType=VARCHAR}, #{degreeRegistration.city,jdbcType=VARCHAR}, #{degreeRegistration.school,jdbcType=VARCHAR},
             #{degreeRegistration.subjectId},#{degreeRegistration.level,jdbcType=VARCHAR},
             #{degreeRegistration.theoryCert,jdbcType=VARCHAR},#{degreeRegistration.mobile,jdbcType=VARCHAR},#{degreeRegistration.money,jdbcType=DECIMAL}, #{degreeRegistration.memo,jdbcType=VARCHAR},
-            #{degreeRegistration.createTime}, #{degreeRegistration.updateTime}, #{degreeRegistration.status,jdbcType=TINYINT},
+            #{degreeRegistration.status,jdbcType=TINYINT},
             #{degreeRegistration.certificateType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{degreeRegistration.tenantId},#{degreeRegistration.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
         </foreach>
@@ -223,16 +220,12 @@
             <if test="memo != null">
                 memo_ = #{memo,jdbcType=VARCHAR},
             </if>
-            <if test="createTime != null">
-                create_time_ = #{createTime},
-            </if>
             <if test="status != null">
                 status_ = #{status,jdbcType=INTEGER},
             </if>
             <if test="certificateType != null">
                 certificate_type_ = #{certificateType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
-                update_time_ = NOW()
         </set>
         where id_ = #{id,jdbcType=INTEGER} and tenant_id_ = #{tenantId}
     </update>
@@ -289,16 +282,12 @@
                 <if test="degree.memo != null">
                     memo_ = #{degree.memo,jdbcType=VARCHAR},
                 </if>
-                <if test="degree.createTime != null">
-                    create_time_ = #{degree.createTime},
-                </if>
                 <if test="degree.status != null">
                     status_ = #{degree.status,jdbcType=INTEGER},
                 </if>
 	            <if test="degree.certificateType != null">
 	                certificate_type_ = #{degree.certificateType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 	            </if>
-                    update_time_ = NOW()
             </set>
             where id_ = #{degree.id,jdbcType=INTEGER} and tenant_id_ = #{degree.tenantId}
         </foreach>