问题修改

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

@@ -17,4 +17,5 @@ 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);
+	int findNumByHaveNumber();
 }

common/src/main/java/com/jpsoft/campus/modules/base/dto/AttachmentDTO.java

@@ -11,5 +11,7 @@ public class AttachmentDTO implements Serializable {
     private String name;
     private String type;
     private String remark;
+    private String number;
+    private List<String> notes;
     private List<String> files;
 }

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

@@ -16,4 +16,5 @@ 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);
+	int findNumByHaveNumber();
 }

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

@@ -77,4 +77,9 @@ public class SchoolNumberServiceImpl implements SchoolNumberService {
 	public List<SchoolNumber> findHaveNumberBySchoolId(String enrollmentType,String schoolId){
 		return schoolNumberDAO.findHaveNumberBySchoolId(enrollmentType,schoolId);
 	}
+
+	@Override
+	public int findNumByHaveNumber(){
+		return schoolNumberDAO.findNumByHaveNumber();
+	}
 }

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

@@ -130,4 +130,14 @@
 			school_id,
 			grade_
 	</select>
+
+	<select id="findNumByHaveNumber" resultType="int">
+		SELECT
+			count( * )
+		FROM
+			base_school_number
+		WHERE
+			del_flag = 0
+			AND number_ > 0
+	</select>
 </mapper>

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

@@ -116,7 +116,7 @@
             where del_flag=0
             and application_id=#{applicationId}
             and file_type = #{fileType}
-            order by create_time asc
+            order by sort_no asc
 		]]>
 	</select>
     <select id="findUrlByApplicationIdAndFileType" parameterType="hashmap" resultType="String">
@@ -125,7 +125,7 @@
             where del_flag=0
             and application_id=#{applicationId}
             and file_type = #{fileType}
-            order by create_time asc
+            order by sort_no asc
 		]]>
     </select>
 </mapper>

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

@@ -395,6 +395,18 @@ public class MiddleSchoolApiController {
                     attachmentDTO.setType(attachment.getExtended1());
                     attachmentDTO.setRemark(attachment.getExtended2());
 
+                    if("Y".equals(type)) {
+                        attachmentDTO.setNumber(attachment.getExtended3());
+                        if(StringUtils.isNotEmpty(attachment.getExtended2())) {
+                            attachmentDTO.setNotes(Arrays.asList(attachment.getExtended2().split(",")));
+                        }
+                    }else if("Z".equals(type)){
+                        attachmentDTO.setNumber(attachment.getExtended3());
+                        if(StringUtils.isNotEmpty(attachment.getExtended2())) {
+                            attachmentDTO.setNotes(Arrays.asList(attachment.getExtended2().split(",")));
+                        }
+                    }
+
                     List<String> files = new ArrayList<>();
 
                     if (StringUtils.isNotEmpty(applicationId)) {

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

@@ -309,8 +309,6 @@ public class PrimarySchoolApiController {
             dataMap.put("remark", studentCertDict.getExtended2()); //备注
             dataMap.put("description" , studentCertDict.getExtended3());
 
-
-
             List<AttachmentDTO> attachmentDTOList = new ArrayList<>();
 
             for (DataDictionary attachment : attachments) {
@@ -321,6 +319,18 @@ public class PrimarySchoolApiController {
                 attachmentDTO.setType(attachment.getExtended1());
                 attachmentDTO.setRemark(attachment.getExtended2());
 
+                if("Y".equals(type)) {
+                    attachmentDTO.setNumber(attachment.getExtended3());
+                    if(StringUtils.isNotEmpty(attachment.getExtended2())) {
+                        attachmentDTO.setNotes(Arrays.asList(attachment.getExtended2().split(",")));
+                    }
+                }else if("Z".equals(type)){
+                    attachmentDTO.setNumber(attachment.getExtended3());
+                    if(StringUtils.isNotEmpty(attachment.getExtended2())) {
+                        attachmentDTO.setNotes(Arrays.asList(attachment.getExtended2().split(",")));
+                    }
+                }
+
                 List<String> files = new ArrayList<>();
 
                 if(StringUtils.isNotEmpty(applicationId)){

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

@@ -171,4 +171,28 @@ public class SchoolInfoApiController {
 
         return messageResult;
     }
+
+    @GetMapping("transferSchoolControl")
+    @ApiOperation(value = "插班转学打开关闭控制")
+    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;
+    }
 }