Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education

src/main/java/org/rcisoft/business/barrange/dao/BSubtaskRepository.java

 package org.rcisoft.business.barrange.dao;
 
+import org.apache.ibatis.annotations.Update;
 import org.rcisoft.business.barrange.entity.BSubtask;
 import org.rcisoft.core.base.BaseMapper;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface BSubtaskRepository  extends BaseMapper<BSubtask> {
+
+    @Update("update b_subtask set del_flag = 1 where arrange_id = #{0}")
+    void deleteSubtask(String businessId);
+
 }

src/main/java/org/rcisoft/business/barrange/service/impl/BArrangeServiceImpl.java

@@ -153,65 +153,38 @@ public class BArrangeServiceImpl implements BArrangeService {
     @Override
     public PersistModel merge(String json){
         BArrange bArrange = new BArrange();
+        //json解析
         JSONObject jsonObject = JSONObject.fromObject(json);
+        //arrange对象修改操作
         JSONObject arrange = jsonObject.getJSONObject("arrange");
-        if (arrange.get("desc") != null){
-            bArrange.setDescription(arrange.getString("desc"));
-        }
-        if (arrange.get("termCode") != null){
-            bArrange.setTermCode(arrange.getString("termCode"));
-        }
+        bArrange.setDescription(arrange.getString("desc"));
+        bArrange.setTermCode(arrange.getString("termCode"));
         bArrange.setBusinessId(arrange.getString("businessId"));
-        if (arrange.get("desc") != null || arrange.get("termCode") != null){
-            bArrangeRepository.updateByPrimaryKeySelective(bArrange);
-        }
-        if (arrange.get("childList") != null){
-            JSONArray childList = arrange.getJSONArray("childList");
-            for(int i = 0; i < childList.size() ; i++){
-                JSONObject subtask = childList.getJSONObject(i);
-                BSubtask bSubtask = new BSubtask();
-                if (subtask.get("businessId") != null){
-                    bSubtask.setBusinessId(subtask.getString("businessId"));
-                    bSubtask.setName(subtask.getString("name"));
-                    bSubtaskRepository.updateByPrimaryKeySelective(bSubtask);
-                    //先清除原子任务
-                    bSubAgencyRepository.deletePervious(subtask.getString("businessId"));
-                    JSONArray childList2 = subtask.getJSONArray("childList");
-                    for(int j = 0; j < childList2.size() ; j++){
-                        JSONObject agency = childList2.getJSONObject(j);
-                        BSubAgency bSubAgency = new BSubAgency();
-                        if (agency.get("agencyCode") != null){
-                            bSubAgency.setAgencyCode(agency.getString("agencyCode"));
-                        }
-                        //再插入新记录
-                        UserUtil.setCurrentPersistOperation(bSubAgency);
-                        bSubAgency.setSubtaskId(subtask.getString("businessId"));
-                        bSubAgencyRepository.insertSelective(bSubAgency);
-                    }
-                }
-                else {
-                    List<BSubtask> subtaskList = new ArrayList<>();
-                    List<BSubAgency> bSubAgencyList = new ArrayList<>();
-                    bSubtask.setName(subtask.getString("name"));
-                    bSubtask.setArrangeId(bArrange.getBusinessId());
-                    bSubtask.setStatus("0");
-                    UserUtil.setCurrentPersistOperation(bSubtask);
-                    subtaskList.add(bSubtask);
-                    JSONArray childList2 = subtask.getJSONArray("childList");
-                    for(int j = 0; j < childList2.size() ; j++){
-                        JSONObject agency = childList2.getJSONObject(j);
-                        BSubAgency bSubAgency = new BSubAgency();
-                        bSubAgency.setAgencyCode(agency.getString("agencyCode"));
-                        bSubAgency.setStatus("0");
-                        bSubAgency.setSubtaskId(bSubtask.getBusinessId());
-                        UserUtil.setCurrentPersistOperation(bSubAgency);
-                        bSubAgencyList.add(bSubAgency);
-                    }
-                    bArrangeRepository.insertBSubAgency(bSubAgencyList);
-                    bArrangeRepository.insertBSubtask(subtaskList);
+        bArrangeRepository.updateByPrimaryKeySelective(bArrange);
+        //清除原来的subTask
+        bSubtaskRepository.deleteSubtask(arrange.getString("businessId"));
+        //重新添加subTask
+        JSONArray childList = arrange.getJSONArray("childList");
+        for(int i = 0; i < childList.size() ; i++){
+            JSONObject subtask = childList.getJSONObject(i);
+            BSubtask bSubtask = new BSubtask();
+            bSubtask.setName(subtask.getString("name"));
+            bSubtask.setArrangeId(arrange.getString("businessId"));
+            UserUtil.setCurrentPersistOperation(bSubtask);
+            bSubtaskRepository.insertSelective(bSubtask);
+            JSONArray childList2 = subtask.getJSONArray("childList");
+            for(int j = 0; j < childList2.size() ; j++){
+                JSONObject agency = childList2.getJSONObject(j);
+                BSubAgency bSubAgency = new BSubAgency();
+                   if (agency.get("agencyCode") != null){
+                       bSubAgency.setAgencyCode(agency.getString("agencyCode"));
+                   }
+                //再插入新记录
+                UserUtil.setCurrentPersistOperation(bSubAgency);
+                bSubAgency.setSubtaskId(bSubtask.getBusinessId());
+                bSubAgencyRepository.insertSelective(bSubAgency);
                 }
             }
-        }
         return new PersistModel(1);
     }
 

src/main/java/org/rcisoft/business/bteacher/controller/BTeacherController.java

@@ -40,6 +40,9 @@ public class BTeacherController extends PaginationController<BTeacher> {
     @ApiOperation(value="添加/编辑教师信息", notes="businessId为空时是添加方法，不为空时是修改方法")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "code", value = "教师工号(1-11)", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "email", value = "邮箱", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "name", value = "教室姓名", required = false, dataType = "varchar"),
+            @ApiImplicitParam(name = "sex", value = "性别", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "isRecommend", value = "0:未推荐，1:推荐", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "recommendDate", value = "推荐时间，排序依据", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "recommendOrder", value = "推荐排序", required = false, dataType = "varchar"),

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,1);  //获取excel数据
         if (values.size() == 0){
             throw new ServiceException(ResultServiceEnums.EXCEL_IMPORT_DATA_NOT_EXIST);
@@ -123,7 +123,7 @@ public class BTeacherServiceImpl implements BTeacherService {
             boolean emailCheck = RegexValidateUtil.checkEmail(value[3]);
             boolean emailRepeat = sysUserMapper.selectOne(user2)!=null;
             if(nullEmail||!emailCheck||emailRepeat){
-                valuesEmailExist.add(value[1]);
+                valuesEmailExist.add(value[3]);
                 continue;
             }
 

src/main/java/org/rcisoft/sys/role/controller/SysRoleController.java

@@ -51,7 +51,6 @@ public class SysRoleController extends PaginationController<SysRole> {
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
                 sysRole);
-
     }
 
 
@@ -72,7 +71,6 @@ public class SysRoleController extends PaginationController<SysRole> {
             @ApiImplicitParam(name = "menus", value = "菜单id，逗号间隔", required = true, dataType = "varchar")})
     @PostMapping(value = "/rolePermission")
     public Result rolePermission(@RequestParam("roleId") String roleId, @RequestParam("menus") String menus ){
-
         return Result.builder(sysRoleServiceImpl.doAuthorization(roleId,menus,getToken()),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,