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

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

@@ -77,13 +77,14 @@ public interface BArrangeRepository extends BaseMapper<BArrange> {
 //    @ResultMap(value = "scheduleDtoResultMap")
 //    List<ScheduleDto> queryDtoByAgencySubtaskId(String bSubtaskId);
 
-    @Select("<script>select *,b_edu_class.class_name,b_lesson.lesson_name,b_rooms.classroom_name,s_user.`name` as teacher_name from b_schedule_dto  " +
+    @Select("<script>select b_schedule_dto.*,b_edu_class.class_name,b_lesson.lesson_name,b_rooms.classroom_name,s_user.`name` as teacher_name from b_schedule_dto  " +
             "LEFT JOIN b_edu_class on b_edu_class.`code` = b_schedule_dto.class_code " +
             "LEFT JOIN b_lesson on b_lesson.`code` = b_schedule_dto.lesson_code " +
             "LEFT JOIN b_rooms on b_rooms.`code` = b_schedule_dto.room_code " +
             "LEFT JOIN b_teacher on b_teacher.`code` = b_schedule_dto.teacher_code " +
             "LEFT JOIN s_user on s_user.login_name = b_teacher.`code` " +
             "where sub_agency_id = #{subAgencyId} " +
+            "GROUP BY lesson_code,teacher_code,class_code " +
             "</script>")
     @ResultMap(value = "scheduleDtoResultMap")
     List<ScheduleDto> queryDtoBySubAgencyId(String subAgencyId);

src/main/java/org/rcisoft/business/bcompany/service/impl/BCompanyServiceImpl.java

@@ -4,6 +4,7 @@ import org.rcisoft.business.bcompany.dao.BCompanyRepository;
 import org.rcisoft.business.bcompany.entity.BCompany;
 import org.rcisoft.business.bcompany.service.BCompanyService;
 import org.rcisoft.common.component.Global;
+import org.rcisoft.common.util.TableUtil;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.constant.MessageConstant;
 import org.rcisoft.core.entity.DataEntity;
@@ -11,6 +12,7 @@ import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.ResultServiceEnums;
 import org.rcisoft.core.util.UserUtil;
+import org.rcisoft.sys.role.dao.SysRoleRepository;
 import org.rcisoft.sys.user.dao.SysUserMapper;
 import org.rcisoft.sys.user.entity.SysUser;
 import org.rcisoft.sys.user.entity.UserRole;
@@ -39,6 +41,10 @@ public class BCompanyServiceImpl implements BCompanyService{
     @Autowired
     private SysUserService userService;
 
+
+    @Autowired
+    private SysRoleRepository sysRoleRepository;
+
     @Override
     public PersistModel persist(BCompany model, SysUser user) {
         int line = 0;
@@ -85,16 +91,12 @@ public class BCompanyServiceImpl implements BCompanyService{
 
     @Override
     public PersistModel removeBCompany(String businessId) {
-        BCompany company = bCompanyRepository.selectOne(new BCompany(businessId,"0","1"));
-        sysUserMapper.deleteByCode(company.getCode());
-
-        BCompany bCompany = new BCompany();
-        bCompany.setDeleted();
-        bCompany.setBusinessId(businessId);
-        UserUtil.setCurrentMergeOperation(bCompany);
-
-        int line = bCompanyRepository.logicalDelete(bCompany);
-
+        /*删除关联角色*/
+        sysRoleRepository.deleteUserRoleByChildrenId(TableUtil.getTableByKey("1"),businessId);
+        /*删除sys_user*/
+        sysUserMapper.deleteByCompany(businessId);
+        /*删除b_company*/
+        int line = bCompanyRepository.deleteByPrimaryKey(businessId);
         return new PersistModel(line, MessageConstant.MESSAGE_ALERT_SUCCESS);
     }
 

src/main/java/org/rcisoft/business/bopinion/dao/BOpinionRepository.java

@@ -38,4 +38,10 @@ public interface BOpinionRepository extends BaseMapper<BOpinion> {
     @ResultMap("SubTaskResult")
     BSubtask querySubtaskInfo(String id);
 
+
+    @Select("select b_opinion.*,s_user.name as create_person from b_opinion left join s_user on b_opinion.create_by = s_user.business_id " +
+            "where sub_agency_id = #{subAgencyId} order by create_date DESC")
+    @ResultMap(value = "BaseResultMap")
+    List<BOpinion> queryOpinionBySubAgencyId(String subAgencyId);
+
 }

src/main/java/org/rcisoft/business/bopinion/entity/BOpinion.java

@@ -23,6 +23,7 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 public class BOpinion extends IdEntity<BOpinion> {
+    private static final long serialVersionUID = 1300895032499081565L;
 
 //    @Length(min = 1,max = 64,message = "长度最小为1,最大为50")
 //    @NotBlank
@@ -37,10 +38,15 @@ public class BOpinion extends IdEntity<BOpinion> {
     @NotBlank
     private String slId;
 
+    private String subAgencyId;
+
+    @Transient
     private String arrangeId;
 
+    @Transient
     private String agencyCode;
 
+    @Transient
     private String subtaskId;
 
     @Transient

src/main/java/org/rcisoft/business/bopinion/service/impl/BOpinionServiceImpl.java

@@ -87,7 +87,7 @@ public class BOpinionServiceImpl implements BOpinionService{
     public PersistModel save(String opinion,String id) {
         BOpinion bOpinion = new BOpinion();
         bOpinion.setOpinion(opinion);
-        bOpinion.setSlId(id);
+        bOpinion.setSubAgencyId(id);
         UserUtil.setCurrentPersistOperation(bOpinion);
         //插入意见表b_opinion
         int line = bOpinionRepository.insertSelective(bOpinion);

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

@@ -242,7 +242,7 @@ public class BStudentServiceImpl implements BStudentService {
             result+="以下邮箱已注册："+ JSON.toJSONString(valuesEmailExist)+"。";
         }
         if(valuesGrade.size()>0){
-            result+="以下学生的学年信息不存在："+ JSON.toJSONString(valuesGrade)+"。";
+            result+="以下学年不存在："+ JSON.toJSONString(valuesGrade)+"。";
         }
 
 

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

@@ -126,9 +126,11 @@ public class BTeacherServiceImpl implements BTeacherService {
 //            }
 
             //判断4:教师的所属教学单位是否存在，存在才能添加；
-            if (sysUserMapper.checkTeacherAgency(value[3]).size() == 0){
-                valuesAgencyExist.add(value[3]);
-                continue;
+            if(!value[3].equals("")&&value[3]!=null){
+                if (sysUserMapper.checkTeacherAgency(value[3]).size() == 0){
+                    valuesAgencyExist.add(value[3]);
+                    continue;
+                }
             }
 
             //合法:通过了三次判断，证明可建立该用户

src/main/java/org/rcisoft/common/util/TableUtil.java

+package org.rcisoft.common.util;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by lcy on 18/5/15.
+ */
+public class TableUtil {
+
+    static Map<String,String> TableMap;
+
+    static {
+        TableMap = new HashMap<>();
+        TableMap.put("1","b_company");
+        TableMap.put("2","b_teacher");
+        TableMap.put("3","b_student");
+    }
+
+    /**
+     * 获取
+     * @param key
+     * @return
+     */
+    public static String getTableByKey(String key){
+        return TableMap.get(key);
+    }
+}

src/main/java/org/rcisoft/sys/role/dao/SysRoleRepository.java

@@ -7,7 +7,6 @@ import org.apache.ibatis.annotations.Select;
 import org.rcisoft.core.base.BaseMapper;
 import org.rcisoft.sys.dept.entity.DeptRole;
 import org.rcisoft.sys.role.entity.SysRole;
-import org.rcisoft.sys.user.entity.SysUser;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -203,4 +202,19 @@ public interface SysRoleRepository extends BaseMapper<SysRole> {
             "LEFT JOIN s_role  ON s_role_menu.ROLE_ID = s_role.business_id " +
             "WHERE s_menu.MODEL_ID = #{modelId} AND ROLE_ID = #{roleId}")
     int queryRoleByRoleCode(@Param("modelId") String modelId, @Param("roleId") String roleId);
+
+    /**
+     * 根据子表id 删除 s_r_user_role
+     * @param tableByKey
+     * @param businessId
+     * @return
+     */
+    @Delete("DELETE sr " +
+            "FROM" +
+            "s_r_user_role sr " +
+            "LEFT JOIN s_user s on s.business_id = sr.user_id " +
+            "LEFT JOIN ${tb} c ON c. CODE = s.login_name " +
+            "WHERE" +
+            "c.business_id = #{cid}")
+    int deleteUserRoleByChildrenId(@Param("tb") String tableByKey,@Param("cid") String businessId);
 }

src/main/java/org/rcisoft/sys/role/service/impl/SysRoleServiceImpl.java

@@ -3,7 +3,6 @@ package org.rcisoft.sys.role.service.impl;
 
 import lombok.extern.slf4j.Slf4j;
 import org.rcisoft.core.aop.PageUtil;
-import org.rcisoft.core.constant.DelStatus;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.ResultServiceEnums;
@@ -74,12 +73,8 @@ public class SysRoleServiceImpl implements SysRoleService {
             //删除该角色所有的关联信息
             sysRoleRepository.deleteRoleMenuByRoleId(id);
             sysRoleRepository.deleteUserRoleByRoleId(id);
-
-            SysRole sysRole = sysRoleRepository.selectByPrimaryKey(id);
-            sysRole.setDelFlag(DelStatus.DELETED.getStatus());
-            UserUtil.setCurrentMergeOperation(sysRole);
-            int line = sysRoleRepository.updateByPrimaryKeySelective(sysRole);
-            log.info(UserUtil.getUserInfoProp(token,UserUtil.USER_USERNAME)+"删除了ID为"+ sysRole.getBusinessId()+"的角色信息");
+            int line = sysRoleRepository.deleteByPrimaryKey(id);
+            log.info(UserUtil.getUserInfoProp(token,UserUtil.USER_USERNAME)+"删除了ID为"+ id+"的角色信息");
             return line;
         }
     }

src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

@@ -8,14 +8,10 @@ import org.rcisoft.business.bteacher.entity.BTeacher;
 import org.rcisoft.core.base.BaseMapper;
 import org.rcisoft.sys.user.entity.SysUser;
 import org.rcisoft.sys.user.entity.UserRole;
-import org.springframework.security.access.method.P;
 import org.springframework.stereotype.Repository;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import static javafx.scene.input.KeyCode.V;
-
 /**
  * Created by lcy on 17/8/9.
  */
@@ -49,9 +45,23 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     @Select("SELECT u.business_id from s_user u left join ${tab} s on u.login_name = s.code where s.business_id = #{id} and u.del_flag = 0 and u.flag = 1")
     String selectUserIdByStuOrTeaId(@Param("id") String id, @Param("tab") String table);
 
-    @Update("update s_user set del_flag = 1, flag = 0 where login_name = #{code}")
+    @Update("update s_user set del_flag = 1  where login_name = #{code}")
     int deleteByCode(String code);
 
+    /**
+     * 用户删除 cy 5-15
+     * @param code
+     * @return
+     */
+    @Delete("DELETE s " +
+            "FROM " +
+            " s_user s " +
+            "LEFT JOIN b_company c ON c. CODE = s.login_name " +
+            "WHERE " +
+            " c.business_id = #{code}")
+    int deleteByCompany(String code);
+
+
     @Select("<script>select * from s_user where business_id = #{userId} and password = #{password} limit 1</script>")
     @ResultMap(value = "BaseResultMap")
     SysUser checkPassword(@Param("userId") String userId, @Param("password") String password);

src/main/resources/mapper/business/barrange/mapper/BArrangeMapper.xml

@@ -158,7 +158,7 @@
         <result column="subtask_id" jdbcType="VARCHAR" property="subtaskId" />
         <result column="subtask_name" jdbcType="VARCHAR" property="subtaskName" />
         <collection property="childList" javaType="ArrayList" column="business_id" ofType="org.rcisoft.business.bopinion.entity.BOpinion"
-                    select="org.rcisoft.business.bopinion.dao.BOpinionRepository.queryOpinionBySlId"
+                    select="org.rcisoft.business.bopinion.dao.BOpinionRepository.queryOpinionBySubAgencyId"
         />
     </resultMap>
 </mapper>
\ No newline at end of file

src/main/resources/mapper/business/bopinion/mapper/BOpinionMapper.xml

@@ -10,6 +10,7 @@
         <result column="agency_code" jdbcType="VARCHAR" property="agencyCode"/>
         <result column="subtask_id" jdbcType="VARCHAR" property="subtaskId"/>
         <result column="create_person" jdbcType="VARCHAR" property="createPerson"/>
+        <result column="sub_agency_id" jdbcType="VARCHAR" property="subAgencyId"/>
     </resultMap>