Merge remote-tracking branch 'origin/dev' into feature-cloud

applications/device/device-server/src/main/java/com/usoftchina/smartschool/device/service/impl/AccessControlServiceImpl.java

@@ -8,6 +8,7 @@ import com.usoftchina.smartschool.device.po.AccessControlRecord;
 import com.usoftchina.smartschool.device.po.StudentInfo;
 import com.usoftchina.smartschool.device.service.AccessControlService;
 import com.usoftchina.smartschool.file.api.FileApi;
+import com.usoftchina.smartschool.file.api.util.ByteArrayMultipartFile;
 import com.usoftchina.smartschool.file.dto.FileInfoDTO;
 import com.usoftchina.smartschool.file.dto.ImageFile;
 import com.usoftchina.smartschool.utils.DateUtils;
@@ -75,8 +76,8 @@ public class AccessControlServiceImpl implements AccessControlService{
             ImageFile file = new ImageFile(information.get(0).getStuName(), imageData);
             Result<FileInfoDTO> fileInfo = null;
             try {
-                fileInfo = fileApi.imageUpload(file);
-                filePath = fileInfo.getData().getFullPath();
+                fileInfo = fileApi.upload(0L, new ByteArrayMultipartFile("file", information.get(0).getStuName() + ".jpg", "application/jpeg", imageData));
+                filePath = fileInfo.getData().getAccessPath();
             }catch (Exception ex) {
                 logger.error(ex.getMessage());
             }

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

@@ -140,6 +140,7 @@ public class GradeServiceImpl implements GradeService{
                            detail.setGrade_id(grade_id);
                            detail.setClazz_status(1);
                            detail.setClazz_grade(grade.getGrade_name());
+                           detail.setSchool_id(schoolId);
                            detail.setClazz_nickname(grade.getGrade_name() + detail.getClazz_name());
                            clazzes.add(detail);
                         }

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

@@ -63,6 +63,7 @@ public class StudentServiceImpl implements StudentService{
         }
         SysStudent student = sysStudentMapper.selectByPrimaryKey(id);
         List<SysParents> parents = sysStudentMapper.selectParent(id);
+
         StudentForm studentForm = new StudentForm();
         studentForm.setMain(student);
         studentForm.setItems(parents);

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

@@ -144,11 +144,11 @@ public class TeacherServiceImpl implements TeacherService{
                             throw new BizException(BizExceptionCode.ILLEGAL_Gender);
                         }
 
-                        if ("已婚".equals(json.get("teacher_marriage"))) {
+                        if ("未婚".equals(json.get("teacher_marriage"))) {
                             json.put("teacher_marriage", 0);
-                        }else if ("未婚".equals(json.get("teacher_marriage"))) {
+                        }else if ("已婚".equals(json.get("teacher_marriage"))) {
                             json.put("teacher_marriage", 1);
-                        }else if (!"已婚".equals(json.get("teacher_marriage")) && !"未婚".equals(json.get("teacher_marriage"))) {
+                        }else if (!"未婚".equals(json.get("teacher_marriage")) && !"已婚".equals(json.get("teacher_marriage"))) {
                             throw new BizException(BizExceptionCode.ILLEGAL_MARRIAGE);
                         }
                     }

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

@@ -51,6 +51,9 @@ public class OutInRecordDO implements Serializable {
 	private String gradeClazz;
 	//学生性别 1男  2女
 	private Integer stuSex;
-
+	//类别    1: 入校  2: 出校  0：其他
+    private int recordType;
+	//出入校时间
+    private Date recordDate;
 
 }

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

@@ -4,7 +4,7 @@
 <mapper namespace="com.usoftchina.smartschool.school.wxschool.mapper.WxOutInRecordMapper">
 
     <sql id="OutInRecordVo">
-    select `record_id`,`record_name`,`out_date`,`in_date`,`record_details`,`record_remarks`,`stu_id`,`school_id`,`device_id`,`stu_number`,`stu_name`,`grade_id`,`grade_name`,`clazz_id`,`clazz_name`,`grade_clazz`,`stu_sex` from out_in_record
+    select `record_id`,`record_name`,`out_date`,`in_date`,`record_details`,`record_remarks`,`stu_id`,`school_id`,`device_id`,`stu_number`,`stu_name`,`grade_id`,`grade_name`,`clazz_id`,`clazz_name`,`grade_clazz`,`stu_sex`,`record_type`,`record_date` from out_in_record
     </sql>
 
 	<select id="get" resultType="com.usoftchina.smartschool.school.po.OutInRecordDO">

frontend/pc-web/app/view/basic/staff/StaffDetail.js

@@ -74,7 +74,7 @@ Ext.define('school.view.basic.staff.StaffDetail', {
                 editable: false,
                 store: Ext.create('Ext.data.ArrayStore', {
                     fields: ['name', 'value'],
-                    data: [['未婚', 0], ['已婚', 1], ['离异', -1]]
+                    data: [['未婚', 0], ['已婚', 1]]
                 }),
                 minChars: 0,
                 queryMode: 'local'

frontend/wechat-web/src/modules/hiPages/access-notice/AccessNotice.js

@@ -40,6 +40,7 @@ class AccessNotice extends Component {
         })
         fetchPost(API.RecordOutgoingList, {
             stuId: stuId,
+            // stuId:10138,
             pageIndex: 1,
             pageSize: 10
         }).then((response) => {