Merge remote-tracking branch 'origin/meiteng' into zql

src/main/java/org/rcisoft/business/bchapter/service/impl/BChapterServiceImpl.java

@@ -280,6 +280,8 @@ public class BChapterServiceImpl implements BChapterService {
                 bFile.setChapterId(model.getBusinessId());
                 bFile.setLessonId(model.getLessonId());
 
+                bFile.setFileTime(dto.getFileTime());
+                model.setCourseTime(dto.getFileTime());
                 if (StringUtils.isNotEmpty(dto.getFileTime()) && dto.getFileTime().contains(".")) {
                     bFile.setFileTime(dto.getFileTime().substring(0, dto.getFileTime().lastIndexOf(".")));
                     model.setCourseTime(dto.getFileTime().substring(0, dto.getFileTime().lastIndexOf(".")));

src/main/java/org/rcisoft/business/bpersonvalue/controller/BPersonValueController.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections.map.HashedMap;
 import org.bouncycastle.asn1.x509.sigi.PersonalData;
 import org.rcisoft.business.bbanner.entity.BBanner;
 import org.rcisoft.business.bpersonvalue.dto.PersonValueDto;
@@ -29,6 +30,7 @@ import org.rcisoft.business.bpersonvalue.entity.BPersonValue;
 import org.rcisoft.business.bpersonvalue.service.BPersonValueService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
 * Created by  on 2019-11-13 13:28:38.
@@ -44,7 +46,7 @@ public class BPersonValueController extends PaginationController<BPersonValue> {
 
     @ApiOperation(value = "1601 明细", notes = " type类型（0：获取积分 +，1：消耗积分 -）", response = BBanner.class)
     @GetMapping(value = "/queryByPagination")
-    @ApiImplicitParam(name = "businessId", value = "主键id", required = true, dataType = "varchar")
+    @ApiImplicitParam(name = "businessId", value = "用户id", required = true, dataType = "varchar")
     public Result queryByPagination(CurUser curUser,String businessId) {
         bPersonValueServiceImpl.queryByPagination(getPaginationUtility(), curUser.getCorpId(),businessId);
         GridModel gridModel = getGridModelResponse();
@@ -64,4 +66,19 @@ public class BPersonValueController extends PaginationController<BPersonValue> {
                 personValueDto);
     }
 
+    @ApiOperation(value = "1603 用户明细带总积分", notes = " 用户明细带总积分", response = BBanner.class)
+    @GetMapping(value = "/queryPersonValueByPagination")
+    @ApiImplicitParam(name = "businessId", value = "用户id", required = true, dataType = "varchar")
+    public Result queryPersonValueByPagination(CurUser curUser,String businessId) {
+        bPersonValueServiceImpl.queryByPagination(getPaginationUtility(), curUser.getCorpId(),businessId);
+        GridModel gridModel = getGridModelResponse();
+        Map<String,Object> map = new HashedMap();
+        map.put("details",gridModel);
+        map.put("userValue",bPersonValueServiceImpl.getUserValue(curUser.getCorpId(),businessId));
+        return Result.builder(new PersistModel(1),
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                map);
+    }
+
 }

src/main/java/org/rcisoft/business/bpersonvalue/dao/BPersonValueRepository.java

@@ -19,10 +19,13 @@ public interface BPersonValueRepository extends BaseMapper<BPersonValue> {
     * 分页查询 bPersonValue
      *
     */
-    @Select("select * from b_person_value where del_flag != 1 and flag = 1 and user_id = #{id} ORDER BY create_date desc")
+    @Select("select * from b_person_value where del_flag != 1 and flag = 1 and person_id = #{id} ORDER BY create_date desc")
     @ResultMap(value = "BaseResultMap" )
     List<BPersonValue> queryBPersonValues(@Param("id") String id);
 
+    @Select("select `value` from s_user where business_id = #{businessId} and del_flag != 1 and flag =1 and corp_id = #{corpId}")
+    String getUserValue(@Param("corpId") String corpId, @Param("businessId") String businessId);
+
     /**
      * 更新s_user表中value
      * @param personId

src/main/java/org/rcisoft/business/bpersonvalue/service/BPersonValueService.java

@@ -14,6 +14,8 @@ public interface BPersonValueService {
 
     List<BPersonValue> queryByPagination(PageUtil pageUtil,String corpId,String businessId);
 
+    String getUserValue(String corpId,String businessId);
+
     int add(PersonValueDto personValueDto,String corpId);
 
 }

src/main/java/org/rcisoft/business/bpersonvalue/service/impl/BPersonValueServiceImpl.java

@@ -39,6 +39,11 @@ public class BPersonValueServiceImpl implements BPersonValueService {
         return bPersonValueRepository.queryBPersonValues(businessId);
     }
 
+    @Override
+    public String getUserValue(String corpId, String businessId) {
+        return bPersonValueRepository.getUserValue(corpId,businessId);
+    }
+
     @Override
     public int add(PersonValueDto personValueDto,String corpId) {
         BPersonValue bPersonValue = new BPersonValue();

src/main/java/org/rcisoft/core/result/ResultServiceEnums.java

@@ -239,6 +239,7 @@ public enum ResultServiceEnums {
     PARAM_NOT_NULL(139,"参数不能为空"),
     NOT_TRAIN_TYPE(140,"课程类型不正确"),
     VALUE_IS_ERROR(141,"扣除积分大于当前积分"),
+    USER_IS_NULL(142,"请选择用户"),
     ;
 
     private Integer code;

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

@@ -10,6 +10,7 @@ import org.rcisoft.sys.user.bean.CurUser;
 import org.rcisoft.sys.user.dto.MyInfoDTO;
 import org.rcisoft.sys.user.dto.QueryMenuResDTO;
 import org.rcisoft.sys.user.dto.QuerySysUserDTO;
+import org.rcisoft.sys.user.dto.RoleDto;
 import org.rcisoft.sys.user.entity.SysUser;
 import org.rcisoft.sys.user.entity.UserRole;
 import org.springframework.stereotype.Repository;
@@ -37,14 +38,15 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     @ResultMap(value = "BaseResultMap")
     List<SysUser> queryUsers(QuerySysUserDTO dto);
 
-    @Select("<script>SELECT sr.r_name AS roleList  " +
+    @Select("<script>SELECT * " +
             "FROM s_user AS su " +
             "LEFT JOIN s_r_user_role AS ru ON su.business_id = ru.user_id " +
             "LEFT JOIN tm_admin_role AS sr ON ru.role_id = sr.r_id  " +
             "WHERE su.del_flag = 0  " +
             "and sr.r_status != 0 " +
             "AND su.business_id = #{businessId}</script>")
-    List<String> queryRoleByUserId(@Param("businessId") String businessId);
+    @ResultMap(value = "RoleDtoMap")
+    List<RoleDto> queryRoleByUserId(@Param("businessId") String businessId);
 
     @Select("<script>SELECT sr.r_id AS roleIdList  " +
             "FROM s_user AS su " +
@@ -68,7 +70,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     @Select("<script>select ur.user_id from s_r_user_role ur left JOIN tm_admin_role  sr on ur.role_id = sr.r_id where sr.r_type in" +
             "<foreach item='item' index='index' collection='rType' open='(' separator=',' close=')'> #{item} </foreach> " +
             "</script>")
-    List<String> adminId(@Param("rType") List<String> rType);
+    List<String> adminId(@Param("rType") String[] rType);
 
     @Select("<script> select * from s_r_user_role where user_id in" +
             " <foreach item='item' index='index' collection='userId' open='(' separator=',' close=')'> #{item} </foreach>" +

src/main/java/org/rcisoft/sys/user/dto/RoleDto.java

+package org.rcisoft.sys.user.dto;
+
+import lombok.Data;
+
+@Data
+public class RoleDto {
+
+    public String  roleName;
+
+    public String  roleId;
+
+    public String  roleType;
+}

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

@@ -9,6 +9,7 @@ import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.NotBlank;
 import org.rcisoft.core.entity.IdEntity;
 import org.rcisoft.sys.role.entity.SysRole;
+import org.rcisoft.sys.user.dto.RoleDto;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
@@ -100,9 +101,9 @@ public class SysUser extends IdEntity<SysUser> {
 
 
     @Transient
-    private List<SysRole> roleList = Lists.newArrayList(); // 拥有角色列表
+    private List<RoleDto> roleList ; // 拥有角色列表
 
-    @Transient
-    private List<SysRole> roleIdList = Lists.newArrayList(); // 拥有角色id列表
+//    @Transient
+//    private List<SysRole> roleIdList = Lists.newArrayList(); // 拥有角色id列表
 
 }

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

@@ -142,34 +142,26 @@ public class SysUserServiceImpl implements SysUserService {
     @Override
     public int AssignRoles(String userId, String roleId) {
 
-        if("".equals(roleId)){
-            //如果没有勾选角色 则清空该用户所有角色
-            List<String> uid = new ArrayList<>();
-            String[] ids = userId.split(",");
-            for(String s : ids){
-                uid.add(s);
-            }
-            sysUserMapper.delUserRoleById(uid);
-            return 1;
-        }
-        //超级管理员只有一个不能被分配
-        List<String> adminRoleType = asList("0");
-        //查询超级管理员角色的userid
-        List<String> adminIds = sysUserMapper.adminId(adminRoleType);
+        //主管理员和子管理员不能被分配角色（角色不可改变）
+        String[] adminAllType = new String[]{"0","1"};
+        //查询管理员角色的userid
+        List<String> adminAllIds = sysUserMapper.adminId(adminAllType);
         //将超级管理员人员userid 从String[]中剔除
-        if (adminIds.size() != 0) {
-            for (int i = 0; i < adminIds.size(); i++) {
-                userId = userId.replace(adminIds.get(i), "");
+        if (adminAllIds.size() != 0) {
+            for (int i = 0; i < adminAllIds.size(); i++) {
+                userId = userId.replace(adminAllIds.get(i), "");
             }
         }
+        if("".equals(roleId)){
+            //如果没有勾选角色 则清空该用户所有角色
+            List<String> uid = Arrays.asList(userId.split(","));
+            return sysUserMapper.delUserRoleById(uid);
+        }
         List<String> userIds = asList(StringUtils.split(userId, ","));
         List<String> roleIds = asList(StringUtils.split(roleId, ","));
         List<UserRole> userRoles = new ArrayList<>();
         //清空userrole中关于ids的所有数据
         sysUserMapper.delUserRoleById(userIds);
-
-        int result = 0;
-
         for (int i = 0; i < roleIds.size(); i++) {
             for (int j = 0; j < userIds.size(); j++) {
                 UserRole userRole = new UserRole();
@@ -179,8 +171,7 @@ public class SysUserServiceImpl implements SysUserService {
                 userRoles.add(userRole);
             }
         }
-        result = sysUserMapper.insertUserRoleById(userRoles);
-        return result;
+        return sysUserMapper.insertUserRoleById(userRoles);
     }
 
     @Override
@@ -209,12 +200,28 @@ public class SysUserServiceImpl implements SysUserService {
 
     @Override
     public int stopUserByUserBusinessId(String businessId) {
+        //主管理员不能被停用角色
+        String[] adminType = new String[]{"0"};
+        //查询主管理员角色的userid
+        List<String> adminIds = sysUserMapper.adminId(adminType);
+        if(businessId == null && "".equals(businessId)){
+            throw new ServiceException(ResultServiceEnums.USER_IS_NULL);
+        }
+        //剔除主管理员的id
+        if (adminIds.size() != 0) {
+            for (int i = 0; i < adminIds.size(); i++) {
+                businessId = businessId.replace(adminIds.get(i), "");
+            }
+        }
         List<String> ids = asList(StringUtils.split(businessId, ","));
         return sysUserMapper.stopFlag(ids);
     }
 
     @Override
     public int startUserByUserBusinessId(String businessId) {
+        if(businessId == null && "".equals(businessId)){
+            throw new ServiceException(ResultServiceEnums.USER_IS_NULL);
+        }
         List<String> ids = asList(StringUtils.split(businessId, ","));
         return sysUserMapper.startFlag(ids);
     }

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

@@ -23,10 +23,10 @@
                     javaType="java.util.ArrayList" select="org.rcisoft.sys.user.dao.SysUserMapper.queryRoleByUserId"
                     column="business_id">
         </collection>
-        <collection property="roleIdList" ofType="org.rcisoft.sys.user.entity.SysUser"
-                    javaType="java.util.ArrayList" select="org.rcisoft.sys.user.dao.SysUserMapper.queryRoleIdByUserId"
-                    column="business_id">
-        </collection>
+<!--        <collection property="roleIdList" ofType="org.rcisoft.sys.user.entity.SysUser"-->
+<!--                    javaType="java.util.ArrayList" select="org.rcisoft.sys.user.dao.SysUserMapper.queryRoleIdByUserId"-->
+<!--                    column="business_id">-->
+<!--        </collection>-->
     </resultMap>
 
 
@@ -36,6 +36,12 @@
         <result column="href" jdbcType="VARCHAR" property="href" />
     </resultMap>
 
+    <resultMap id="RoleDtoMap" type="org.rcisoft.sys.user.dto.RoleDto">
+        <result column="r_name" jdbcType="VARCHAR" property="roleName" />
+        <result column="r_id" jdbcType="VARCHAR" property="roleId" />
+        <result column="r_type" jdbcType="VARCHAR" property="roleType" />
+    </resultMap>
+
     <resultMap id="ChildResultMap" type="org.rcisoft.sys.user.dto.QueryMenuResDTO" extends="DtoResultMap">
         <association column="business_id" property="childList" select="org.rcisoft.sys.menu.dao.SysMenuRepository"></association>
     </resultMap>