Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -67,18 +67,23 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         }
         degreeRegistration.setLevel(chargeInfo.getTitle());
         BigDecimal theoryMoney = BigDecimal.ZERO;
-        if (degreeRegistration.getTheoryLevel().equals("一级")) {
-            theoryMoney = new BigDecimal(200);
-        } else if (degreeRegistration.getTheoryLevel().equals("二级")) {
-            theoryMoney = new BigDecimal(240);
-        } else if (degreeRegistration.getTheoryLevel().equals("三级")) {
-            theoryMoney = new BigDecimal(280);
-        } else if (degreeRegistration.getTheoryLevel().equals("四级")) {
-            theoryMoney = new BigDecimal(320);
-        } else if (degreeRegistration.getTheoryLevel().equals("免考")) {
-
-        } else {
-            throw new BizException("您选择的乐理级别不存在，请核对");
+        switch (degreeRegistration.getTheoryLevel()) {
+            case "一级":
+                theoryMoney = new BigDecimal(200);
+                break;
+            case "二级":
+                theoryMoney = new BigDecimal(240);
+                break;
+            case "三级":
+                theoryMoney = new BigDecimal(280);
+                break;
+            case "四级":
+                theoryMoney = new BigDecimal(320);
+                break;
+            case "免考":
+                break;
+            default:
+                throw new BizException("您选择的乐理级别不存在，请核对");
         }
         degreeRegistration.setTheoryMoney(theoryMoney);
         DegreeRegistration degree = degreeRegistrationDao.findByMobileAndSporadicId(degreeRegistration.getMobile(), degreeRegistration.getSporadicId());
@@ -93,6 +98,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         } else {
             degreeRegistration.setId(degree.getId());
             degreeRegistration.setStatus(1);
+            degreeRegistration.setCreateTime(nowDate);
             degreeRegistration.setUpdateTime(nowDate);
             degreeRegistrationDao.update(degreeRegistration);
         }

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

@@ -72,9 +72,6 @@
             <if test="level != null">
                 AND level_= #{level}
             </if>
-            <if test="level != null">
-                AND level_= #{level}
-            </if>
         </where>
     </sql>
 
@@ -82,6 +79,7 @@
     <select id="queryPage" resultMap="DegreeRegistration" parameterType="map">
         SELECT * FROM degree_registration
         <include refid="queryPageSql"/>
+        <include refid="global.orderby"/>
         <include refid="global.limit"/>
     </select>
 
@@ -114,9 +112,8 @@
         #{idcard,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{school,jdbcType=VARCHAR},
         #{subject,jdbcType=VARCHAR},#{level,jdbcType=VARCHAR},
         #{theoryLevel,jdbcType=VARCHAR},#{theoryMoney,jdbcType=DECIMAL},
-        #{theoryLevel,jdbcType=VARCHAR}#{mobile,jdbcType=VARCHAR},#{money,jdbcType=DECIMAL}, #{memo,jdbcType=VARCHAR},
-        #{createTime},
-        #{updateTime}, #{status,jdbcType=TINYINT})
+        #{theoryCert,jdbcType=VARCHAR},#{mobile,jdbcType=VARCHAR},#{money,jdbcType=DECIMAL}, #{memo,jdbcType=VARCHAR},
+        #{createTime}, #{updateTime}, #{status,jdbcType=TINYINT})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.DegreeRegistration">
         <!--@mbg.generated-->

mec-web/src/main/java/com/ym/mec/web/controller/education/EduDegreeController.java

@@ -54,6 +54,8 @@ public class EduDegreeController extends BaseController {
     @GetMapping("/queryPage")
     public HttpResponseResult queryPage(DegreeQueryInfo queryInfo) {
         queryInfo.setStatus(2);
+        queryInfo.setSort("create_time_");
+        queryInfo.setOrder("DESC");
         return succeed(degreeRegistrationService.getPageList(queryInfo));
     }