问题修改

common/src/main/java/com/jpsoft/campus/modules/base/dao/SchoolNumberDAO.java

@@ -17,5 +17,6 @@ public interface SchoolNumberDAO {
 	List<SchoolNumber> search(Map<String, Object> searchParams, List<Sort> sortList);
 	List<SchoolNumber> findByEnrollmentType(String enrollmentType);
 	List<SchoolNumber> findHaveNumberBySchoolId(String enrollmentType,String schoolId);
+	List<SchoolNumber> findAllHaveNumber();
 	int findNumByHaveNumber();
 }

common/src/main/java/com/jpsoft/campus/modules/base/entity/SchoolNumber.java

@@ -43,4 +43,10 @@ public class SchoolNumber {
         @ApiModelProperty(value = "删除标示")
     private Boolean delFlag;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
+    private Date startTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
+    private Date endTime;
+
 }

common/src/main/java/com/jpsoft/campus/modules/base/service/SchoolNumberService.java

@@ -16,5 +16,6 @@ public interface SchoolNumberService {
 	Page<SchoolNumber> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 	List<SchoolNumber> findByEnrollmentType(String enrollmentType);
 	List<SchoolNumber> findHaveNumberBySchoolId(String enrollmentType,String schoolId);
+	List<SchoolNumber> findAllHaveNumber();
 	int findNumByHaveNumber();
 }

common/src/main/java/com/jpsoft/campus/modules/base/service/impl/SchoolNumberServiceImpl.java

@@ -78,6 +78,11 @@ public class SchoolNumberServiceImpl implements SchoolNumberService {
 		return schoolNumberDAO.findHaveNumberBySchoolId(enrollmentType,schoolId);
 	}
 
+	@Override
+	public List<SchoolNumber> findAllHaveNumber(){
+		return schoolNumberDAO.findAllHaveNumber();
+	}
+
 	@Override
 	public int findNumByHaveNumber(){
 		return schoolNumberDAO.findNumByHaveNumber();

common/src/main/resources/mapper/base/SchoolNumber.xml

@@ -15,6 +15,8 @@
 			<result property="updateBy" column="update_by" />
 			<result property="updateTime" column="update_time" />
 			<result property="delFlag" column="del_flag" />
+			<result property="startTime" column="start_time" />
+			<result property="endTime" column="end_time" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.campus.modules.base.entity.SchoolNumber">
 	<!--
@@ -24,7 +26,7 @@
 	-->
 	<![CDATA[
 		insert into base_school_number
-	    (id_,school_id,enrollment_type,grade_,number_,create_by,create_time,update_by,update_time,del_flag,grade_str)
+	    (id_,school_id,enrollment_type,grade_,number_,create_by,create_time,update_by,update_time,del_flag,grade_str,start_time,end_time)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -38,6 +40,8 @@
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{gradeStr,jdbcType=VARCHAR}
+,#{startTime,jdbcType=TIMESTAMP}
+,#{endTime,jdbcType=TIMESTAMP}
 		)
 	]]>
 	</insert>
@@ -77,6 +81,12 @@
 			<if test="gradeStr!=null">
 				grade_str=#{gradeStr,jdbcType=VARCHAR},
 			</if>
+			<if test="startTime!=null">
+				start_time=#{startTime,jdbcType=TIMESTAMP},
+			</if>
+			<if test="endTime!=null">
+				end_time=#{endTime,jdbcType=TIMESTAMP},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
@@ -140,4 +150,17 @@
 			del_flag = 0
 			AND number_ > 0
 	</select>
+
+	<select id="findAllHaveNumber" resultMap="SchoolNumberMap">
+		SELECT
+		*
+		FROM
+		base_school_number
+		WHERE
+		del_flag = 0
+		AND number_ > 0
+		ORDER BY
+		school_id,
+		grade_
+	</select>
 </mapper>

web/src/main/java/com/jpsoft/campus/modules/mobile/controller/SchoolInfoApiController.java

@@ -1,6 +1,7 @@
 package com.jpsoft.campus.modules.mobile.controller;
 
 import com.jpsoft.campus.modules.base.dto.SchoolInfoDTO;
+import com.jpsoft.campus.modules.base.entity.EnrollControl;
 import com.jpsoft.campus.modules.base.entity.SchoolInfo;
 import com.jpsoft.campus.modules.base.entity.SchoolNumber;
 import com.jpsoft.campus.modules.base.service.SchoolInfoService;
@@ -18,10 +19,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author 墨鱼_mo
@@ -177,18 +175,45 @@ public class SchoolInfoApiController {
     public MessageResult<Boolean> transferSchoolControl(String token){
         MessageResult<Boolean> messageResult = new MessageResult<>();
 
+//        try {
+//               int schoolNumber = schoolNumberService.findNumByHaveNumber();
+//                if (schoolNumber > 0) {
+//                    messageResult.setData(true);
+//                }else{
+//                    messageResult.setData(false);
+//                }
+//                messageResult.setResult(true);
+//        }
+//        catch (Exception ex){
+//            log.error(ex.getMessage(),ex);
+//            messageResult.setData(false);
+//            messageResult.setResult(false);
+//            messageResult.setMessage(ex.getMessage());
+//        }
+//
+//        return messageResult;
+
+        boolean result = true;
         try {
-               int schoolNumber = schoolNumberService.findNumByHaveNumber();
-                if (schoolNumber > 0) {
-                    messageResult.setData(true);
-                }else{
-                    messageResult.setData(false);
+            List<SchoolNumber> numberList = schoolNumberService.findAllHaveNumber();
+            int i = 0;
+            for (SchoolNumber sn : numberList){
+                if (sn.getStartTime().compareTo(new Date()) < 0 && sn.getEndTime().compareTo(new Date()) > 0) {
+                    i++;
                 }
-                messageResult.setResult(true);
-        }
-        catch (Exception ex){
-            log.error(ex.getMessage(),ex);
+            }
+            if (i < 1){
+                result = false;
+            }
+
+            messageResult.setCode(200);
+            messageResult.setData(result);
+            messageResult.setResult(true);
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
+
             messageResult.setData(false);
+            messageResult.setCode(500);
             messageResult.setResult(false);
             messageResult.setMessage(ex.getMessage());
         }