Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

applications/device/device-server/src/main/resources/mapper/IcCardMapper.xml

@@ -6,7 +6,7 @@
   </resultMap>
 
   <select id="getSchoolIdByName" resultType="com.usoftchina.smartschool.school.dto.SysSchoolDTO">
-    SELECT * FROM SYS_SCHOOL WHERE SCHOOL_NAME = #{name} or school_id = #[name]
+    SELECT * FROM SYS_SCHOOL WHERE SCHOOL_NAME = #{name} or school_id = #{name}
   </select>
 
   <select id="SelectParentOpenId" resultType="string">

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/po/StuScoreDO.java

@@ -23,11 +23,13 @@ public class StuScoreDO implements Serializable {
 	private String scoreType;
 	//考试科目
 	private Long subjectId;
+	//科目名
 	private String subjectName;
 	//名称
 	private String scoreName;
 	//学生
 	private Long stuId;
+	//学生姓名
 	private String stuName;
 	//分值
 	private Double scoreTotal;
@@ -41,6 +43,16 @@ public class StuScoreDO implements Serializable {
 	private String scoreRemarks;
 	//学校
 	private Long schoolId;
+	//班级id
+	private Long classId;
+	//班级名
+	private String className;
+	//年级id
+	private Long gradeId;
+	//年级名
+	private String gradeName;
+	//标题
+	private String examTitle;
 
 
 }

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

@@ -1,11 +1,11 @@
 package com.usoftchina.smartschool.school.wxschool.basic.service.impl;
 
-import com.usoftchina.smartschool.school.wxschool.mapper.WxClazzMapper;
-import com.usoftchina.smartschool.school.wxschool.mapper.WxStuScoreMapper;
-import com.usoftchina.smartschool.school.wxschool.mapper.WxStudentMapper;
 import com.usoftchina.smartschool.school.po.StuScoreDO;
 import com.usoftchina.smartschool.school.po.StudentDO;
 import com.usoftchina.smartschool.school.wxschool.basic.service.WxStuScoreService;
+import com.usoftchina.smartschool.school.wxschool.mapper.WxClazzMapper;
+import com.usoftchina.smartschool.school.wxschool.mapper.WxStuScoreMapper;
+import com.usoftchina.smartschool.school.wxschool.mapper.WxStudentMapper;
 import com.usoftchina.smartschool.school.wxschool.utils.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,57 +43,95 @@ public class WxStuScoreServiceImpl implements WxStuScoreService {
 		if (ObjectUtils.isNotEmpty(stuScoreDOS)){
 			List<Map> maps = new ArrayList<>();
 			List<Long> longs = new ArrayList<>();
-			List<StudentDO> studentDOS = studentMapper.listByClazzId(studentMapper.get(stuId).getClazzId());
-			if (ObjectUtils.isNotEmpty(studentDOS)){
-				for (StudentDO st:studentDOS) {
-					longs.add(st.getStuId());
-				}
-			}
+            StudentDO studentDO = studentMapper.get(stuId);
+            if (ObjectUtils.isNotEmpty(studentDO)){
+                Long clazzId = studentDO.getClazzId();
+                if (ObjectUtils.isNotEmpty(clazzId)){
+                    List<StudentDO> studentDOS = studentMapper.listByClazzId(clazzId);
+                    if (ObjectUtils.isNotEmpty(studentDOS)){
+                        for (StudentDO st:studentDOS) {
+                            longs.add(st.getStuId());
+                        }
+                    }
+                }
+            }
 			for (StuScoreDO ss:stuScoreDOS) {
 				Map<String, Object> map = new HashMap<>();
-				List<StuScoreDO> stuScoreDOS1 = stuScoreMapper.selectScoreListByStuId(longs, ss.getScoreType(), ss.getSubjectId());
-				if (ObjectUtils.isNotEmpty(stuScoreDOS1)) {
-					Double m = 0.0;
-					for (int j = 0; j < stuScoreDOS1.size(); j++) {
-						StuScoreDO score = stuScoreDOS1.get(j);
-						Long stuId1 = score.getStuId();
-						if (stuId.compareTo(stuId1) == 0) {
-							score.setStuName(studentMapper.get(stuId1).getStuName());
-							map.put("scoreBasic", score);
-							map.put("classRank", j + 1);
-							map.put("title", clazzMapper.get(studentMapper.get(stuId).getClazzId()).getClazzName() + score.getScoreName() + score.getScoreType());
-						}
-						m = m + score.getScoreNum();
-					}
-					map.put("classAverage", new BigDecimal(m / stuScoreDOS1.size()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-					//一个班级
-					List<Long> clazzIds = clazzMapper.getByClazzId(studentMapper.get(stuId).getClazzId());
-					List<Long> list = new ArrayList<>();
-					for (Long clazzId:clazzIds) {
-						List<Long> stuIds = studentMapper.selectStuIdsByClazzId(clazzId);
-						list.addAll(stuIds);
-					}
-					List<StuScoreDO> scores = stuScoreMapper.selectScoreListByStuId(list,ss.getScoreType(), ss.getSubjectId());
-					Double n = 0.0;
-					for (int k = 0; k < scores.size(); k++) {
-						StuScoreDO score = scores.get(k);
-						if (stuId.compareTo(score.getStuId()) == 0) {
-							if ("全年级".equals(score.getScoreScope())) {
-								map.put("schoolRank", k + 1);
-							} else {
-								map.put("schoolRank", "-");
-							}
-						}
-						n = n + score.getScoreNum();
-					}
-					map.put("schoolAverage", new BigDecimal(n / scores.size()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
-					maps.add(map);
-				}
+				if (ObjectUtils.isNotEmpty(ss.getScoreType())&&ObjectUtils.isNotEmpty(ss.getSubjectId())){
+                    List<StuScoreDO> stuScoreDOS1 = stuScoreMapper.selectScoreListByStuId(longs, ss.getScoreType(), ss.getSubjectId());
+                    if (ObjectUtils.isNotEmpty(stuScoreDOS1)) {
+                        Double m = 0.0;
+                        for (int j = 0; j < stuScoreDOS1.size(); j++) {
+                            StuScoreDO score = stuScoreDOS1.get(j);
+                            Long stuId1 = score.getStuId();
+                            if (stuId.compareTo(stuId1) == 0) {
+                                score.setStuName(score.getStuName());
+                                map.put("scoreBasic", score);
+                                map.put("classRank", j + 1);
+                                map.put("title",score.getExamTitle());
+                            }
+                            m = m + score.getScoreNum();
+                        }
+                        map.put("classAverage", new BigDecimal(m / stuScoreDOS1.size()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+                        //一个班级
+                        List<Long> clazzIds = clazzMapper.getByClazzId(studentMapper.get(stuId).getClazzId());
+                        List<Long> list = new ArrayList<>();
+                        for (Long clazzId:clazzIds) {
+                            List<Long> stuIds = studentMapper.selectStuIdsByClazzId(clazzId);
+                            list.addAll(stuIds);
+                        }
+                        List<StuScoreDO> scores = stuScoreMapper.selectScoreListByStuId(list,ss.getScoreType(), ss.getSubjectId());
+                        Double n = 0.0;
+                        for (int k = 0; k < scores.size(); k++) {
+                            StuScoreDO score = scores.get(k);
+                            if (stuId.compareTo(score.getStuId()) == 0) {
+                                if ("全年级".equals(score.getScoreScope())) {
+                                    map.put("schoolRank", k + 1);
+                                } else {
+                                    map.put("schoolRank", "-");
+                                }
+                            }
+                            n = n + score.getScoreNum();
+                        }
+                        map.put("schoolAverage", new BigDecimal(n / scores.size()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+                        maps.add(map);
+                    }
+                }
 			}
 			return maps;
 		}else {
 			throw new Exception("暂无数据");
 		}
 	}
-	
+
+
+ 
+    /*public List<Map> getScoreList(Long stuId, Integer pageIndex, Integer pageSize) throws Exception{
+        Integer pageStart = (pageIndex-1)*pageSize;
+        List<StuScoreDO> stuScoreDOS = stuScoreMapper.listByStu(stuId, pageStart, pageSize);
+        if (ObjectUtils.isNotEmpty(stuScoreDOS)){
+            List<Long> list = new ArrayList<>();
+            for (StuScoreDO ss:stuScoreDOS) {
+                Long classId = ss.getClassId();
+                if (ObjectUtils.isNotEmpty(classId)){
+                    List<Long> longs = studentMapper.selectStuIdsByClazzId(classId);
+
+                    list.addAll(longs);
+                }
+            }
+
+        }
+    }*/
+
+
+
+    private static List removeDuplicate(List list){
+        List listTemp = new ArrayList();
+        for(int i=0;i<list.size();i++){
+            if(!listTemp.contains(list.get(i))){
+                listTemp.add(list.get(i));
+            }
+        }
+        return listTemp;
+    }
 }

applications/school/school-server/src/main/resources/mapper/WxStuScoreMapper.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.usoftchina.smartschool.school.wxschool.mapper.WxStuScoreMapper">
 
     <sql id="StuScoreVo">
-    select `score_id`,`score_type`,`score_name`,`stu_id`,`score_total`,`score_num`,`score_scope`,`score_date`,`score_remarks`,`school_id`,`subject_id` from stu_score
+    select `score_id`,`score_type`,`score_name`,`stu_id`,`score_total`,`score_num`,`score_scope`,`score_date`,`score_remarks`,`school_id`,`subject_id`,`stu_name`,`subject_name`,`class_id`,`class_name`,`grade_id`,`grade_name`,`exam_title` from stu_score
     </sql>
 
 	<select id="get" resultType="com.usoftchina.smartschool.school.po.StuScoreDO">
@@ -25,6 +25,14 @@
 		  		  <if test="scoreRemarks != null and scoreRemarks != ''"> and score_remarks = #{scoreRemarks} </if>
 		  		  <if test="schoolId != null and schoolId != ''"> and school_id = #{schoolId} </if>
 			<if test="subjectId != null and subjectId != ''"> and subject_id = #{subjectId} </if>
+			<if test="stuName != null and stuName != ''"> and stu_name = #{stuName} </if>
+			<if test="subjectName != null and subjectName != ''"> and subject_name = #{subjectName} </if>
+			<if test="classId != null and classId != ''"> and class_id = #{classId} </if>
+			<if test="className != null and className != ''"> and class_name = #{className} </if>
+			<if test="gradeId != null and gradeId != ''"> and grade_id = #{gradeId} </if>
+			<if test="gradeName != null and gradeName != ''"> and grade_name = #{gradeName} </if>
+			<if test="examTitle != null and examTitle != ''"> and exam_title = #{examTitle} </if>
+
 		  		</where>
         <choose>
             <when test="sort != null and sort.trim() != ''">
@@ -53,6 +61,13 @@
 		  		  <if test="scoreRemarks != null and scoreRemarks != ''"> and score_remarks = #{scoreRemarks} </if>
 		  		  <if test="schoolId != null and schoolId != ''"> and school_id = #{schoolId} </if>
 			 <if test="subjectId != null and subjectId != ''"> and subject_id = #{subjectId} </if>
+			 <if test="stuName != null and stuName != ''"> and stu_name = #{stuName} </if>
+			 <if test="subjectName != null and subjectName != ''"> and subject_name = #{subjectName} </if>
+			 <if test="classId != null and classId != ''"> and class_id = #{classId} </if>
+			 <if test="className != null and className != ''"> and class_name = #{className} </if>
+			 <if test="gradeId != null and gradeId != ''"> and grade_id = #{gradeId} </if>
+			 <if test="gradeName != null and gradeName != ''"> and grade_name = #{gradeName} </if>
+			 <if test="examTitle != null and examTitle != ''"> and exam_title = #{examTitle} </if>
 		  		</where>
 	</select>
 	 
@@ -68,7 +83,14 @@
 			`score_date`, 
 			`score_remarks`, 
 			`school_id`,
-			`subject_id`
+			`subject_id`,
+			`stu_name`,
+			`subject_name`,
+			`class_id`,
+			`class_name`,
+			`grade_id`,
+			`grade_name`,
+			`exam_title`
 		)
 		values
 		(
@@ -81,7 +103,14 @@
 			#{scoreDate}, 
 			#{scoreRemarks}, 
 			#{schoolId},
-			#{subjectId}
+			#{subjectId},
+			#{stuName},
+			#{subjectName},
+			#{classId},
+			#{className},
+			#{gradeId},
+			#{gradeName},
+			#{examTitle}
 		)
 	</insert>
 	 
@@ -97,7 +126,14 @@
 			<if test="scoreDate != null">`score_date` = #{scoreDate}, </if>
 			<if test="scoreRemarks != null">`score_remarks` = #{scoreRemarks}, </if>
 			<if test="schoolId != null">`school_id` = #{schoolId},</if>
-			<if test="subjectId != null and subjectId != ''"> subject_id = #{subjectId} </if>
+			<if test="subjectId != null"> `subject_id` = #{subjectId}, </if>
+			<if test="stuName != null "> `stu_name` = #{stuName}, </if>
+			<if test="subjectName != null"> `subject_name` = #{subjectName}, </if>
+			<if test="classId != null"> `class_id` = #{classId}, </if>
+			<if test="className != null "> `class_name` = #{className} ,</if>
+			<if test="gradeId != null "> `grade_id` = #{gradeId}, </if>
+			<if test="gradeName != null "> `grade_name` = #{gradeName}, </if>
+			<if test="examTitle != null "> `exam_title` = #{examTitle} </if>
 		</set>
 		where score_id = #{scoreId}
 	</update>

base-servers/file/file-storage-fdfs/src/main/java/com/usoftchina/smartschool/file/storage/fdfs/FdfsFileStorageClient.java

@@ -4,8 +4,6 @@ import com.github.tobato.fastdfs.domain.StorePath;
 import com.github.tobato.fastdfs.service.FastFileStorageClient;
 import com.usoftchina.smartschool.file.storage.FileMetadata;
 import com.usoftchina.smartschool.file.storage.FileStorageClient;
-import com.usoftchina.smartschool.file.storage.util.FileType;
-import com.usoftchina.smartschool.file.storage.util.FileTypeUtils;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -24,16 +22,8 @@ public class FdfsFileStorageClient implements FileStorageClient{
 
     @Override
     public String uploadFile(InputStream inputStream, FileMetadata metadata) {
-        FileType type = FileTypeUtils.getFileType(metadata.getMime(), metadata.getExt());
-        StorePath storePath;
-        if (FileType.IMAGE == type) {
-            // 保存图片 + 生成缩略图
-            storePath = storageClient.uploadImageAndCrtThumbImage(inputStream, metadata.getSize(),
-                    metadata.getExt(), null);
-        } else {
-            storePath = storageClient.uploadFile(inputStream, metadata.getSize(),
-                    metadata.getExt(), null);
-        }
+        StorePath storePath = storageClient.uploadFile(inputStream, metadata.getSize(),
+                metadata.getExt(), null);
         return storePath.getFullPath();
     }
 

frontend/wechat-web/src/modules/hiPages/approvel/Approvel.js

@@ -114,16 +114,18 @@ class Approvel extends Component {
                 height={this.state.height}>
                 <Skeleton loading={this.state.isMyapplyding} active paragraph={{rows: 3}}>
                     {
+                        this.state.applyList.length > 0 ?
                         this.state.applyList.map((itemdata,index) =>
                             <ApprovelItem itemdata={itemdata} isMyApply={true}   index={index} onItemClick={this.onItemClick.bind(this)}/>
-                        )
+                        ) :
+                            <List dataSource={this.state.applyList}
+                                  renderItem={(applyListBean,index) => (
+                                      <List.Item>
+                                          <ApprovelItem itemdata={applyListBean} isMyApply={true}   index={index} onItemClick={this.onItemClick.bind(this)}/>
+                                      </List.Item>
+                                  )}/>
                     }
-                    {/*<List dataSource={this.state.applyList}*/}
-                          {/*renderItem={(applyListBean,index) => (*/}
-                              {/*<List.Item>*/}
-                                  {/*<ApprovelItem itemdata={applyListBean} isMyApply={true}   index={index} onItemClick={this.onItemClick.bind(this)}/>*/}
-                              {/*</List.Item>*/}
-                          {/*)}/>*/}
+
                 </Skeleton>
             </RefreshLayout>
 
@@ -137,16 +139,18 @@ class Approvel extends Component {
                 height={this.state.height}>
                 <Skeleton loading={this.state.isMyapprovedload} active paragraph={{rows: 3}}>
                     {
+                        this.state.approvelList.length > 0 ?
                         this.state.approvelList.map((itemdata,index) =>
                             <ApprovelItem itemdata={itemdata}isMyApply={false}  index={index} onItemClick={this.onItemClick.bind(this)}/>
-                        )
+                        ) :
+                        <List dataSource={this.state.approvelList}
+                        renderItem={(approvelListBean,index) => (
+                        <List.Item>
+                            <ApprovelItem itemdata={approvelListBean}isMyApply={false}  index={index} onItemClick={this.onItemClick.bind(this)}/>
+                        </List.Item>
+                    )}/>
                     }
-                    {/*<List dataSource={this.state.approvelList}*/}
-                          {/*renderItem={(approvelListBean,index) => (*/}
-                              {/*<List.Item>*/}
-                                  {/*<ApprovelItem itemdata={approvelListBean}isMyApply={false}  index={index} onItemClick={this.onItemClick.bind(this)}/>*/}
-                              {/*</List.Item>*/}
-                          {/*)}/>*/}
+
                 </Skeleton>
             </RefreshLayout>
 

frontend/wechat-web/src/modules/leave/LeaveListPage.js

@@ -68,28 +68,29 @@ class LeaveListPage extends React.Component{
 
     render(){
         return <div   style={{background: '#F2F2F2'}}>
-            {
-                this.state.data.length > 0 ?
+
                     <RefreshLayout
                         refreshing={this.state.isRefreshing}
                         ref={el => {
                             this.container = el
                         }}
                         onRefresh={this.getListData}>
+                        {
+                            this.state.data.length > 0 ?
+                                this.state.data.map((itemdata,index) =>  <LeaveItem itemdata={itemdata} role={this.state.role} index = {index} onItemClick={this.onItemClick.bind(this)}></LeaveItem>)
+                                :
+                                <List dataSource={this.state.data}
+                                      renderItem={(itemdata,index) =>(
+                                          <List.Item  >
+                                              <LeaveItem itemdata={itemdata} role={this.state.role} index = {index} onItemClick={this.onItemClick.bind(this)}></LeaveItem>
+                                          </List.Item>
+                                      )}/>
+                        }
                         <Skeleton loading={this.state.isLoading} active paragraph={{rows: 3}}>
                             {this.state.data.map((itemdata,index) =>  <LeaveItem itemdata={itemdata} role={this.state.role} index = {index} onItemClick={this.onItemClick.bind(this)}></LeaveItem>
                             )}
-                            {/*  <List dataSource={this.state.data}
-                                  renderItem={(itemdata,index) =>(
-                                      <List.Item  >
-                                          <LeaveItem itemdata={itemdata} role={this.state.role} index = {index} onItemClick={this.onItemClick.bind(this)}></LeaveItem>
-                                      </List.Item>
-                                  )}/>*/}
                         </Skeleton>
                     </RefreshLayout>
-                    :
-                    <div className="no_data"><img src={nodata_img} alt="" style={{width:'100%',height:'100%'}}/></div>
-            }
 
                     {
                         this.state.role=="teacher"?(""):(<Icon type="plus-circle" theme='filled' className='common-add-icon'
@@ -173,6 +174,7 @@ class LeaveListPage extends React.Component{
                 }
                 this.setState({
                     data: this.state.data,
+                    // data:[],
                     isRefreshing: false,
                     isLoading: false
                 })