Merge remote-tracking branch 'origin/master'

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/service/impl/WxClazzCurriculumServiceImpl.java

@@ -1,6 +1,7 @@
 package com.usoftchina.smartschool.school.wxschool.basic.service.impl;
 
 import com.usoftchina.smartschool.school.po.ClazzCurriculumDO;
+import com.usoftchina.smartschool.school.po.SubjectDO;
 import com.usoftchina.smartschool.school.po.TeacherClazzDO;
 import com.usoftchina.smartschool.school.po.TeacherDO;
 import com.usoftchina.smartschool.school.wxschool.basic.service.WxClazzCurriculumService;
@@ -37,15 +38,6 @@ public class WxClazzCurriculumServiceImpl implements WxClazzCurriculumService {
 	public Map<String, Object> selectCurriculumByStuId(Long stuId, Integer curStatus) throws Exception {
 		List<ClazzCurriculumDO> curricula = clazzCurriculumMapper.selectCurriculumByStuId(stuId, curStatus);
 		if (ObjectUtils.isNotEmpty(curricula)){
-			//Map<String, Object> maps = new HashMap<>();
-			//StudentDO studentDO = studentMapper.get(stuId);
-			//if (ObjectUtils.isNotEmpty(studentDO)){
-				//maps.put("stuName",studentDO.getStuName());
-				//maps.put("clazzName",clazzMapper.get(studentDO.getClazzId()).getClazzName());
-				//maps.put("curricula",curricula);
-			//}else {
-				//throw new Exception("该学生不存在，请联系管理员");
-			//}
 			return getCurr(curricula);
 		}else {
 			throw new Exception("暂时没有课程表，请联系管理员");
@@ -73,96 +65,50 @@ public class WxClazzCurriculumServiceImpl implements WxClazzCurriculumService {
 	private Map<String, Object> getCurr(List<ClazzCurriculumDO> curricula) {
 		Map<String, Object> map = new HashMap<>();
 		List<Map<String,Object>> curFris = new ArrayList<>();
-		List<Map<String,Object>> curMons = new ArrayList<>();					List<Map<String,Object>> curSats = new ArrayList<>();
+		List<Map<String,Object>> curMons = new ArrayList<>();
+		List<Map<String,Object>> curSats = new ArrayList<>();
 		List<Map<String,Object>> curThurs = new ArrayList<>();
 		List<Map<String,Object>> curTuess = new ArrayList<>();
 		List<Map<String,Object>> curWeds = new ArrayList<>();
-		SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm");
-		//dateFormat.setTimeZone(TimeZone.getTimeZone("GMT-6"));
 		for (ClazzCurriculumDO cc:curricula) {
 			Long curFri = cc.getCurFri();
-			//System.err.println(cc.getCurStartTime());
-			//System.err.println(dateFormat.format(cc.getCurStartTime()));
 			if (ObjectUtils.isNotEmpty(curFri)){
-				Map<String, Object> curFriMap = new HashMap<>();
-				curFriMap.put("startTime",dateFormat.format(cc.getCurStartTime()));
-				curFriMap.put("endTime",dateFormat.format(cc.getCurEndTime()));
-				curFriMap.put("subjectName",subjectMapper.get(curFri).getSubjectName());
-				TeacherClazzDO teacher1 = wxTeacherClazzMapper.getTeacher(cc.getClazzId(), curFri);
-				TeacherDO teacherDO1 = wxTeacherMapper.get(teacher1.getTeacherId());
-				curFriMap.put("teacherName",teacherDO1.getTeacherName());
-				curFriMap.put("teacherPhoto",teacherDO1.getTeacherPhoto());
-				curFris.add(curFriMap);
+				Map<String, Object> detail = getDetail(cc, curFri);
+				curFris.add(detail);
 			}
 
-
 			Long curMon = cc.getCurMon();
 			if (ObjectUtils.isNotEmpty(curMon)){
-				Map<String, Object> curMonMap = new HashMap<>();
-				curMonMap.put("startTime",dateFormat.format(cc.getCurStartTime()));
-				curMonMap.put("endTime",dateFormat.format(cc.getCurEndTime()));
-				curMonMap.put("subjectName",subjectMapper.get(curMon).getSubjectName());
-				TeacherClazzDO teacher2 = wxTeacherClazzMapper.getTeacher(cc.getClazzId(), curMon);
-				TeacherDO teacherDO2 = wxTeacherMapper.get(teacher2.getTeacherId());
-				curMonMap.put("teacherName",teacherDO2.getTeacherName());
-				curMonMap.put("teacherPhoto",teacherDO2.getTeacherPhoto());
-				curMons.add(curMonMap);
+				Map<String, Object> detail = getDetail(cc, curMon);
+				curMons.add(detail);
 			}
 
 
 			Long curSat = cc.getCurSat();
 			if (ObjectUtils.isNotEmpty(curSat)){
-				Map<String, Object> curSatMap = new HashMap<>();
-				curSatMap.put("startTime",dateFormat.format(cc.getCurStartTime()));
-				curSatMap.put("endTime",dateFormat.format(cc.getCurEndTime()));
-				curSatMap.put("subjectName",subjectMapper.get(curSat).getSubjectName());
-				TeacherClazzDO teacher3 = wxTeacherClazzMapper.getTeacher(cc.getClazzId(), curSat);
-				TeacherDO teacherDO3 = wxTeacherMapper.get(teacher3.getTeacherId());
-				curSatMap.put("teacherName",teacherDO3.getTeacherName());
-				curSatMap.put("teacherPhoto",teacherDO3.getTeacherPhoto());
-				curSats.add(curSatMap);
+				Map<String, Object> detail = getDetail(cc, curSat);
+				curSats.add(detail);
 			}
 
 
 			Long curThur = cc.getCurThur();
 			if (ObjectUtils.isNotEmpty(curThur)){
-				Map<String, Object> curThurMap = new HashMap<>();
-				curThurMap.put("startTime",dateFormat.format(cc.getCurStartTime()));
-				curThurMap.put("endTime",dateFormat.format(cc.getCurEndTime()));
-				curThurMap.put("subjectName",subjectMapper.get(curThur).getSubjectName());
-				TeacherClazzDO teacher4 = wxTeacherClazzMapper.getTeacher(cc.getClazzId(), curThur);
-				TeacherDO teacherDO4 = wxTeacherMapper.get(teacher4.getTeacherId());
-				curThurMap.put("teacherName",teacherDO4.getTeacherName());
-				curThurMap.put("teacherPhoto",teacherDO4.getTeacherPhoto());
-				curThurs.add(curThurMap);
+				Map<String, Object> detail = getDetail(cc, curThur);
+				curThurs.add(detail);
 			}
 
 
 			Long curTues = cc.getCurTues();
 			if (ObjectUtils.isNotEmpty(curTues)){
-				Map<String, Object> curTuesMap = new HashMap<>();
-				curTuesMap.put("startTime",dateFormat.format(cc.getCurStartTime()));
-				curTuesMap.put("endTime",dateFormat.format(cc.getCurEndTime()));
-				curTuesMap.put("subjectName",subjectMapper.get(curTues).getSubjectName());
-				TeacherClazzDO teacher5 = wxTeacherClazzMapper.getTeacher(cc.getClazzId(), curTues);
-				TeacherDO teacherDO5 = wxTeacherMapper.get(teacher5.getTeacherId());
-				curTuesMap.put("teacherName",teacherDO5.getTeacherName());
-				curTuesMap.put("teacherPhoto",teacherDO5.getTeacherPhoto());
-				curTuess.add(curTuesMap);
+				Map<String, Object> detail = getDetail(cc, curTues);
+				curTuess.add(detail);
 			}
 
 
 			Long curWed = cc.getCurWed();
 			if (ObjectUtils.isNotEmpty(curWed)){
-				Map<String, Object> curWedMap = new HashMap<>();
-				curWedMap.put("startTime",dateFormat.format(cc.getCurStartTime()));
-				curWedMap.put("endTime",dateFormat.format(cc.getCurEndTime()));
-				curWedMap.put("subjectName",subjectMapper.get(curWed).getSubjectName());
-				TeacherClazzDO teacher6 = wxTeacherClazzMapper.getTeacher(cc.getClazzId(), curWed);
-				TeacherDO teacherDO6 = wxTeacherMapper.get(teacher6.getTeacherId());
-				curWedMap.put("teacherName",teacherDO6.getTeacherName());
-				curWedMap.put("teacherPhoto",teacherDO6.getTeacherPhoto());
-				curWeds.add(curWedMap);
+				Map<String, Object> detail = getDetail(cc, curWed);
+				curWeds.add(detail);
 			}
 		}
 		map.put("curMons",curMons);
@@ -173,4 +119,27 @@ public class WxClazzCurriculumServiceImpl implements WxClazzCurriculumService {
 		map.put("curWeds",curWeds);
 		return map;
 	}
+
+	private Map<String,Object> getDetail(ClazzCurriculumDO cc,Long subjectId){
+		SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm");
+		Map<String, Object> hashMap = new HashMap<>();
+		hashMap.put("startTime",dateFormat.format(cc.getCurStartTime()));
+		hashMap.put("endTime",dateFormat.format(cc.getCurEndTime()));
+		SubjectDO subjectDO = subjectMapper.get(subjectId);
+		if (ObjectUtils.isNotEmpty(subjectDO)){
+			hashMap.put("subjectName",subjectDO.getSubjectName());
+		}
+		TeacherClazzDO teacher1 = wxTeacherClazzMapper.getTeacher(cc.getClazzId(), subjectId);
+		if (ObjectUtils.isNotEmpty(teacher1)){
+			Long teacherId = teacher1.getTeacherId();
+			if (ObjectUtils.isNotEmpty(teacherId)){
+				TeacherDO teacherDO1 = wxTeacherMapper.get(teacherId);
+				if (ObjectUtils.isNotEmpty(teacherDO1)){
+					hashMap.put("teacherName",teacherDO1.getTeacherName());
+					hashMap.put("teacherPhoto",teacherDO1.getTeacherPhoto());
+				}
+			}
+		}
+		return hashMap;
+	}
 }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/service/impl/WxPrincipalMailboxServiceImpl.java

@@ -63,15 +63,16 @@ public class WxPrincipalMailboxServiceImpl implements WxPrincipalMailboxService
 		principalMailboxDO.setMbCreatorname(parentsMapper.get(principalMailboxDO.getMailboxCreator()).getParentsName());
 		principalMailboxDO.setSchoolId(schoolId);
 		principalMailboxDO.setCreateDate(new Date());
-		StudentDO studentDO = wxStudentMapper.get(principalMailboxDO.getMbStuid());
-		if (ObjectUtils.isNotEmpty(studentDO)){
-			principalMailboxDO.setMbStudent(studentDO.getStuName());
-			ClazzDO clazzDO = wxClazzMapper.get(studentDO.getClazzId());
-			principalMailboxDO.setMbClass(clazzDO.getClazzName());
-			principalMailboxDO.setMbGrade(wxGradeMapper.get(clazzDO.getGradeId()).getGradeName());
+		Long mbStuid = principalMailboxDO.getMbStuid();
+		if (ObjectUtils.isNotEmpty(mbStuid)){
+			StudentDO studentDO = wxStudentMapper.get(mbStuid);
+			if (ObjectUtils.isNotEmpty(studentDO)){
+				principalMailboxDO.setMbStudent(studentDO.getStuName());
+				ClazzDO clazzDO = wxClazzMapper.get(studentDO.getClazzId());
+				principalMailboxDO.setMbClass(clazzDO.getClazzName());
+				principalMailboxDO.setMbGrade(wxGradeMapper.get(clazzDO.getGradeId()).getGradeName());
+			}
 		}
-
-
 		int save = principalMailboxMapper.save(principalMailboxDO);
 		if (save>0){
 			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");

frontend/pc-web/app/view/Interaction/homework/ReleaseController.js

@@ -26,6 +26,7 @@ Ext.define('school.view.interaction.homework.ReleaseController', {
         id = viewModel.data.task_id;
         view.setLoading(true);
         school.util.BaseUtil.request({
+            // url: 'http://10.1.80.180:9520/api/school/homework/publish/' + id,
             url: '/api/school/homework/publish/' + id,
             method: 'POST'
         })

frontend/pc-web/app/view/Interaction/notice/SchoolNotice.js

@@ -59,7 +59,6 @@ Ext.define('school.view.interaction.notice.SchoolNotice', {
                 fieldLabel: '发布时间',
                 readOnly: true,
                 format: 'Y-m-d H:i:s',
-                defaultValue: new Date(),
                 readOnly: true
             }, {
                 xtype: "textfield",

frontend/pc-web/app/view/Interaction/notice/SchoolNoticeController.js

@@ -26,6 +26,7 @@ Ext.define('school.view.interaction.notice.SchoolNoticeController', {
         id = viewModel.data.notify_id;
         view.setLoading(true);
         school.util.BaseUtil.request({
+            // url: 'http://10.1.80.180:9520/api/school/notice/publish/' + id,
             url: '/api/school/notice/publish/' + id,
             method: 'POST'
         })

frontend/pc-web/app/view/basic/student/StudentDetailModel.js

@@ -18,20 +18,13 @@ Ext.define('school.view.basic.student.StudentDetailModel', {
                 
                 var age = 0;
 
-                if(nYear < vYear) {
+                if(nYear > vYear) {
                     age = nYear - vYear;
-                }else {
-                    age = nYear - vYear;
-                    if(nMonth < vMonth) {
+                    if((nMonth < vMonth) || (nMonth == vMonth && nDay < vDay)) {
                         age--;
-                    }else if(nMonth == vMonth){
-                        if(nDay < vDay) {
-                            age--;
-                        }
                     }
                 }
 
-                
                 this.set('stu_age', age);
                 return v;
             }

frontend/pc-web/app/view/viewport/ViewportModel.js

@@ -34,8 +34,8 @@ Ext.define('school.view.viewport.ViewportModel', {
             }],
             proxy: {
                 type: 'ajax',
-                // url: 'http://10.1.80.47:9560/grade/read/1',
-                url: '/api/school/grade/read/' + school.util.BaseUtil.getCurrentUser().school_id,
+                // url: 'http://10.1.80.47:9560/grade/read',
+                url: '/api/school/grade/read',
                 reader: {
                     transform: {
                         fn: function(data) {