Merge branches 'dev' and 'master' of ssh://10.10.100.21/source/smartschool-platform into dev

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

@@ -19,9 +19,17 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 @ServletComponentScan
 @EnableEurekaClient
 @EnableFeignClients("com.usoftchina.smartschool")
-public class SchoolApplication {
+public class SchoolApplication extends WebMvcConfigurerAdapter{
     public static void main(String[] args) {
         SpringApplication.run(SchoolApplication.class, args);
     }
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
 
+        registry.addMapping("/**")
+                .allowCredentials(true)
+                .allowedHeaders("*")
+                .allowedOrigins("*")
+                .allowedMethods("*");
+    }
 }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/controller/GradeController.java

@@ -33,6 +33,11 @@ public class GradeController {
         return Result.success(school);
     }
 
-
+    //导入保存至列表
+    @RequestMapping("/saveToFormal")
+    public Result saveToFormal(Integer id, boolean update) {
+        gradeService.saveToFormal(id, update);
+        return Result.success();
+    }
 
 }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/controller/StudentController.java

@@ -34,7 +34,6 @@ public class StudentController {
         return Result.success(student);
     }
 
-
     @RequestMapping("/read/{id}")
     public Result getFormData(@PathVariable("id") Long id) {
          StudentForm formData = studentService.getFormData(id);
@@ -47,6 +46,10 @@ public class StudentController {
         return Result.success(formData);
     }
 
-
-
+    //导入保存至列表
+    @RequestMapping("/saveToFormal")
+    public Result saveToFormal(Integer id, boolean update) {
+        studentService.saveToFormal(id, update);
+        return Result.success();
+    }
 }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/controller/TeacherController.java

@@ -45,4 +45,11 @@ public class TeacherController {
         DocBaseDTO formData = teacherService.saveFormData(teacher);
         return Result.success(formData);
     }
+
+    //导入保存至列表
+    @RequestMapping("/saveToFormal")
+    public Result saveToFormal(Integer id, boolean update) {
+        teacherService.saveToFormal(id, update);
+        return Result.success();
+    }
 }

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

@@ -5,4 +5,6 @@ import com.usoftchina.smartschool.school.po.TreeNode;
 
 public interface GradeService {
     TreeNode getSchoolTree(Long id);
+
+    void saveToFormal(Integer id, boolean update);
 }

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

@@ -13,4 +13,6 @@ public interface StudentService {
     StudentForm getFormData(Long id);
 
     DocBaseDTO saveFormData(StudentForm form);
+
+    void saveToFormal(Integer id, boolean update);
 }

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

@@ -13,4 +13,6 @@ public interface TeacherService {
     TeacherForm getFormData(Long id);
 
     DocBaseDTO saveFormData(SysTeacher teacher);
+
+    void saveToFormal(Integer id, boolean update);
 }

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

@@ -1,17 +1,24 @@
 package com.usoftchina.smartschool.school.basic.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.usoftchina.smartschool.context.BaseContextHolder;
 import com.usoftchina.smartschool.exception.BizException;
 import com.usoftchina.smartschool.school.basic.service.GradeService;
 import com.usoftchina.smartschool.school.exception.BizExceptionCode;
+import com.usoftchina.smartschool.school.mapper.DataImportMapper;
 import com.usoftchina.smartschool.school.mapper.SysClazzMapper;
 import com.usoftchina.smartschool.school.mapper.SysGradeMapper;
 import com.usoftchina.smartschool.school.mapper.SysSchoolMapper;
 import com.usoftchina.smartschool.school.po.*;
+import com.usoftchina.smartschool.utils.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author: guq
@@ -29,6 +36,9 @@ public class GradeServiceImpl implements GradeService{
     @Autowired
     private SysClazzMapper sysClazzMapper;
 
+    @Autowired
+    private DataImportMapper dataImportMapper;
+
     @Override
     public TreeNode getSchoolTree(Long id) {
         if (null == id || "0".equals(id)) {
@@ -70,11 +80,71 @@ public class GradeServiceImpl implements GradeService{
                 }
                 gradeNode.setChildren(classesTree);
                 gradesTree.add(gradeNode);
-                //grade.setChildren(classes);
             }
         }
         schoolTree.setChildren(gradesTree);
-        //school.setChildren(grades);
         return schoolTree;
     }
+
+    @Override
+    @Transactional
+    public void saveToFormal(Integer id, boolean update) {
+        if (null == id || "0".equals(id)) {
+            return;
+        }
+        Long schoolId = BaseContextHolder.getSchoolId();
+        StringBuilder err = new StringBuilder();
+        List<DataImportDetail> details = dataImportMapper.selectDataById(id);
+        List<SysClazz> clazzes = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(details)) {
+            Map<String, List<DataImportDetail>> datas = CollectionUtils.groupBy(details, DataImportDetail::getDd_codevalue);
+            for (String code : datas.keySet()) {
+                Long grade_id = null;
+                SysGrade grade = sysGradeMapper.selectByName(code, schoolId);
+                List<DataImportDetail> data = datas.get(code);
+                DataImportDetail main = dataImportMapper.selectMainBycode(code, id, schoolId);
+                //数据验证
+                if (StringUtils.isEmpty(main)) {
+                    throw new BizException(BizExceptionCode.USELESS_DATA);
+                }
+                SysGrade sysGrade = JSONObject.parseObject(main.getDd_maindata(), SysGrade.class);
+
+                //年纪不存在
+                if (null == grade) {
+                    sysGrade.setSchool_id(schoolId);
+                    sysGrade.setGrade_status(1);
+                    sysGradeMapper.insertSelective(sysGrade);
+                    grade_id = sysGrade.getGrade_id();
+                    //年纪存在、需要更新
+                } else if (update){
+                    grade.setSchool_id(schoolId);
+                    grade.setGrade_status(1);
+                    sysGradeMapper.updateByPrimaryKeySelective(grade);
+                    grade_id = grade.getGrade_id();
+                    //年纪存在、不需要处理
+                } else {
+                    continue;
+                }
+                //添加从表
+                if (data.size() > 0) {
+                    for (DataImportDetail dataDetail : data) {
+                        SysClazz detail = JSONObject.parseObject(dataDetail.getDd_detaildata(), SysClazz.class);
+                        if (null != detail) {
+                           detail.setGrade_id(grade_id);
+                           detail.setClazz_status(1);
+                           clazzes.add(detail);
+                        }
+                    }
+                }
+            }
+            if (err.length() > 0) {
+                dataImportMapper.updateDataImportError(err.toString(), id);
+                throw new BizException(12345, err.toString());
+            }
+            for (SysClazz  cla : clazzes) {
+                sysClazzMapper.insertSelective(cla);
+            }
+            dataImportMapper.updateDataImport(id);
+        }
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.usoftchina.smartschool.school.basic.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.smartschool.context.BaseContextHolder;
@@ -9,17 +10,19 @@ import com.usoftchina.smartschool.school.basic.service.StudentService;
 import com.usoftchina.smartschool.school.dto.DocBaseDTO;
 import com.usoftchina.smartschool.school.dto.ListReqDTO;
 import com.usoftchina.smartschool.school.exception.BizExceptionCode;
+import com.usoftchina.smartschool.school.mapper.DataImportMapper;
 import com.usoftchina.smartschool.school.mapper.SysStudentMapper;
-import com.usoftchina.smartschool.school.po.StudentForm;
-import com.usoftchina.smartschool.school.po.SysParents;
-import com.usoftchina.smartschool.school.po.SysStudent;
+import com.usoftchina.smartschool.school.po.*;
+import com.usoftchina.smartschool.utils.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author: guq
@@ -31,6 +34,9 @@ public class StudentServiceImpl implements StudentService{
     @Autowired
     private SysStudentMapper sysStudentMapper;
 
+    @Autowired
+    private DataImportMapper dataImportMapper;
+
     @Override
     public PageInfo<SysStudent> getListData(PageRequest page, ListReqDTO listReqDTO) {
         PageHelper.startPage(page.getNumber(), page.getSize());
@@ -120,4 +126,85 @@ public class StudentServiceImpl implements StudentService{
 
         return null;
     }
+
+    @Override
+    @Transactional
+    public void saveToFormal(Integer id, boolean update) {
+        if (null == id || "0".equals(id)) {
+            return;
+        }
+        Long schoolId = BaseContextHolder.getSchoolId();
+        StringBuilder err = new StringBuilder();
+        List<DataImportDetail> details = dataImportMapper.selectDataById(id);
+        JSONObject json = null;
+        if (!CollectionUtils.isEmpty(details)) {
+            Map<String, List<DataImportDetail>> datas = CollectionUtils.groupBy(details, DataImportDetail::getDd_codevalue);
+            for (String code : datas.keySet()) {
+                Long stu_id = null;
+                SysStudent student = sysStudentMapper.selectByCode(code, schoolId);
+                List<DataImportDetail> data = datas.get(code);
+                DataImportDetail main = dataImportMapper.selectMainBycode(code, id, schoolId);
+                //数据验证
+                if (StringUtils.isEmpty(main)) {
+                    throw new BizException(BizExceptionCode.USELESS_DATA);
+                }
+                //转换字段
+                json = JSONObject.parseObject(main.getDd_maindata());
+                if (null != json) {
+                    if ("男".equals(json.get("stu_sex"))) {
+                        json.put("stu_sex", 1);
+                    }else if ("女".equals(json.get("stu_sex"))) {
+                        json.put("stu_sex", 2);
+                    };
+                }
+
+                SysStudent stu = JSONObject.parseObject(json.toJSONString(), SysStudent.class);
+
+                //学生不存在
+                if (null == student) {
+                    stu.setSchool_id(schoolId);
+                    stu.setStu_status(1);
+                    sysStudentMapper.insertSelective(stu);
+                    stu_id = stu.getStu_id();
+                    //学生存在、需要更新
+                } else if (update){
+                    student.setSchool_id(schoolId);
+                    student.setStu_status(1);
+                    sysStudentMapper.updateByPrimaryKeySelective(student);
+                    stu_id = student.getStu_id();
+                    //年纪存在、不需要处理
+                } else {
+                    continue;
+                }
+                //添加从表
+                if (data.size() > 0) {
+                    for (DataImportDetail dataDetail : data) {
+                        StudentRelation detail = JSONObject.parseObject(dataDetail.getDd_detaildata(), StudentRelation.class);
+                        if (null != detail) {
+                            //保证家长已经插入
+                            SysParents parent = sysStudentMapper.selectParentByPhone(detail.getPa_phone(), schoolId);
+                            if (null == parent) {
+                                parent = new SysParents();
+                                parent.setSchool_id(schoolId);
+                                parent.setParents_name(detail.getParents_name());
+                                parent.setPa_phone(detail.getPa_phone());
+                                parent.setParents_status(1);
+                                sysStudentMapper.insertparent(parent);
+                            }
+                            //插入学生与父母的关系
+                            sysStudentMapper.insertrelationDetail(stu_id, parent.getParent_id(), detail.getPs_relation());
+                        }
+                    }
+                }
+            }
+           /* if (err.length() > 0) {
+                dataImportMapper.updateDataImportError(err.toString(), id);
+                throw new BizException(12345, err.toString());
+            }
+            for (SysClazz  cla : clazzes) {
+                sysClazzMapper.insertSelective(cla);
+            }*/
+            dataImportMapper.updateDataImport(id);
+        }
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.usoftchina.smartschool.school.basic.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.smartschool.context.BaseContextHolder;
@@ -9,15 +10,18 @@ import com.usoftchina.smartschool.school.basic.service.TeacherService;
 import com.usoftchina.smartschool.school.dto.DocBaseDTO;
 import com.usoftchina.smartschool.school.dto.ListReqDTO;
 import com.usoftchina.smartschool.school.exception.BizExceptionCode;
+import com.usoftchina.smartschool.school.mapper.DataImportMapper;
 import com.usoftchina.smartschool.school.mapper.SysTeacherMapper;
-import com.usoftchina.smartschool.school.po.SysTeacher;
-import com.usoftchina.smartschool.school.po.TeacherDetail;
-import com.usoftchina.smartschool.school.po.TeacherForm;
+import com.usoftchina.smartschool.school.po.*;
+import com.usoftchina.smartschool.utils.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author: guq
@@ -29,6 +33,9 @@ public class TeacherServiceImpl implements TeacherService{
     @Autowired
     private SysTeacherMapper sysTeacherMapper;
 
+    @Autowired
+    private DataImportMapper dataImportMapper;
+
     @Override
     public PageInfo<SysTeacher> getListData(PageRequest page, ListReqDTO listReqDTO) {
         PageHelper.startPage(page.getNumber(), page.getSize());
@@ -64,6 +71,7 @@ public class TeacherServiceImpl implements TeacherService{
         }
         Long school_id = BaseContextHolder.getSchoolId();
         formdata.setSchool_id(school_id);
+        formdata.setTeacher_status(1);
         //新增教师
         if (StringUtils.isEmpty(formdata.getSchool_id()) || "0".equals(formdata.getSchool_id().toString())) {
             sysTeacherMapper.insertSelective(formdata);
@@ -75,4 +83,47 @@ public class TeacherServiceImpl implements TeacherService{
         return new DocBaseDTO(formdata.getTeacher_id(), null, null);
     }
 
+    @Override
+    @Transactional
+    public void saveToFormal(Integer id, boolean update) {
+        if (null == id || "0".equals(id)) {
+            return;
+        }
+        Long schoolId = BaseContextHolder.getSchoolId();
+        List<DataImportDetail> details = dataImportMapper.selectDataById(id);
+        List<SysTeacher> teachers = new ArrayList<>();
+        SysTeacher teacher =null;
+        JSONObject json = null;
+        if (!CollectionUtils.isEmpty(details) && details.size() > 0) {
+            for(DataImportDetail detail : details) {
+                String phone = detail.getDd_codevalue();
+                 teacher = sysTeacherMapper.selectByPhone(phone, schoolId);
+                //老师不存在
+                if (null == teacher) {
+                    json = JSONObject.parseObject(detail.getDd_maindata());
+                    if (null != json) {
+                        if ("男".equals(json.get("teacher_sex"))) {
+                            json.put("teacher_sex", 1);
+                        }else if ("女".equals(json.get("teacher_sex"))) {
+                            json.put("teacher_sex", 2);
+                        };
+                    }
+                    teacher = JSONObject.parseObject(json.toJSONString(), SysTeacher.class);
+                    teacher.setSchool_id(schoolId);
+                    teacher.setTeacher_status(1);
+                    sysTeacherMapper.insertSelective(teacher);
+                    //年纪存在、需要更新
+                } else if (update){
+                    teacher.setSchool_id(schoolId);
+                    teacher.setTeacher_status(1);
+                    sysTeacherMapper.updateByPrimaryKeySelective(teacher);
+                    //年纪存在、不需要处理
+                } else {
+                    continue;
+                }
+            }
+            dataImportMapper.updateDataImport(id);
+        }
+    }
+
 }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/mapper/DataImportMapper.java

@@ -5,6 +5,8 @@ import com.usoftchina.smartschool.school.po.DataImportDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface DataImportMapper {
     void deleteByCaller(@Param("caller") String caller, @Param("companyid") Long companyid);
@@ -19,4 +21,12 @@ public interface DataImportMapper {
     void deleteDetailByIds(String ids);
 
     void insertDetailSelective(DataImportDetail dd);
+
+    List<DataImportDetail> selectDataById(Integer id);
+
+    DataImportDetail selectMainBycode(@Param("code") String code, @Param("id") int id, @Param("school_id") Long school_id);
+
+    void updateDataImportError(@Param("err") String err,@Param("id") int id);
+
+    void updateDataImport(Integer id);
 }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/mapper/SysGradeMapper.java

@@ -2,6 +2,7 @@ package com.usoftchina.smartschool.school.mapper;
 
 import com.usoftchina.smartschool.school.po.SysGrade;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -20,4 +21,6 @@ public interface SysGradeMapper {
     int updateByPrimaryKey(SysGrade record);
 
     List<SysGrade> selectBySchool(Long id);
+
+    SysGrade selectByName(@Param("grade") String grade, @Param("school_id") Long school_id);
 }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/mapper/SysStudentMapper.java

@@ -32,4 +32,10 @@ public interface SysStudentMapper {
     void updateParents(List<SysParents> updateDetails);
 
     void updateRelation(@Param("parent_id") Long parent_id, @Param("id") Long id, @Param("relation") String relation);
+
+    SysStudent selectByCode(@Param("code") String code, @Param("schoolId") Long schoolId);
+
+    SysParents selectParentByPhone(@Param("phone") String phone, @Param("schoolId") Long schoolId );
+
+    void insertrelationDetail(@Param("id") Long id, @Param("pr_id") Long pr_id, @Param("relation") String relation);
 }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/mapper/SysTeacherMapper.java

@@ -26,4 +26,6 @@ public interface SysTeacherMapper {
     List<SysTeacher> selectByConditon(@Param("con") String con, @Param("schoolId") Long schoolId);
 
     List<TeacherDetail> selectDetail(Long id);
+
+    SysTeacher selectByPhone(@Param("phone") String phone, @Param("school_id") Long school_id);
 }

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

@@ -0,0 +1,134 @@
+package com.usoftchina.smartschool.school.po;
+
+public enum Status {
+    /**
+     * 在录入
+     */
+    UNAUDITED("未审核"),
+
+    /**
+     * 已关闭
+     */
+    CLOSE("已关闭"),
+
+    /**
+     * 已开启
+     */
+    OPEN("已开启"),
+
+
+    /**
+     * 已禁用
+     */
+    BANNED("已禁用"),
+
+    /**
+     * 已启用
+     */
+    ENABLE("已启用"),
+
+    /**
+     * 已审核
+     */
+    AUDITED("已审核"),
+
+    /**
+     * 未入库
+     */
+    UNTURNIN("未入库"),
+
+    /**
+     * 部分入库
+     */
+    PART2IN("部分入库"),
+
+    /**
+     * 已入库
+     */
+    TURNIN("已入库"),
+
+    /**
+     * 部分出库
+     */
+    PARTOUT("部分出库"),
+
+    /**
+     * 已出库
+     */
+    TURNOUT("已出库"),
+
+    /**
+     * 未出库
+     */
+    UNTURNOUT("未出库"),
+
+    /**
+     *未收款
+     */
+    RECNONE("未收款"),
+
+    /**
+     * 部分收款
+     */
+    RECPART("部分收款"),
+
+
+    /**
+     * 已收款
+     */
+    RECALL("已收款"),
+
+
+    /**
+     * 未付款
+     */
+    PAYNONE("未付款"),
+
+
+    /**
+     * 部分付款
+     */
+    PAYPART("部分付款"),
+
+    /**
+     * 未确认
+     */
+    UNCONFIRM("未确认"),
+
+    /**
+     * 确认
+     */
+    CONFIRMED("已确认"),
+
+    /**
+     * 确认
+     */
+    REJECT("不同意"),
+
+    /**
+     * 未上传
+     */
+    UNSEND("未上传"),
+
+    /**
+     * 已上传
+     */
+    SENDED("已上传"),
+
+
+    /**
+     * 已付款
+     */
+    PAYALL("已付款")
+    ;
+
+
+    private String display;
+    private Status(String display){
+        this.display = display;
+    }
+
+    public String getDisplay(){
+        return display;
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.usoftchina.smartschool.school.po;
+
+import java.io.Serializable;
+
+/**
+ * @author: guq
+ * @create: 2019-01-29 15:26
+ **/
+public class StudentRelation implements Serializable{
+    private String parents_name;
+    private String pa_phone;
+    private String ps_relation;
+
+    public String getParents_name() {
+        return parents_name;
+    }
+
+    public void setParents_name(String parents_name) {
+        this.parents_name = parents_name;
+    }
+
+    public String getPa_phone() {
+        return pa_phone;
+    }
+
+    public void setPa_phone(String pa_phone) {
+        this.pa_phone = pa_phone;
+    }
+
+    public String getPs_relation() {
+        return ps_relation;
+    }
+
+    public void setPs_relation(String ps_relation) {
+        this.ps_relation = ps_relation;
+    }
+}

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

@@ -38,6 +38,16 @@ public class SysParents {
 
     private String pr_relation;
 
+    private String pa_phone;
+
+    public String getPa_phone() {
+        return pa_phone;
+    }
+
+    public void setPa_phone(String pa_phone) {
+        this.pa_phone = pa_phone;
+    }
+
     public String getPr_relation() {
         return pr_relation;
     }

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

@@ -40,6 +40,56 @@ public class SysTeacher {
 
     private String teacher_experience;
 
+    private String teacher_phone;
+
+    private String teacher_email;
+
+    private String teacher_nation;
+
+    private String teacher_school;
+
+    private String teacher_education;
+
+    public String getTeacher_phone() {
+        return teacher_phone;
+    }
+
+    public void setTeacher_phone(String teacher_phone) {
+        this.teacher_phone = teacher_phone;
+    }
+
+    public String getTeacher_email() {
+        return teacher_email;
+    }
+
+    public void setTeacher_email(String teacher_email) {
+        this.teacher_email = teacher_email;
+    }
+
+    public String getTeacher_nation() {
+        return teacher_nation;
+    }
+
+    public void setTeacher_nation(String teacher_nation) {
+        this.teacher_nation = teacher_nation;
+    }
+
+    public String getTeacher_school() {
+        return teacher_school;
+    }
+
+    public void setTeacher_school(String teacher_school) {
+        this.teacher_school = teacher_school;
+    }
+
+    public String getTeacher_education() {
+        return teacher_education;
+    }
+
+    public void setTeacher_education(String teacher_education) {
+        this.teacher_education = teacher_education;
+    }
+
     public String getTeacher_photo() {
         return teacher_photo;
     }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/controller/WxClazzController.java

@@ -114,9 +114,9 @@ public class WxClazzController {
 	 * @return
 	 */
 	@PostMapping("/getAllTeacherBySchool")
-	public ResultBean getAllTeacherBySchool(@Param("teacherId") Long teacherId, @Param("selectKey") String selectKey){
+	public ResultBean getAllTeacherBySchool(@Param("teacherId") Long teacherId, @Param("selectKey") String selectKey,@Param("pageSize") Integer pageSize,@Param("pageIndex") Integer pageIndex){
 		try {
-			List<TeacherDO> teacher = clazzService.getAllTeacherBySchool(teacherId, selectKey);
+			List<TeacherDO> teacher = clazzService.getAllTeacherBySchool(teacherId, selectKey,pageSize,pageIndex);
 			return new ResultBean(teacher);
 		}catch (Exception e){
 			return new ResultBean(e);

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

@@ -60,5 +60,5 @@ public interface WxClazzService {
 	 * @param selectKey
 	 * @return
 	 */
-	public List<TeacherDO> getAllTeacherBySchool(@Param("teacherId") Long teacherId, @Param("selectKey") String selectKey);
+	public List<TeacherDO> getAllTeacherBySchool(@Param("teacherId") Long teacherId, @Param("selectKey") String selectKey,@Param("pageSize") Integer pageSize,@Param("pageIndex") Integer pageIndex);
 }

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

@@ -169,9 +169,10 @@ public class WxClazzServiceImpl implements WxClazzService {
 	 * @param selectKey
 	 * @return
 	 */
-	public List<TeacherDO> getAllTeacherBySchool(Long teacherId, String selectKey){
+	public List<TeacherDO> getAllTeacherBySchool(Long teacherId, String selectKey,Integer pageSize,Integer pageIndex){
 		TeacherDO teacherDO = teacherMapper.get(teacherId);
-		List<TeacherDO> teacherDOS = teacherMapper.getAll(teacherDO.getSchoolId(),"%"+selectKey+"%");
+		Integer pageStart = (pageIndex - 1) * pageSize;
+		List<TeacherDO> teacherDOS = teacherMapper.getAll(teacherDO.getSchoolId(),"%"+selectKey+"%",pageStart,pageSize);
 		for (TeacherDO tc:teacherDOS) {
 			tc.setUserPhone(userMapper.get(tc.getUserId()).getUserPhone());
 		}

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

@@ -45,6 +45,9 @@ public class WxTaskNotifyServiceImpl implements WxTaskNotifyService {
 	@Autowired
 	private WxParentsStuMapper wxParentsStuMapper;
 
+	@Autowired
+	private WxSubjectMapper wxSubjectMapper;
+
 	/**
 	 * 发布作业
 	 * @param taskString
@@ -61,7 +64,8 @@ public class WxTaskNotifyServiceImpl implements WxTaskNotifyService {
 		taskNotifyDO.setTaskCreator(taskCreator);
 		Long schoolId = teacherMapper.get(taskCreator).getSchoolId();
 		taskNotifyDO.setSchoolId(schoolId);
-		taskNotifyDO.setSubjectId(json.getLong("subjectId"));
+		Long subjectId = json.getLong("subjectId");
+		taskNotifyDO.setSubjectId(subjectId);
 		taskNotifyDO.setTaskFiles(json.getString("taskFiles"));
 		taskNotifyDO.setTaskStatus(json.getInteger("taskStatus"));
 		taskNotifyDO.setCreateDate(new Date());
@@ -82,7 +86,7 @@ public class WxTaskNotifyServiceImpl implements WxTaskNotifyService {
 					if (parentsStuDOS.size()>0){
 						for (ParentsStuDO ps:parentsStuDOS) {
 							ParentsDO parentsDO = parentsMapper.get(ps.getParentId());
-							wxPushApi.wxPush(schoolDO.getSchoolAppid(),schoolDO.getSchoolSecret(),parentsDO.getOpenid(), "WwKtiHd4lso9axuavfLdpHIVbzTiopOTyh_uCsL3ZI8",taskTitle,"-",format.format(new Date()), taskContext,"-", "点击查看详情", "");
+							wxPushApi.wxPush(schoolDO.getSchoolAppid(),schoolDO.getSchoolSecret(),parentsDO.getOpenid(), "WwKtiHd4lso9axuavfLdpHIVbzTiopOTyh_uCsL3ZI8",taskTitle,wxSubjectMapper.get(subjectId).getSubjectName(),format.format(new Date()), taskContext,"-", "点击查看详情", "");
 						}
 						}
 					}

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

@@ -54,7 +54,7 @@ public class WxUserServiceImpl implements WxUserService {
 	 * @return
 	 */
 	public SendSmsResponse sendCode(String userPhone) throws Exception {
-		System.err.println(userPhone);
+		//System.err.println(userPhone);
 		UserDO user = userMapper.selectUserByPhone(userPhone);
 		if (ObjectUtils.isNotEmpty(user)){
 			String vcode = SendMsgUtil.createRandomVcode(CodeConfig.getCodeNumber());

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/mapper/WxTeacherMapper.java

@@ -37,5 +37,5 @@ public interface WxTeacherMapper {
 	List<TeacherDO> getByClazzId(@Param("clazzId") Long clazzId, @Param("teacherName") String teacherName);
 
 
-	List<TeacherDO> getAll(@Param("schoolId") Long schoolId, @Param("teacherName") String teacherName);
+	List<TeacherDO> getAll(@Param("schoolId") Long schoolId, @Param("teacherName") String teacherName,@Param("pageStart")Integer pageStart,@Param("pageSize")Integer pageSize);
 }

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

@@ -148,4 +148,36 @@
       </if>
     </trim>
   </insert>
+
+  <select id="selectDataById" resultMap="DetailMap">
+    select * from  data_importdetail
+    where dd_diid = #{id}
+  </select>
+
+  <resultMap id="DetailMap" type="com.usoftchina.smartschool.school.po.DataImportDetail" >
+    <id column="dd_id" property="dd_id" jdbcType="INTEGER" />
+    <result column="dd_maindata" property="dd_maindata" jdbcType="VARCHAR" />
+    <result column="dd_detno" property="dd_detno" jdbcType="INTEGER" />
+    <result column="dd_diid" property="dd_diid" jdbcType="INTEGER" />
+    <result column="dd_checked" property="dd_checked" jdbcType="INTEGER" />
+    <result column="dd_success" property="dd_success" jdbcType="INTEGER" />
+    <result column="dd_toformal" property="dd_toformal" jdbcType="INTEGER" />
+    <result column="school_id" property="school_id" jdbcType="INTEGER" />
+    <result column="dd_detaildata" property="dd_detaildata" jdbcType="VARCHAR" />
+    <result column="dd_codevalue" property="dd_codevalue" jdbcType="VARCHAR" />
+  </resultMap>
+
+
+  <select id="selectMainBycode" resultMap="DetailMap">
+    select * from  data_importdetail
+    where dd_codevalue = #{code} and dd_diid=#{id} and ifnull(dd_success,0)=0 and ifnull(dd_maindata,'')!='' and school_id=#{school_id}
+  </select>
+
+  <update id="updateDataImportError">
+    update data_import set di_toformal=1,di_result=#{err} where di_id=#{id}
+  </update>
+
+  <update id="updateDataImport" parameterType="integer">
+    update data_import set di_toformal=1,di_success=1  where di_id=#{id}
+  </update>
 </mapper>

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

@@ -34,9 +34,6 @@
   <insert id="insertSelective" parameterType="com.usoftchina.smartschool.school.po.SysClazz" >
     insert into sys_clazz
     <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="clazz_id != null" >
-        clazz_id,
-      </if>
       <if test="clazz_name != null" >
         clazz_name,
       </if>
@@ -54,9 +51,6 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="clazz_id != null" >
-        #{clazz_id,jdbcType=BIGINT},
-      </if>
       <if test="clazz_name != null" >
         #{clazz_name,jdbcType=VARCHAR},
       </if>

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

@@ -31,11 +31,11 @@
       )
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.smartschool.school.po.SysGrade" >
+    <selectKey  resultType="java.lang.Long" keyProperty="grade_id">
+      SELECT LAST_INSERT_ID() AS ID
+    </selectKey>
     insert into sys_grade
     <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="grade_id != null" >
-        grade_id,
-      </if>
       <if test="grade_name != null" >
         grade_name,
       </if>
@@ -53,9 +53,6 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="grade_id != null" >
-        #{grade_id,jdbcType=BIGINT},
-      </if>
       <if test="grade_name != null" >
         #{grade_name,jdbcType=VARCHAR},
       </if>
@@ -106,4 +103,7 @@
   <select id="selectBySchool" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select * from sys_grade where school_id = #{id}
   </select>
+  <select id="selectByName" resultMap="BaseResultMap">
+    select * from sys_grade where grade_name=#{grade} and school_id=#{school_id}
+  </select>
 </mapper>

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

@@ -334,8 +334,19 @@
     </foreach>
   </update>
 
-
   <update id="updateRelation">
     update sys_parents_stu set ps_relation=#{relation} where parent_id=#{parent_id} and stu_id =#{id}
   </update>
+
+  <select id="selectByCode" resultMap="BaseResultMap">
+    select * from sys_student where stu_number=#{code} and school_id=#{schoolId}
+  </select>
+
+  <select id="selectParentByPhone"  resultMap="parentMap">
+    select * from sys_parents where pa_phone=#{phone} and school_id=#{schoolId}
+  </select>
+
+  <insert id="insertrelationDetail">
+     insert into sys_parents_stu (stu_id,parent_id,ps_relation) VALUES (#{id},#{pr_id},#{relation})
+  </insert>
 </mapper>

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

@@ -16,6 +16,11 @@
     <result column="teacher_entry" property="teacher_entry" jdbcType="DATE" />
     <result column="teacher_honor" property="teacher_honor" jdbcType="VARCHAR" />
     <result column="teacher_remarks" property="teacher_remarks" jdbcType="VARCHAR" />
+    <result column="teacher_phone" property="teacher_phone" jdbcType="VARCHAR" />
+    <result column="teacher_email" property="teacher_email" jdbcType="VARCHAR" />
+    <result column="teacher_nation" property="teacher_nation" jdbcType="VARCHAR" />
+    <result column="teacher_school" property="teacher_school" jdbcType="VARCHAR" />
+    <result column="teacher_education" property="teacher_education" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     teacher_id, user_id, openid, school_id, teacher_number, teacher_name, teacher_sex, 
@@ -26,10 +31,7 @@
     teacher_photo, teacher_experience
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
-    select 
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
+    select *
     from sys_teacher
     where teacher_id = #{teacher_id,jdbcType=BIGINT}
   </select>
@@ -102,6 +104,21 @@
       <if test="teacher_experience != null" >
         teacher_experience,
       </if>
+      <if test="teacher_phone != null" >
+        teacher_phone,
+      </if>
+      <if test="teacher_email != null" >
+        teacher_email,
+      </if>
+      <if test="teacher_nation != null" >
+        teacher_nation,
+      </if>
+      <if test="teacher_school != null" >
+        teacher_school,
+      </if>
+      <if test="teacher_education != null" >
+        teacher_education,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="user_id != null" >
@@ -149,6 +166,21 @@
       <if test="teacher_experience != null" >
         #{teacher_experience,jdbcType=VARCHAR},
       </if>
+      <if test="teacher_phone != null" >
+        #{teacher_phone,jdbcType=VARCHAR},
+      </if>
+      <if test="teacher_email != null" >
+        #{teacher_email,jdbcType=VARCHAR},
+      </if>
+      <if test="teacher_nation != null" >
+        #{teacher_nation,jdbcType=VARCHAR},
+      </if>
+      <if test="teacher_school != null" >
+        #{teacher_school,jdbcType=VARCHAR},
+      </if>
+      <if test="teacher_education != null" >
+        #{teacher_education,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.smartschool.school.po.SysTeacher" >
@@ -199,6 +231,21 @@
       <if test="teacher_experience != null" >
         teacher_experience = #{teacher_experience,jdbcType=VARCHAR},
       </if>
+      <if test="teacher_phone != null" >
+        teacher_phone = #{teacher_phone,jdbcType=VARCHAR},
+      </if>
+      <if test="teacher_email != null" >
+        teacher_email = #{teacher_email,jdbcType=VARCHAR},
+      </if>
+      <if test="teacher_nation != null" >
+        teacher_nation = #{teacher_nation,jdbcType=VARCHAR},
+      </if>
+      <if test="teacher_school != null" >
+        teacher_school = #{teacher_school,jdbcType=VARCHAR},
+      </if>
+      <if test="teacher_education != null" >
+        teacher_education = #{teacher_education,jdbcType=VARCHAR},
+      </if>
     </set>
     where teacher_id = #{teacher_id,jdbcType=BIGINT}
   </update>
@@ -266,4 +313,7 @@ left join sys_clazz on sys_teacher_clazz.clazz_id = sys_clazz.clazz_id
 left join sys_grade on sys_grade.grade_id=sys_clazz.grade_id
 where sys_teacher_clazz.teacher_id=#{id}
   </select>
+  <select id="selectByPhone" resultMap="BaseResultMap">
+    select * from sys_teacher where teacher_phone=#{phone} and school_id=#{school_id}
+  </select>
 </mapper>

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

@@ -156,6 +156,8 @@
 			school_id = #{schoolId}
 			<if test="teacherName != null and teacherName != ''"> and teacher_name like #{teacherName} </if>
 		</where>
+		order by teacher_id desc
+		limit #{pageStart}, #{pageSize}
 	</select>
 
 

applications/wechat/wechat-api/src/main/java/com/usoftchina/smartschool/wechat/api/WxPushApi.java

@@ -2,13 +2,14 @@ package com.usoftchina.smartschool.wechat.api;
 
 
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(name = "wechat-server")
 public interface WxPushApi {
 
-    @PostMapping("/wxpush")
+    @GetMapping("/wxpush")
     public String wxPush(@RequestParam("appId")String appId, @RequestParam("secret") String secret, @RequestParam("openid") String openid, @RequestParam("templateId")String templateId,
                          @RequestParam("title")String title, @RequestParam("keyword1")String keyword1, @RequestParam("keyword2")String keyword2, @RequestParam("keyword3")String keyword3,
                          @RequestParam("keyword4")String keyword4, @RequestParam("remark")String remark, @RequestParam("url")String url);

applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/controller/WxPushController.java

@@ -3,10 +3,7 @@ package com.usoftchina.smartschool.wechat.controller;
 import com.usoftchina.smartschool.wechat.service.WxPushService;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @author: guq
@@ -18,7 +15,7 @@ public class WxPushController {
     @Autowired
     private WxPushService wxPushService;
 
-    @PostMapping("/wxpush")
+    @GetMapping("/wxpush")
     public String wxPush(String appId, String secret, String openid, String templateId, String title, String keyword1, String keyword2, String keyword3, String keyword4, String remark, String url){
         return wxPushService.wxPush(appId, secret,openid, templateId, title, keyword1, keyword2, keyword3, keyword4, remark, url);
     };

applications/wechat/wechat-server/src/main/java/com/usoftchina/smartschool/wechat/service/impl/WxPushServiceImpl.java

@@ -38,7 +38,7 @@ public class WxPushServiceImpl implements WxPushService{
                         .header("Content-Type", "application/json")
                         .send(json.getBytes());
                 String result= hRequest.body();
-                System.err.println("WxPushResult======="+result);
+                //System.err.println("WxPushResult======="+result);
 
 			/*if(JSON.parseObject(result).getInteger("errcode")==0&&JSON.parseObject(result).getString("errmsg").equals("ok")){
 				return "推送成功！";
@@ -59,7 +59,7 @@ public class WxPushServiceImpl implements WxPushService{
             params.put("grant_type", "client_credential");
             HttpRequest httpRequest= HttpRequest.get("https://api.weixin.qq.com/cgi-bin/token",params,false);
             String content=httpRequest.body();
-            System.err.println("WxPushToken======"+content);
+           // System.err.println("WxPushToken======"+content);
             return content;
         }
 }

base-servers/account/account-server/src/main/resources/config/application-docker-prod.yml

@@ -0,0 +1,7 @@
+eureka:
+  instance:
+    hostname: smartschool-account-server
+    prefer-ip-address: false
+  client:
+    serviceUrl:
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@smartschool-eureka-server:9500/eureka/

base-servers/auth/auth-server/src/main/resources/application.yml

@@ -78,7 +78,7 @@ info:
   spring-boot-version: '@spring.boot.version@'
   spring-cloud-version: '@spring.cloud.version@'
 mybatis:
-  type-aliases-package: com.usoftchina.saas.auth.po
+  type-aliases-package: com.usoftchina.smartschool.auth.po
   mapper-locations: classpath:mapper/*.xml
 auth:
   private-key: auth/pri.key

base-servers/auth/auth-server/src/main/resources/config/application-docker-prod.yml

@@ -0,0 +1,7 @@
+eureka:
+  instance:
+    hostname: smartschool-auth-server
+    prefer-ip-address: false
+  client:
+    serviceUrl:
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@smartschool-eureka-server:9500/eureka/

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

@@ -123,18 +123,14 @@ Ext.define('school.view.basic.staff.StaffDetail', {
                 allowEmpty: true,
                 showCount: false,
                 columns: [{
-                    text: '任课班级',
-                    dataIndex: 'clazz_id',
-                    hidden: true
+                    text: '任课年级',
+                    dataIndex: 'grade',
                 }, {
                     text: '任课班级',
-                    dataIndex: 'clazz_name',
-                    editor: {
-                        xtype: 'textfield'
-                    }
+                    dataIndex: 'classes'
                 }, {
                     text: '科目',
-                    dataIndex: 'kemu'
+                    dataIndex: 'subject'
                 }]
             }],
         });

frontend/pc-web/app/view/main/MainController.js

@@ -22,7 +22,7 @@ Ext.define('school.view.main.MainController', {
             10: { opacity: 0 },
             90: { opacity: 1 }
         },
-        newNavIconStyle = navCollapsed ? { marginLeft: 6, fontSize: 28 } : { marginLeft: 22, fontSize: 24 },
+        newNavIconStyle = navCollapsed ? { marginLeft: 6, fontSize: 28 } : { marginLeft: 16, fontSize: 24 },
         newNavTextStyle = navCollapsed ? { opacity: 0 } : { opacity: 1 },
         ope = navCollapsed ? 'addCls' : 'removeCls',
         toggleIconCls = navCollapsed ? 'sa-arrows-right' : 'sa-arrows-left';

frontend/pc-web/app/view/main/Navigation.scss

@@ -50,12 +50,12 @@ $menu-body-background-color: #65678C;
                                     display: flex;
     
                                     .nav-inner-icon {
+                                        display: inline;
+                                        margin-left: 16px;
+                                        margin-right: 16px;
                                         color: $nav-font-color;
                                         font-size: 24px;
                                         text-align: center;
-                                        margin-left: 22px;
-                                        display: inline;
-                                        margin-right: 16px;
     
                                         &:before {
                                             line-height: 60px;
@@ -179,6 +179,7 @@ $menu-body-background-color: #65678C;
                     margin: 6px;
                     display: flex;
                     align-content: space-between;
+                    outline: none !important;
 
                     .item-text {
                         color: #eeeef2;

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

@@ -38,7 +38,7 @@ Ext.define('school.view.viewport.ViewportController', {
     },
 
     showAuth: function() {
-        this.showMain();return;
+        // this.showMain();return;
         var me = this;
         this.showView('login');
     },
@@ -62,7 +62,8 @@ Ext.define('school.view.viewport.ViewportController', {
                     schoolStatus: res.data.school_status,
                     schoolSecret: res.data.school_secret,
                 };
-                me.getViewModel().setData(d)
+                me.getViewModel().setData(d);
+                me.getViewModel().get('store_grade').load();
             }
         })
         .catch(function(e) {

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

@@ -27,7 +27,7 @@ Ext.define('school.view.viewport.ViewportModel', {
         },
         store_grade: {
             type: 'tree',
-            autoLoad: true,
+            autoLoad: false,
             // model: 'school.model.Grade',
             fields: [{
                 name: 'text'