学生、教师、班级excel模板修改

sql/edu_update.sql

@@ -83,4 +83,9 @@ ALTER TABLE `b_teacher`
 
 
 ALTER TABLE `b_term`
-  ADD COLUMN `week`  varchar(5) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `max_sl_code`;
\ No newline at end of file
+  ADD COLUMN `week`  varchar(5) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `max_sl_code`;
+
+/*删除user表无用字段*/
+ALTER TABLE `s_user`
+  DROP COLUMN `agency_code`,
+  DROP COLUMN `is_created`;

src/main/java/org/rcisoft/business/bagency/dao/BAgencyRepository.java

@@ -55,5 +55,10 @@ public interface BAgencyRepository extends BaseMapper<BAgency> {
             + "</script>")
     @ResultMap(value = "BaseResultMap" )
     List<BAgency> queryCompanyAgency(String businessId);
+
+
+    @Select("select * from b_agency where code = #{code} and del_flag = 0 and flag = 1")
+    @ResultMap(value = "BaseResultMap" )
+    List<BAgency> queryBAgencysByCode(String code);
 }
 

src/main/java/org/rcisoft/business/bclass/service/impl/BClassServiceImpl.java

@@ -2,6 +2,8 @@ package org.rcisoft.business.bclass.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.rcisoft.business.bagency.dao.BAgencyRepository;
+import org.rcisoft.business.bagency.entity.BAgency;
 import org.rcisoft.business.bclass.dao.BClassRepository;
 import org.rcisoft.business.bclass.entity.BClass;
 import org.rcisoft.business.bclass.service.BClassService;
@@ -37,6 +39,8 @@ public class BClassServiceImpl implements BClassService {
     private BClassRepository bClassRepository;
     @Autowired
     private BRClassStudentRepository brClassStudentRepository;
+    @Autowired
+    private BAgencyRepository bAgencyRepository;
 
     @Override
     public BClass selectOne(String businessId){
@@ -197,6 +201,7 @@ public class BClassServiceImpl implements BClassService {
     public PersistModel businessImportExcel(HSSFWorkbook hwb, String token) {
         ArrayList<BClass> bClasses = new ArrayList<BClass>();
         ArrayList<String> repeatCode = new ArrayList<String>();
+        ArrayList<String> AgencyCode = new ArrayList<String>();
 
         String[] headers = {"班级编号","班级名称","所属年级","教学单位"};
         ArrayList<String[]> values = ExcelUtil.importExcel(hwb,headers,false);  //获取excel数据
@@ -225,6 +230,13 @@ public class BClassServiceImpl implements BClassService {
                 continue;
             }
 
+            //判断教学单位是否存在
+            List<BAgency> bAgencies =  bAgencyRepository.queryBAgencysByCode(value[3]);
+            if(bAgencies.size()<1){
+                AgencyCode.add(value[3]);
+                continue;
+            }
+
             bClass= new BClass(value[0],value[1]);
             bClass.setGradeCode(value[2]);
             bClass.setAgencyCode(value[3]);
@@ -250,6 +262,9 @@ public class BClassServiceImpl implements BClassService {
         if(valuesGrade.size()>0){
             result+="以下班级的所属年级信息不存在："+ JSON.toJSONString(valuesGrade)+"。";
         }
+        if(AgencyCode.size()>0){
+            result+="以下教学单位不存在："+ JSON.toJSONString(AgencyCode)+"。";
+        }
 
         return new PersistModel(line,result);
     }

src/main/java/org/rcisoft/business/bstudent/service/impl/BStudentServiceImpl.java

@@ -85,12 +85,12 @@ public class BStudentServiceImpl implements BStudentService {
         if (model.getBusinessId() == null) {  //添加
             if (sysUserMapper.selectOne(new SysUser(model.getCode(),"0","1")) != null)
                 throw new ServiceException(ResultServiceEnums.STUDENT_EXISTS);
-            SysUser user1 = new SysUser();
+            /*SysUser user1 = new SysUser();
             user1.setEmail(model.getEmail());
             user1.setDelFlag("0");
             user1.setFlag("1");
             if(sysUserMapper.selectOne(user1)!=null)
-                throw new ServiceException(ResultServiceEnums.EMAIL_EXISTS);
+                throw new ServiceException(ResultServiceEnums.EMAIL_EXISTS);*/
 
             //1. 添加用户
             UserUtil.setCurrentPersistOperation(user);
@@ -126,7 +126,7 @@ public class BStudentServiceImpl implements BStudentService {
 
         ArrayList<SysUser> users = new ArrayList<SysUser>();
         ArrayList<UserRole> userRoles = new ArrayList<UserRole>();
-        String[] headers = {"学号", "学生姓名", "性别","邮箱","年级"};
+        String[] headers = {"学号", "学生姓名", "性别","年级"};
         ArrayList<String[]> values = ExcelUtil.importExcel(hwb, headers,true);  //获取excel数据
         
         if (values.size()<=0){
@@ -162,7 +162,7 @@ public class BStudentServiceImpl implements BStudentService {
             }
 
             //判断3:邮箱是否存在、格式是否正确；
-            SysUser user2 = new SysUser();
+            /*SysUser user2 = new SysUser();
             user2.setEmail(value[3]);
             boolean nullEmail = StringUtils.isEmpty(value[3]);
             boolean emailCheck = RegexValidateUtil.checkEmail(value[3]);
@@ -170,7 +170,7 @@ public class BStudentServiceImpl implements BStudentService {
             if(nullEmail||!emailCheck||emailRepeat){
                 valuesEmailExist.add(value[3]);
                 continue;
-            }
+            }*/
 
             //判断4:学年是否存在，存在才能录入
             BStudent bs = new BStudent();

src/main/java/org/rcisoft/business/bteacher/dao/BTeacherRepository.java

@@ -23,10 +23,10 @@ public interface BTeacherRepository extends BaseMapper<BTeacher> {
     */
     @Select("<script>SELECT b.`business_id`,b.`is_recommend`,b.`recommend_date`,b.`recommend_order`,b.`recommend_course`,b.`code`,\n" +
             "b.create_by,b.create_date,b.del_flag,b.flag,b.remarks,b.update_by,b.update_date,u.`name`,u.email,\n" +
-            "u.phone,u.sex,u.head_pic,u.agency_code,ba.`name` as agencyName\n" +
+            "u.phone,u.sex,u.head_pic,b.agency_code,IFNULL(ba.`name`,'无') as agencyName\n" +
             "FROM b_teacher b\n" +
             "LEFT JOIN s_user u ON b.`code` = u.login_name\n" +
-            "LEFT JOIN b_agency ba ON u.agency_code = ba.`code`\n" +
+            "LEFT JOIN b_agency ba ON b.agency_code = ba.`code`\n" +
             "where b.del_flag != 1" +
             "<if test=\"name!=null\">and u.`name` like #{name}</if>"+
             "<if test=\"code!=null\">and b.`code` like #{code}</if>" +

src/main/java/org/rcisoft/business/bteacher/service/impl/BTeacherServiceImpl.java

@@ -82,7 +82,7 @@ public class BTeacherServiceImpl implements BTeacherService {
 
 
         ArrayList<UserRole> userRoles = new ArrayList<UserRole>();
-        String[] headers = {"教师工号", "教师姓名", "性别","邮箱","教学单位编号"};
+        String[] headers = {"教师工号", "教师姓名", "性别","教学单位编号"};
         ArrayList<String[]> values = ExcelUtil.importExcel(hwb, headers,true);  //获取excel数据
         if (values.size() == 0){
             throw new ServiceException(ResultServiceEnums.EXCEL_IMPORT_DATA_NOT_EXIST);
@@ -117,7 +117,7 @@ public class BTeacherServiceImpl implements BTeacherService {
             }
 
             //判断3:邮箱是否存在、格式是否正确；
-            SysUser user2 = new SysUser();
+           /* SysUser user2 = new SysUser();
             user2.setEmail(value[3]);
             boolean nullEmail = StringUtils.isEmpty(value[3]);
             boolean emailCheck = RegexValidateUtil.checkEmail(value[3]);
@@ -125,7 +125,7 @@ public class BTeacherServiceImpl implements BTeacherService {
             if(nullEmail||!emailCheck||emailRepeat){
                 valuesEmailExist.add(value[1]);
                 continue;
-            }
+            }*/
 
             //判断4:教师的所属教学单位是否存在，存在才能添加；
             if (sysUserMapper.checkTeacherAgency(value[4]).size() == 0){
@@ -239,11 +239,11 @@ public class BTeacherServiceImpl implements BTeacherService {
             if (sysUserMapper.selectOne(new SysUser(model.getCode(),"0","1")) != null)
             {throw new ServiceException(ResultServiceEnums.TEACHER_EXISTS);}
             SysUser user1 = new SysUser();
-            user1.setEmail(model.getEmail());
+            /*user1.setEmail(model.getEmail());
             user1.setDelFlag("0");
             user1.setFlag("1");
             if(sysUserMapper.selectOne(user1)!=null)
-            {throw new ServiceException(ResultServiceEnums.EMAIL_EXISTS);}
+            {throw new ServiceException(ResultServiceEnums.EMAIL_EXISTS);}*/
             //1添加用户
             user.setHeadPic(global.getDEFAULT_TEACHER_LOCATION());
             UserUtil.setCurrentPersistOperation(user);

src/main/java/org/rcisoft/sys/excel/ExcelDownloadController.java

@@ -30,6 +30,7 @@ public class ExcelDownloadController {
     private static final String LESSON_FILE_NAME = "lesson.xls";
     private static final String SL_FILE_NAME = "sl.xls";
     private static final String ROOM_FILE_NAME = "room.xls";
+    private static final String BUSINESS_CLASS = "business-class.xls";
 
     @Autowired
     private Global global;
@@ -93,6 +94,9 @@ public class ExcelDownloadController {
             case "8":
                 name = ROOM_FILE_NAME;
                 break;
+            case "9":
+                name = BUSINESS_CLASS;
+                break;
         }
         return name;
     }

src/main/java/org/rcisoft/sys/user/entity/SysUser.java

@@ -49,7 +49,6 @@ public class SysUser extends IdEntity<SysUser> {
     private String gitLabId; //gitLab账号id
     private String gitLabUsername; //gitLab账号
     private String gitLabImpressionToken; //gitLab账号模拟令牌
-    private String isCreated;//是否是创建的用户
 
     /**
      * 角色ID

src/main/java/org/rcisoft/sys/user/service/impl/SysUserServiceImpl.java

@@ -59,7 +59,6 @@ public class SysUserServiceImpl implements SysUserService {
 		}else{//添加
 			UserUtil.setCurrentPersistOperation(user);
 			user.setPassword(passwordEncoder.encode(global.getDEFAULT_PASSWORD()));
-			user.setIsCreated("1");
 			line = sysUserMapper.insertSelective(user);
 		}
 		//添加新的角色

src/main/resources/mapper/sys/user/mapper/UserMapper.xml

@@ -17,7 +17,5 @@
         <result column="FLAG" property="flag" jdbcType="VARCHAR" />
         <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
         <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
-        <result column="agency_code" property="agencyCode" jdbcType="VARCHAR" />
-        <result column="is_created" property="isCreated" jdbcType="VARCHAR" />
     </resultMap>
 </mapper>
\ No newline at end of file